From 7fae35ff985e43e14bfd076ef0b968614b9b4a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Wed, 4 Apr 2018 12:41:03 +0200 Subject: [PATCH 01/63] init --- java/com.sap.sse.datamining.ui/.classpath | 8 ++++++ java/com.sap.sse.datamining.ui/.gitignore | 1 + java/com.sap.sse.datamining.ui/.project | 28 +++++++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 12 ++++++++ .../META-INF/MANIFEST.MF | 10 +++++++ .../build.properties | 4 +++ java/com.sap.sse.datamining.ui/pom.xml | 13 +++++++++ 7 files changed, 76 insertions(+) create mode 100644 java/com.sap.sse.datamining.ui/.classpath create mode 100644 java/com.sap.sse.datamining.ui/.gitignore create mode 100644 java/com.sap.sse.datamining.ui/.project create mode 100644 java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs create mode 100644 java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF create mode 100644 java/com.sap.sse.datamining.ui/build.properties create mode 100644 java/com.sap.sse.datamining.ui/pom.xml diff --git a/java/com.sap.sse.datamining.ui/.classpath b/java/com.sap.sse.datamining.ui/.classpath new file mode 100644 index 00000000000..ab3cb64a076 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/java/com.sap.sse.datamining.ui/.gitignore b/java/com.sap.sse.datamining.ui/.gitignore new file mode 100644 index 00000000000..ae3c1726048 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/java/com.sap.sse.datamining.ui/.project b/java/com.sap.sse.datamining.ui/.project new file mode 100644 index 00000000000..75e565d8fe7 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/.project @@ -0,0 +1,28 @@ + + + com.sap.sse.datamining.ui + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..a698e59674f --- /dev/null +++ b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..9eb34ae1dbc --- /dev/null +++ b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Ui +Bundle-SymbolicName: com.sap.sse.datamining.ui +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: com.sap.sse.common;bundle-version="1.0.0", + com.sap.sse.datamining.shared;bundle-version="1.0.0" +Bundle-ActivationPolicy: lazy diff --git a/java/com.sap.sse.datamining.ui/build.properties b/java/com.sap.sse.datamining.ui/build.properties new file mode 100644 index 00000000000..34d2e4d2dad --- /dev/null +++ b/java/com.sap.sse.datamining.ui/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/java/com.sap.sse.datamining.ui/pom.xml b/java/com.sap.sse.datamining.ui/pom.xml new file mode 100644 index 00000000000..31cd313d40d --- /dev/null +++ b/java/com.sap.sse.datamining.ui/pom.xml @@ -0,0 +1,13 @@ + + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sse.datamining.ui + eclipse-plugin + \ No newline at end of file From c3959de2a5eeb0f21c7a8322aeb9b19cef53f6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Wed, 4 Apr 2018 12:59:23 +0200 Subject: [PATCH 02/63] init (removed dependencies) --- java/com.sap.sse.datamining.ui/.classpath | 1 - java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF | 2 -- 2 files changed, 3 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/.classpath b/java/com.sap.sse.datamining.ui/.classpath index ab3cb64a076..eca7bdba8f0 100644 --- a/java/com.sap.sse.datamining.ui/.classpath +++ b/java/com.sap.sse.datamining.ui/.classpath @@ -3,6 +3,5 @@ - diff --git a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF index 9eb34ae1dbc..093b039b7be 100644 --- a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF @@ -5,6 +5,4 @@ Bundle-SymbolicName: com.sap.sse.datamining.ui Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: com.sap.sse.common;bundle-version="1.0.0", - com.sap.sse.datamining.shared;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy From ed1fae0c8f17f0eb7a99c38f02882acd86607c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Thu, 12 Apr 2018 07:40:59 +0200 Subject: [PATCH 03/63] divided datamining from sailing specific classes --- ...efaultPolarWindAngleBoatSpeedFunction.java | 4 +- ...tartlineAdvantageByGeometryCalculator.java | 2 +- .../StartlineAdvantagesByWindCalculator.java | 8 +- ...lineAdvantageCalculationDataRetriever.java | 2 +- .../FoilingSegmentsDataMiningSettings.java | 4 +- .../SailingDataMiningSerializationDummy.java | 6 +- .../TestSailingFunctionsRegistration.java | 2 +- .../datamining/SailingClusterGroups.java | 2 +- .../datamining/SailingPredefinedQueries.java | 2 +- .../datamining/data/HasBravoFixContext.java | 4 +- .../data/HasBravoFixTrackContext.java | 2 +- .../data/HasFoilingSegmentContext.java | 4 +- .../datamining/data/HasGPSFixContext.java | 2 +- .../datamining/data/HasManeuverContext.java | 2 +- .../data/HasRaceOfCompetitorContext.java | 4 +- .../HasTrackedLegOfCompetitorContext.java | 2 +- ...ingAverageDegreesAggregationProcessor.java | 2 +- ...arallelBearingMaxAggregationProcessor.java | 2 +- ...arallelBearingMinAggregationProcessor.java | 2 +- ...elDistanceAverageAggregationProcessor.java | 2 +- ...rallelDistanceMaxAggregationProcessor.java | 2 +- ...lelDistanceMedianAggregationProcessor.java | 2 +- ...rallelDistanceMinAggregationProcessor.java | 2 +- ...rallelDistanceSumAggregationProcessor.java | 2 +- .../impl/data/BravoFixTrackWithContext.java | 2 +- .../impl/data/BravoFixWithContext.java | 4 +- ...verCurveWithEstimationDataWithContext.java | 4 +- .../impl/data/FoilingSegmentWithContext.java | 4 +- .../impl/data/GPSFixWithContext.java | 2 +- .../impl/data/ManeuverWithContext.java | 2 +- .../data/RaceOfCompetitorWithContext.java | 4 +- .../RaceResultOfCompetitorWithContext.java | 2 +- .../TrackedLegOfCompetitorWithContext.java | 2 +- .../test/DeclinationStoreTest.java | 4 +- .../test/SimpleDeclinationTest.java | 2 +- .../sap/sailing/declination/Declination.java | 2 +- .../declination/DeclinationService.java | 2 +- .../declination/impl/ColoradoImporter.java | 2 +- .../impl/DeclinationRecordImpl.java | 4 +- .../impl/DeclinationServiceImpl.java | 2 +- .../declination/impl/DeclinationStore.java | 4 +- .../declination/impl/NOAAImporter.java | 2 +- .../impl/BravoGPSFixImporter.java | 2 +- .../org.eclipse.core.resources.prefs | 1 - .../domain/common/AbstractDistance.java | 2 + .../domain/common/AbstractPosition.java | 4 +- .../domain/common/AbstractSpeedImpl.java | 2 + .../domain/common/BearingChangeAnalyzer.java | 1 + .../sailing/domain/common/BearingCluster.java | 1 + .../domain/common/BoatClassMasterdata.java | 1 + .../sap/sailing/domain/common/Placemark.java | 2 + .../sap/sailing/domain/common/Position.java | 3 + .../domain/common/SpeedWithBearing.java | 2 + .../sailing/domain/common/TargetTimeInfo.java | 2 + .../com/sap/sailing/domain/common/Wind.java | 1 + .../confidence/BearingWithConfidence.java | 2 +- .../BearingWithConfidenceCluster.java | 2 +- .../common/confidence/ConfidenceFactory.java | 2 +- .../common/confidence/HasConfidence.java | 2 +- .../impl/BearingWithConfidenceImpl.java | 2 +- .../ConfidenceBasedAveragerFactoryImpl.java | 2 +- .../impl/HyperbolicDistanceWeigher.java | 2 +- .../impl/PositionAndTimePointWeigher.java | 2 +- .../domain/common/dto/BoatClassDTO.java | 2 +- .../common/dto/LeaderboardEntryDTO.java | 2 +- .../domain/common/dto/LeaderboardRowDTO.java | 2 +- .../AbstractSpeedWithAbstractBearingImpl.java | 7 +- .../impl/AbstractSpeedWithBearingImpl.java | 2 +- .../impl/BearingChangeAnalyzerImpl.java | 3 +- .../common/impl/CentralAngleDistance.java | 2 +- .../impl/KilometersPerHourSpeedImpl.java | 2 +- .../domain/common/impl/KnotSpeedImpl.java | 2 +- .../common/impl/KnotSpeedWithBearingImpl.java | 2 +- .../domain/common/impl/MeterDistance.java | 2 +- .../common/impl/MeterPerSecondSpeedImpl.java | 2 +- ...erPerSecondSpeedWithDegreeBearingImpl.java | 2 +- .../common/impl/NauticalMileDistance.java | 2 +- .../domain/common/impl/PlacemarkImpl.java | 2 +- .../domain/common/impl/RadianBearingImpl.java | 4 +- .../common/impl/TargetTimeInfoImpl.java | 4 +- .../sailing/domain/common/impl/WindImpl.java | 2 +- .../scalablevalue/impl/ScalableBearing.java | 2 +- .../scalablevalue/impl/ScalableDistance.java | 2 +- .../scalablevalue/impl/ScalableSpeed.java | 2 +- .../impl/ScalableSpeedWithBearing.java | 4 +- .../common/tracking/BravoExtendedFix.java | 4 +- .../domain/common/tracking/BravoFix.java | 4 +- .../domain/common/tracking/GPSFix.java | 2 +- .../impl/AbstractCompactGPSFixMovingImpl.java | 4 +- .../impl/AbstractCompactWindImpl.java | 2 +- .../tracking/impl/AbstractGPSFixImpl.java | 6 +- .../tracking/impl/BravoExtendedFixImpl.java | 6 +- .../common/tracking/impl/BravoFixImpl.java | 6 +- .../tracking/impl/CompactPositionHelper.java | 4 +- .../tracking/impl/GPSFixMovingImpl.java | 2 +- .../impl/PreciseCompactGPSFixImpl.java | 4 +- .../impl/PreciseCompactGPSFixMovingImpl.java | 4 +- .../tracking/impl/PreciseCompactWindImpl.java | 4 +- .../tracking/impl/VeryCompactGPSFixImpl.java | 4 +- .../impl/VeryCompactGPSFixMovingImpl.java | 4 +- .../tracking/impl/VeryCompactWindImpl.java | 4 +- .../sailing/domain/deckmanadapter/Record.java | 2 +- .../impl/ExpeditionGPSFixImporter.java | 2 +- .../igtimiadapter/impl/WindReceiverTest.java | 2 +- .../domain/igtimiadapter/datatypes/AWA.java | 4 +- .../domain/igtimiadapter/datatypes/AWS.java | 2 +- .../domain/igtimiadapter/datatypes/COG.java | 4 +- .../igtimiadapter/datatypes/GpsAltitude.java | 2 +- .../datatypes/GpsQualityHdop.java | 2 +- .../domain/igtimiadapter/datatypes/HDG.java | 4 +- .../domain/igtimiadapter/datatypes/HDGM.java | 4 +- .../domain/igtimiadapter/datatypes/SOG.java | 2 +- .../domain/igtimiadapter/datatypes/STW.java | 2 +- .../shared/IgtimiWindReceiver.java | 4 +- .../impl/DomainObjectFactoryImpl.java | 2 +- .../impl/MongoObjectFactoryImpl.java | 4 +- .../test/AbstractGPSFixStoreTest.java | 2 +- .../impl/CreateAndTrackWithRaceLogTest.java | 2 +- .../impl/RaceLogFixTrackerManagerTest.java | 2 +- .../test/impl/SensorFixStoreAndLoadTest.java | 4 +- .../test/impl/SensorFixStoreTest.java | 2 +- .../test/manual/PostFixes.java | 6 +- .../sap/sailing/domain/base/BoatClass.java | 2 +- .../com/sap/sailing/domain/base/Waypoint.java | 2 +- .../domain/base/impl/BoatClassImpl.java | 2 +- .../domain/base/impl/WaypointImpl.java | 2 +- .../sailing/domain/statistics/Statistics.java | 4 +- .../statistics/impl/StatisticsImpl.java | 4 +- .../services/MessageFileServiceImpl.java | 6 +- .../test/SailMasterConnectivityTest.java | 2 +- .../test/SwissTimingSailMasterLiveTest.java | 4 +- .../domain/swisstimingadapter/Fix.java | 4 +- .../swisstimingadapter/SailMasterAdapter.java | 2 +- .../SailMasterConnector.java | 6 +- .../SailMasterListener.java | 2 +- .../SwissTimingMessage.java | 2 +- .../swisstimingadapter/impl/FixImpl.java | 4 +- .../impl/SailMasterConnectorImpl.java | 8 +- .../impl/SwissTimingMessageImpl.java | 2 +- .../impl/SwissTimingMessageParserImpl.java | 2 +- .../impl/SwissTimingRaceTrackerImpl.java | 4 +- .../SwissTimingReplayAdapterServiceTest.java | 2 +- .../SwissTimingReplayToDomainAdapter.java | 4 +- .../test/BearingChangeAnalyzerTest.java | 2 +- .../domain/common/test/BeaufortTest.java | 2 +- .../common/test/ScalableBearingTest.java | 4 +- ...urveEnteringAndExitingComputationTest.java | 4 +- .../IncrementalManeuverComputationTest.java | 2 +- .../WaypointPositionAndDistanceCacheTest.java | 2 +- .../impl/CandidateFinderImplWhiteBoxTest.java | 2 +- ...stFarthestAheadWithSkippedMarkPassing.java | 2 +- ...mpleTimeOnTimeRankingWithOneUpwindLeg.java | 2 +- .../sap/sailing/domain/test/BearingTest.java | 4 +- .../sailing/domain/test/ConcurrencyTest.java | 2 +- .../sailing/domain/test/ConfidenceTest.java | 4 +- .../test/CourseChangeCalculatorTest.java | 2 +- ...ationVersusOneDesignRankingMetricTest.java | 2 +- ...eInvalidationAfterLoadingFinishedTest.java | 4 +- .../test/LeaderboardForKielWeekTest.java | 2 +- .../sailing/domain/test/LineAnalysisTest.java | 6 +- .../domain/test/ManeuverAnalysis505Test.java | 2 +- ...ManeuverAnalysisIDMChampionsFinalTest.java | 2 +- .../test/ManeuverAnalysisQingdao2014Test.java | 2 +- ...etectionOnKielerWoche505Race2DataTest.java | 2 +- ...neuverDetectionOnMdM2011SemifinalTest.java | 2 +- .../test/ManeuverLossOnPenaltyCircleTest.java | 2 +- ...teFromRaceLogFinishPositioingListTest.java | 2 +- .../test/MarkPositionTimeFilterTest.java | 2 +- .../test/PassingInstructionParserTest.java | 2 +- ...blePenaltyCircleAtKielerWoche2014Test.java | 2 +- .../sailing/domain/test/PositionAssert.java | 4 +- .../sap/sailing/domain/test/PositionTest.java | 6 +- ...ecutionOrderProvdiderAttachDetachTest.java | 2 +- .../sailing/domain/test/ReachingLegTest.java | 6 +- .../test/SerializationWithOnlineRaceTest.java | 2 +- .../domain/test/ShortTimeWindCacheTest.java | 2 +- .../sailing/domain/test/SpeedUnitTest.java | 4 +- .../domain/test/StoredTrackBasedTest.java | 2 +- .../com/sap/sailing/domain/test/TWATest.java | 4 +- .../com/sap/sailing/domain/test/TackTest.java | 2 +- ...altyCircleAtTravemuenderWoche2014Test.java | 2 +- .../domain/test/TargetTimeEstimationTest.java | 4 +- .../domain/test/TimeInLegProgressesTest.java | 2 +- .../sailing/domain/test/TrackBasedTest.java | 2 +- .../domain/test/TrackSmootheningTest.java | 4 +- .../sap/sailing/domain/test/TrackTest.java | 10 +- .../domain/test/VirtualWindFixesTest.java | 2 +- .../WindEstimationLockingUnderLoadTest.java | 2 +- ...WindEstimationOnConstructedTracksTest.java | 4 +- ...timationOnKielerWoche505Race2DataTest.java | 2 +- .../WindEstimationOnStoredTracksTest.java | 2 +- .../com/sap/sailing/domain/test/WindTest.java | 4 +- .../markpassing/AbstractMarkPassingTest.java | 2 +- .../MarkPassingCalculatorPerformanceTest.java | 2 +- .../markpassing/MarkPassingWhiteBoxTest.java | 2 +- .../domain/test/mock/MockedTrackedRace.java | 6 +- ...ockedTrackedRaceWithStartTimeAndRanks.java | 6 +- ...tionAndExtrapolationWithSpeedInfoTest.java | 2 +- .../impl/DomainFactoryImpl.java | 2 +- .../impl/WindFinderReportParser.java | 2 +- .../domain/base/SpeedWithConfidence.java | 2 +- .../domain/base/impl/DomainFactoryImpl.java | 2 +- .../domain/base/impl/DouglasPeucker.java | 4 +- ...KilometersPerHourSpeedWithBearingImpl.java | 4 +- .../base/impl/SpeedWithConfidenceImpl.java | 2 +- .../impl/ConfidenceBasedWindAveragerImpl.java | 2 +- .../domain/leaderboard/Leaderboard.java | 4 +- .../LeaderboardDTOCalculationReuseCache.java | 4 +- .../impl/AbstractLeaderboardWithCache.java | 6 +- .../impl/AbstractSimpleLeaderboardImpl.java | 4 +- ...aLeaderboardWithCompetitorElimination.java | 2 +- ...mpleteManeuverCurveWithEstimationData.java | 2 +- .../HasDetailedManeuverLoss.java | 4 +- .../ManeuverMainCurveWithEstimationData.java | 2 +- ...teManeuverCurveWithEstimationDataImpl.java | 2 +- .../impl/IncrementalManeuverDetectorImpl.java | 2 +- .../impl/ManeuverCurveBoundaryExtension.java | 2 +- ...eCourseAndSpeedWithEstimationDataImpl.java | 4 +- .../impl/ManeuverDetectorImpl.java | 8 +- .../maneuverdetection/impl/ManeuverLoss.java | 2 +- ...euverMainCurveDetailsWithBearingSteps.java | 2 +- ...neuverMainCurveWithEstimationDataImpl.java | 4 +- .../impl/WindMeasurement.java | 2 +- .../impl/CandidateChooserImpl.java | 4 +- .../impl/CandidateFinderImpl.java | 6 +- .../impl/DistanceCandidateImpl.java | 2 +- .../WaypointPositionAndDistanceCache.java | 2 +- .../splining/Vector2D.java | 2 +- .../polars/NoPolarDataAvailableException.java | 4 +- .../domain/polars/PolarDataService.java | 4 +- .../domain/ranking/AbstractRankingMetric.java | 4 +- .../ORCPerformanceCurveCertificate.java | 6 +- .../ORCPerformanceCurveRankingMetric.java | 2 +- .../ranking/OneDesignRankingMetric.java | 2 +- .../sailing/domain/ranking/RankingMetric.java | 2 +- .../TimeOnTimeAndDistanceRankingMetric.java | 2 +- .../domain/tracking/BravoFixTrack.java | 4 +- .../sailing/domain/tracking/GPSFixTrack.java | 4 +- .../domain/tracking/LegBearingCache.java | 2 +- .../sailing/domain/tracking/LineDetails.java | 4 +- .../sap/sailing/domain/tracking/Maneuver.java | 4 +- .../tracking/ManeuverCurveBoundaries.java | 2 +- .../MarkPositionAtTimePointCache.java | 2 +- .../sailing/domain/tracking/TrackedLeg.java | 4 +- .../tracking/TrackedLegOfCompetitor.java | 6 +- .../sailing/domain/tracking/TrackedRace.java | 6 +- .../sailing/domain/tracking/WindTrack.java | 2 +- .../tracking/impl/BravoFixTrackImpl.java | 6 +- .../tracking/impl/CourseChangeCalculator.java | 2 +- .../tracking/impl/CrossTrackErrorCache.java | 2 +- .../impl/DynamicGPSFixMovingTrackImpl.java | 6 +- .../domain/tracking/impl/GPSFixTrackImpl.java | 8 +- .../domain/tracking/impl/LineDetailsImpl.java | 4 +- .../impl/ManeuverCurveBoundariesImpl.java | 2 +- .../domain/tracking/impl/ManeuverImpl.java | 4 +- .../ManeuverWithMainCurveBoundariesImpl.java | 2 +- ...ithStableSpeedAndCourseBoundariesImpl.java | 2 +- .../MarkPositionAtTimePointCacheImpl.java | 2 +- .../domain/tracking/impl/MaxSpeedCache.java | 2 +- ...oCachingWindLegTypeAndLegBearingCache.java | 2 +- ...onCachingMarkPositionAtTimePointCache.java | 2 +- .../tracking/impl/RaceRankComparator.java | 2 +- .../TrackBasedEstimationWindTrackImpl.java | 2 +- .../domain/tracking/impl/TrackedLegImpl.java | 6 +- .../impl/TrackedLegOfCompetitorImpl.java | 6 +- .../domain/tracking/impl/TrackedRaceImpl.java | 6 +- .../domain/tracking/impl/WindTrackImpl.java | 6 +- .../tracking/impl/WindwardToGoComparator.java | 2 +- .../src/com/sap/sailing/util/RegattaUtil.java | 2 +- .../ExpeditionMessage.java | 2 +- .../ExpeditionWindTracker.java | 2 +- .../impl/ExpeditionMessageImpl.java | 4 +- .../grib/impl/SpeedAndDirectionWindField.java | 2 +- .../gwt/ui/test/MockedTrackedRace.java | 6 +- .../org.eclipse.core.resources.prefs | 2 - .../META-INF/MANIFEST.MF | 2 + ...aMiningSettings_CustomFieldSerializer.java | 4 +- ...greeBearingImpl_CustomFieldSerializer.java | 2 +- .../common/tracking/impl/CompactWindImpl.java | 2 +- .../tracking/impl/VeryCompactWindImpl.java | 2 +- .../boats/RaceEndWithBoatsPresenterImpl.java | 2 +- .../boats/RaceEndWithBoatsView.java | 2 +- .../boats/RaceEndWithBoatsViewImpl.java | 2 +- ...LiveRaceWithRacemapAndLeaderBoardView.java | 2 +- ...RaceWithRacemapAndLeaderBoardViewImpl.java | 2 +- .../BoatClassMasterdataSuggestOracle.java | 1 + .../GetSixtyInchStatisticAction.java | 2 +- .../sixtyinch/GetSixtyInchStatisticDTO.java | 2 +- .../event/statistics/EventStatisticsDTO.java | 4 +- .../eventlist/EventListYearDTO.java | 4 +- .../eventview/RegattaMetadataDTO.java | 2 +- .../gwt/home/server/LeaderboardContext.java | 2 +- .../gwt/home/server/StatisticsCalculator.java | 2 +- .../filter/AbstractAsyncSuggestBoxFilter.java | 2 +- .../filter/AbstractListSuggestBoxFilter.java | 2 +- .../filter/AbstractSuggestBoxFilter.java | 6 +- .../RacesByCompetitorTextBoxFilter.java | 2 +- .../SuggestedMultiSelection.java | 2 +- .../client/settingtypes/DistanceSetting.java | 2 +- .../converter/DistanceConverter.java | 2 +- .../gwt/ui/adminconsole/BoatEditDialog.java | 2 +- .../CompetitorWithBoatCreateDialog.java | 2 +- .../CompetitorWithBoatEditDialog.java | 2 +- .../CopyCourseAndCompetitorsDialog.java | 2 +- .../RegattaWithSeriesAndFleetsDialog.java | 2 +- ...martphoneTrackingEventManagementPanel.java | 2 +- .../sailing/gwt/ui/client/StringMessages.java | 2 +- .../sailing/gwt/ui/client/WindIndicator.java | 2 +- .../ui/client/shared/racemap/BoatOverlay.java | 2 +- .../shared/racemap/CoordinateSystem.java | 2 +- .../shared/racemap/CourseMarkOverlay.java | 4 +- .../racemap/DelegateCoordinateSystem.java | 2 +- .../racemap/IdentityCoordinateSystem.java | 2 +- .../gwt/ui/client/shared/racemap/RaceMap.java | 6 +- .../shared/racemap/RaceMapSettings.java | 2 +- .../RaceMapSettingsDialogComponent.java | 2 +- .../RotateAndTranslateCoordinateSystem.java | 4 +- .../ui/datamining/DataMiningEntryPoint.java | 13 +- ...=> DataMiningSettingsInfoManagerImpl.java} | 26 +- .../TabbedSailingResultsPresenter.java | 53 +++ .../gwt/ui/leaderboard/LeaderboardPanel.java | 2 +- .../PolarBackendResultsPresenter.java | 2 +- .../ui/polarmining/PolarResultsPresenter.java | 2 +- .../gwt/ui/raceboard/RaceBoardPanel.java | 2 +- .../gwt/ui/server/DataMiningServiceImpl.java | 170 ++++++---- .../gwt/ui/server/SailingServiceImpl.java | 8 +- .../gwt/ui/server/SimulatorServiceImpl.java | 8 +- .../gwt/ui/server/SimulatorServiceUtils.java | 4 +- .../GPSFixDTOWithSpeedWindTackAndLegType.java | 2 +- .../sap/sailing/gwt/ui/shared/RegattaDTO.java | 2 +- .../ui/shared/RegattaOverviewEntryDTO.java | 2 +- .../racemap/AbstractMarkVectorGraphics.java | 4 +- .../racemap/BoatMarkVectorGraphics.java | 6 +- .../ui/shared/racemap/CanvasOverlayV3.java | 4 +- .../ui/shared/racemap/FixVectorGraphics.java | 2 +- .../ui/shared/racemap/MarkVectorGraphics.java | 4 +- .../gwt/ui/simulator/PathCanvasOverlay.java | 4 +- .../ui/simulator/PathLegendCanvasOverlay.java | 4 +- .../gwt/ui/simulator/PathPolyline.java | 2 +- .../ui/simulator/WindFieldCanvasOverlay.java | 4 +- .../WindLineGuidesCanvasOverlay.java | 4 +- .../streamlets/PositionDTOWeigher.java | 2 +- .../WindInfoForRaceVectorField.java | 2 +- .../sailing/mongodb/test/ConvertWindData.java | 2 +- .../mongodb/test/RaceLogMongoDBTest.java | 4 +- .../mongodb/test/StoreGPSFixTrackTest.java | 2 +- .../TestStoringAndRetrievingWindData.java | 2 +- ...estStoringAndRetrievingWindTracksTest.java | 2 +- .../sap/sailing/nmeaconnector/NmeaUtil.java | 2 +- .../sailing/nmeaconnector/TimedBearing.java | 2 +- .../impl/DegreeBearingWithTimepoint.java | 2 +- .../KnotSpeedWithBearingAndTimepoint.java | 2 +- .../impl/NMEAWindReceiverImpl.java | 6 +- .../nmeaconnector/impl/NmeaUtilImpl.java | 6 +- .../datamining/shared/PolarStatistic.java | 2 +- .../PolarGPSFixRetrievalProcessor.java | 2 +- .../PolarBackendDataAggregationProcessor.java | 2 +- .../data/impl/GPSFixWithPolarContext.java | 2 +- .../data/impl/PolarStatisticImpl.java | 4 +- .../data/impl/SpeedClusterGroup.java | 2 +- .../test/BearingClusterGroupTest.java | 4 +- .../clusters/test/SpeedClusterGroupTest.java | 2 +- .../mining/test/PolarDataMinerTest.java | 4 +- ...EstimationFromManeuversOnAFew505Races.java | 4 +- .../polars/impl/PolarDataServiceImpl.java | 6 +- .../mining/AngleAndSpeedRegression.java | 6 +- .../mining/AngleClusterPolarClusterKey.java | 2 +- .../polars/mining/BearingClusterGroup.java | 4 +- .../polars/mining/BearingComparator.java | 2 +- .../CubicRegressionPerCourseProcessor.java | 2 +- .../mining/GPSFixMovingWithPolarContext.java | 4 +- .../PolarDataDimensionCollectionFactory.java | 2 +- .../sailing/polars/mining/PolarDataMiner.java | 6 +- .../polars/mining/RoundedTrueWindAngle.java | 2 +- ...eedRegressionPerAngleClusterProcessor.java | 6 +- .../ManeuverBasedWindEstimationTrackImpl.java | 8 +- .../ScalableBearingAndScalableDouble.java | 2 +- .../impl/StatisticsJsonDeserializer.java | 4 +- .../impl/TargetTimeInfoDeserializer.java | 6 +- .../impl/WindJsonDeserializer.java | 4 +- .../impl/StatisticsJsonSerializer.java | 2 +- .../RaceLogWindFixEventSerializerTest.java | 4 +- .../impl/GPSFixMovingJsonDeserializer.java | 4 +- ...ceWithIntegerRelationJsonDeserializer.java | 2 +- .../impl/DistanceJsonSerializer.java | 2 +- .../rc/MarkPositionsJsonExportServlet.java | 2 +- .../jaxrs/api/BearingJsonSerializer.java | 2 +- .../gateway/jaxrs/api/DataMiningResource.java | 2 +- .../jaxrs/api/LeaderboardsResource.java | 6 +- .../jaxrs/api/LeaderboardsResourceV2.java | 2 +- .../gateway/jaxrs/api/PolarResource.java | 6 +- .../gateway/jaxrs/api/RegattasResource.java | 4 +- .../windimport/bravo/BravoWindImporter.java | 2 +- .../windimport/expedition/WindLogParser.java | 4 +- .../replication/test/BoatReplicationTest.java | 2 +- .../test/CompetitorReplicationTest.java | 2 +- ...tialLoadReplicationObjectIdentityTest.java | 2 +- .../TrackedRaceContentsReplicationTest.java | 2 +- ...ithGPSFixStoreContentsReplicationTest.java | 2 +- .../server/statistics/StatisticsTest.java | 2 +- .../server/test/MasterDataImportTest.java | 2 +- .../server/test/RaceColumnReloadTest.java | 2 +- .../server/test/WindByRaceLogTest.java | 2 +- .../test/BravoExtendedDataImportTest.java | 2 +- .../RouteConverterGPSFixImporterImpl.java | 2 +- .../server/impl/RacingEventServiceImpl.java | 2 +- .../server/masterdata/DummyTrackedRace.java | 6 +- .../statistics/StatisticsAggregator.java | 4 +- .../statistics/StatisticsCalculator.java | 4 +- .../statistics/TrackedRaceStatistics.java | 4 +- .../TrackedRaceStatisticsCalculator.java | 4 +- .../simulator/test/PolarDiagramCSVTest.java | 8 +- .../sailing/simulator/test/SimulatorTest.java | 2 +- .../sailing/simulator/test/TreeGrowTest.java | 2 +- .../test/WindFieldGeneratorTest.java | 2 +- .../test/util/PathGeneratorTracTracEval.java | 2 +- .../util/PolarDiagramCurrentDataPolar.java | 4 +- .../test/util/PolarDiagramInterpolate.java | 2 +- .../test/util/PolarDiagramPlotDataPolar.java | 4 +- .../test/util/PolarDiagramPlotDataXY.java | 4 +- .../simulator/BoatClassProperties.java | 2 +- .../src/com/sap/sailing/simulator/Grid.java | 6 +- .../sap/sailing/simulator/PolarDiagram.java | 4 +- .../impl/BoatClassPropertiesImpl.java | 2 +- .../sailing/simulator/impl/CurvedGrid.java | 4 +- .../simulator/impl/PathGenerator1Turner.java | 4 +- .../impl/PathGenerator1Turner360.java | 4 +- .../impl/PathGenerator1TurnerLeftDirect.java | 6 +- .../impl/PathGenerator1TurnerRightDirect.java | 6 +- .../simulator/impl/PathGeneratorDijkstra.java | 6 +- .../impl/PathGeneratorDynProgForward.java | 6 +- .../PathGeneratorOpportunistEuclidian.java | 4 +- .../PathGeneratorOpportunistEuclidian360.java | 4 +- .../impl/PathGeneratorOpportunistVMG.java | 2 +- .../simulator/impl/PathGeneratorTracTrac.java | 4 +- .../simulator/impl/PathGeneratorTreeGrow.java | 6 +- .../impl/PathGeneratorTreeGrow360.java | 4 +- .../impl/PathGeneratorTreeGrowBitSet.java | 4 +- .../sap/sailing/simulator/impl/PathImpl.java | 6 +- .../simulator/impl/PolarDiagram49.java | 6 +- .../impl/PolarDiagram49Bethwaite.java | 6 +- .../simulator/impl/PolarDiagram49ORC.java | 6 +- .../simulator/impl/PolarDiagram49STG.java | 6 +- .../simulator/impl/PolarDiagram505STG.java | 6 +- .../simulator/impl/PolarDiagramBase.java | 6 +- .../simulator/impl/PolarDiagramCSV.java | 6 +- .../simulator/impl/PolarDiagramGPS.java | 6 +- .../simulator/impl/PolarDiagramGPSDirect.java | 4 +- .../simulator/impl/RectangularGrid.java | 4 +- .../impl/TimedPositionWithSpeedSimple.java | 2 +- .../impl/WindFieldGeneratorBlastImpl.java | 2 +- .../impl/WindFieldGeneratorImpl.java | 2 +- .../impl/WindFieldGeneratorMeasured.java | 4 +- .../WindFieldGeneratorOscillationImpl.java | 8 +- .../sailing/xmlexport/test/XMLExportTest.java | 2 +- .../sap/sailing/xmlexport/ExportAction.java | 6 +- .../sap/sailing/xmlexport/FoilingData.java | 2 +- .../sailing/xmlexport/LeaderboardData.java | 6 +- .../org.eclipse.core.resources.prefs | 1 + .../com/sap/sse}/common/AbstractBearing.java | 4 +- .../src/com/sap/sse}/common/Bearing.java | 4 +- .../src/com/sap/sse}/common/Distance.java | 4 +- .../src/com/sap/sse}/common/Speed.java | 4 +- .../sse}/common/impl/DegreeBearingImpl.java | 6 +- java/com.sap.sse.datamining.ui/.classpath | 1 + .../META-INF/MANIFEST.MF | 9 + .../AggregatorDefinitionChangedListener.java | 4 +- .../ui}/AggregatorDefinitionProvider.java | 7 +- .../ui}/AnchorDataMiningSettingsControl.java | 20 +- .../ui}/DataMiningComponentProvider.java | 14 +- .../datamining/ui}/DataMiningResources.java | 4 +- .../sse/datamining/ui}/DataMiningService.java | 25 +- .../ui}/DataMiningServiceAsync.java | 25 +- .../ui}/DataMiningSettingsControl.java | 3 +- .../ui}/DataMiningSettingsInfo.java | 12 +- .../ui/DataMiningSettingsInfoManager.java | 7 + ...trieverChainDefinitionChangedListener.java | 4 +- .../DataRetrieverChainDefinitionProvider.java | 11 +- .../ExtractionFunctionChangedListener.java | 4 +- .../ui}/ExtractionFunctionProvider.java | 7 +- .../ui}/FilterSelectionChangedListener.java | 4 +- .../ui}/FilterSelectionPresenter.java | 2 +- .../ui}/FilterSelectionProvider.java | 5 +- .../ui}/GroupingChangedListener.java | 4 +- .../sse/datamining/ui}/GroupingProvider.java | 10 +- .../ui}/ManagedDataMiningQueriesCounter.java | 4 +- .../ui}/QueryDefinitionChangedListener.java | 2 +- .../ui}/QueryDefinitionProvider.java | 7 +- .../sap/sse/datamining/ui}/QueryRunner.java | 8 +- .../sse/datamining/ui}/ResultsPresenter.java | 5 +- .../ui}/ResultsPresenterWithControls.java | 5 +- .../ui}/StatisticChangedListener.java | 2 +- .../sse/datamining/ui}/StatisticProvider.java | 8 +- .../sap/sse/datamining/ui/StringMessages.java | 101 ++++++ .../sap/sse/datamining/ui}/WithControls.java | 4 +- .../ui}/developer/PredefinedQueryRunner.java | 57 ++-- .../ui}/developer/QueryDefinitionParser.java | 2 +- .../ui}/developer/QueryDefinitionViewer.java | 8 +- .../ManagedDataMiningQueryCallback.java | 9 +- ...SimpleManagedDataMiningQueriesCounter.java | 8 +- .../ui}/execution/SimpleQueryRunner.java | 60 ++-- .../AbstractNumericResultsPresenter.java | 22 +- .../AbstractResultsPresenter.java | 43 +-- .../AbstractTabbedResultsPresenter.java} | 74 ++--- .../presentation/MultiResultsPresenter.java | 10 +- .../PlainFilterSelectionPresenter.java | 62 ++-- .../presentation/PlainResultsPresenter.java | 4 +- .../ui}/presentation/ResultsChart.java | 72 ++-- .../AbstractNumericDataProvider.java | 27 +- ...NumericDataProviderWithStaticMappings.java | 2 +- .../AverageWithStatsDataProvider.java | 49 +-- .../dataproviders/BearingDataProvider.java | 16 +- .../DataProvidersPrecedenceList.java | 2 +- .../dataproviders/DistanceDataProvider.java | 24 +- .../dataproviders/DurationDataProvider.java | 4 +- .../dataproviders/NumberDataProvider.java | 33 +- .../AbstractQueryDefinitionProvider.java | 10 +- ...nctionAndAggregatorDefinitionProvider.java | 148 +++++---- .../MultiDimensionalGroupingProvider.java | 14 +- .../QueryDefinitionProviderWithControls.java | 206 ++++++------ .../RetrieverLevelSettingsComponent.java | 6 +- ...eDataRetrieverChainDefinitionProvider.java | 120 ++++--- .../SuggestBoxStatisticProvider.java | 314 +++++++++--------- .../ControllableMultiSelectionModel.java | 2 +- .../DimensionFilterSelectionProvider.java | 100 +++--- .../ui}/selection/filter/FilterTable.css | 0 .../filter/FilterTableResources.java | 2 +- .../filter/FilterableSelectionTable.java | 56 ++-- ...RetrieverChainFilterSelectionProvider.java | 176 +++++----- ...RetrieverLevelFilterSelectionProvider.java | 54 +-- .../settings/AdvancedDataMiningSettings.java | 10 +- ...ncedDataMiningSettingsDialogComponent.java | 15 +- .../ui}/settings/QueryRunnerSettings.java | 2 +- .../QueryRunnerSettingsDialogComponent.java | 12 +- java/com.sap.sse.gwt/META-INF/MANIFEST.MF | 2 + .../controls/AbstractObjectRenderer.java | 2 +- .../controls/ScrolledTabLayoutPanel.java | 2 +- .../shared/controls/SimpleObjectRenderer.java | 3 +- .../suggestion/AbstractListSuggestOracle.java | 2 +- .../suggestion/AbstractSuggestOracle.java | 2 +- .../client/suggestion/CustomSuggestBox.java | 2 +- .../app/services/TrackingService.java | 6 +- .../app/ui/activities/TrackingActivity.java | 4 +- .../app/ui/fragments/CompassFragment.java | 2 +- .../app/ui/fragments/SpeedFragment.java | 2 +- .../coursedesign/AbstractCourseDesign.java | 2 +- .../AbstractCourseDesignFactory.java | 6 +- .../domain/coursedesign/BoatClassType.java | 2 +- .../app/domain/coursedesign/CourseDesign.java | 2 +- .../coursedesign/CourseDesignComputer.java | 2 +- .../coursedesign/CourseDesignFactory.java | 2 +- .../app/domain/coursedesign/Located.java | 4 +- .../coursedesign/PositionedMarkImpl.java | 6 +- .../TrapezoidCourseDesignFactoryImpl.java | 6 +- ...indWardLeeWardCourseDesignFactoryImpl.java | 6 +- .../ui/fragments/raceinfo/WindFragment.java | 4 +- .../racecommittee/app/utils/GeoUtils.java | 4 +- 557 files changed, 2136 insertions(+), 1808 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/{DataMiningSettingsInfoManager.java => DataMiningSettingsInfoManagerImpl.java} (86%) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java rename java/{com.sap.sailing.domain.common/src/com/sap/sailing/domain => com.sap.sse.common/src/com/sap/sse}/common/AbstractBearing.java (96%) rename java/{com.sap.sailing.domain.common/src/com/sap/sailing/domain => com.sap.sse.common/src/com/sap/sse}/common/Bearing.java (96%) rename java/{com.sap.sailing.domain.common/src/com/sap/sailing/domain => com.sap.sse.common/src/com/sap/sse}/common/Distance.java (97%) rename java/{com.sap.sailing.domain.common/src/com/sap/sailing/domain => com.sap.sse.common/src/com/sap/sse}/common/Speed.java (96%) rename java/{com.sap.sailing.domain.common/src/com/sap/sailing/domain => com.sap.sse.common/src/com/sap/sse}/common/impl/DegreeBearingImpl.java (78%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/AggregatorDefinitionChangedListener.java (83%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/AggregatorDefinitionProvider.java (76%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/AnchorDataMiningSettingsControl.java (94%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/DataMiningComponentProvider.java (81%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/DataMiningResources.java (83%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/DataMiningService.java (80%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/DataMiningServiceAsync.java (84%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/DataMiningSettingsControl.java (88%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/DataMiningSettingsInfo.java (63%) create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfoManager.java rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/DataRetrieverChainDefinitionChangedListener.java (84%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/DataRetrieverChainDefinitionProvider.java (80%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/ExtractionFunctionChangedListener.java (80%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/ExtractionFunctionProvider.java (74%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/FilterSelectionChangedListener.java (65%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/FilterSelectionPresenter.java (82%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/FilterSelectionProvider.java (76%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/GroupingChangedListener.java (63%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/GroupingProvider.java (72%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/ManagedDataMiningQueriesCounter.java (75%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/QueryDefinitionChangedListener.java (82%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/QueryDefinitionProvider.java (83%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/QueryRunner.java (71%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/ResultsPresenter.java (91%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/ResultsPresenterWithControls.java (50%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/StatisticChangedListener.java (80%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/StatisticProvider.java (57%) create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/WithControls.java (79%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/developer/PredefinedQueryRunner.java (86%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/developer/QueryDefinitionParser.java (99%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/developer/QueryDefinitionViewer.java (95%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/execution/ManagedDataMiningQueryCallback.java (82%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/execution/SimpleManagedDataMiningQueriesCounter.java (75%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/execution/SimpleQueryRunner.java (76%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/AbstractNumericResultsPresenter.java (86%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/AbstractResultsPresenter.java (92%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedResultsPresenter.java => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java} (61%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/MultiResultsPresenter.java (95%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/PlainFilterSelectionPresenter.java (84%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/PlainResultsPresenter.java (98%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/ResultsChart.java (93%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/dataproviders/AbstractNumericDataProvider.java (86%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java (95%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/dataproviders/AverageWithStatsDataProvider.java (84%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/dataproviders/BearingDataProvider.java (77%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/dataproviders/DataProvidersPrecedenceList.java (92%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/dataproviders/DistanceDataProvider.java (73%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/dataproviders/DurationDataProvider.java (93%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/presentation/dataproviders/NumberDataProvider.java (55%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/AbstractQueryDefinitionProvider.java (96%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java (71%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/MultiDimensionalGroupingProvider.java (96%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/QueryDefinitionProviderWithControls.java (77%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/RetrieverLevelSettingsComponent.java (96%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/SimpleDataRetrieverChainDefinitionProvider.java (80%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/SuggestBoxStatisticProvider.java (77%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/filter/ControllableMultiSelectionModel.java (98%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/filter/DimensionFilterSelectionProvider.java (82%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/filter/FilterTable.css (100%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/filter/FilterTableResources.java (83%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/filter/FilterableSelectionTable.java (94%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/filter/ListRetrieverChainFilterSelectionProvider.java (71%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/selection/filter/RetrieverLevelFilterSelectionProvider.java (92%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/settings/AdvancedDataMiningSettings.java (90%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/settings/AdvancedDataMiningSettingsDialogComponent.java (88%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/settings/QueryRunnerSettings.java (92%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining => com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui}/settings/QueryRunnerSettingsDialogComponent.java (92%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui => com.sap.sse.gwt/src/com/sap/sse/gwt}/client/shared/controls/AbstractObjectRenderer.java (87%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui => com.sap.sse.gwt/src/com/sap/sse/gwt}/client/shared/controls/ScrolledTabLayoutPanel.java (99%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui => com.sap.sse.gwt/src/com/sap/sse/gwt}/client/shared/controls/SimpleObjectRenderer.java (82%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common => com.sap.sse.gwt/src/com/sap/sse/gwt}/client/suggestion/AbstractListSuggestOracle.java (96%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common => com.sap.sse.gwt/src/com/sap/sse/gwt}/client/suggestion/AbstractSuggestOracle.java (98%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common => com.sap.sse.gwt/src/com/sap/sse/gwt}/client/suggestion/CustomSuggestBox.java (97%) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/DefaultPolarWindAngleBoatSpeedFunction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/DefaultPolarWindAngleBoatSpeedFunction.java index e2365db78ec..e69cf815fe1 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/DefaultPolarWindAngleBoatSpeedFunction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/DefaultPolarWindAngleBoatSpeedFunction.java @@ -6,9 +6,9 @@ import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; /** * Contains a {@link PolynomialSplineFunction} that describes the boat speed at incoming wind angles from 0 to 180 degrees. diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantageByGeometryCalculator.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantageByGeometryCalculator.java index 3c0dfd8e3e9..dbde94a642e 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantageByGeometryCalculator.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantageByGeometryCalculator.java @@ -6,11 +6,11 @@ import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantagesByWindCalculator.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantagesByWindCalculator.java index 0d9668638de..02801bb5ac3 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantagesByWindCalculator.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/StartlineAdvantagesByWindCalculator.java @@ -13,17 +13,17 @@ import com.sap.sailing.dashboards.gwt.shared.dto.StartLineAdvantageDTO; import com.sap.sailing.dashboards.gwt.shared.dto.StartlineAdvantagesWithMaxAndAverageDTO; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.SpeedWithConfidence; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/StartlineAdvantageCalculationDataRetriever.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/StartlineAdvantageCalculationDataRetriever.java index a6318b8312a..a04cad0ee1a 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/StartlineAdvantageCalculationDataRetriever.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/util/actions/startlineadvantage/precalculation/StartlineAdvantageCalculationDataRetriever.java @@ -10,7 +10,6 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -19,6 +18,7 @@ import com.sap.sailing.domain.polars.PolarDataService; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.LineDetails; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/FoilingSegmentsDataMiningSettings.java b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/FoilingSegmentsDataMiningSettings.java index 4b451b7a8bf..03607535a5c 100755 --- a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/FoilingSegmentsDataMiningSettings.java +++ b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/FoilingSegmentsDataMiningSettings.java @@ -1,9 +1,9 @@ package com.sap.sailing.datamining.shared; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.tracking.BravoFix; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.settings.SerializableSettings; public class FoilingSegmentsDataMiningSettings extends SerializableSettings { diff --git a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/SailingDataMiningSerializationDummy.java b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/SailingDataMiningSerializationDummy.java index e815771b4c3..0436d184762 100644 --- a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/SailingDataMiningSerializationDummy.java +++ b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/SailingDataMiningSerializationDummy.java @@ -1,16 +1,16 @@ package com.sap.sailing.datamining.shared; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NauticalSide; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.impl.CentralAngleDistance; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.NauticalMileDistance; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.datamining.shared.SerializationDummy; import com.sap.sse.datamining.shared.data.AverageWithStats; diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/functions/TestSailingFunctionsRegistration.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/functions/TestSailingFunctionsRegistration.java index f3d08eaf678..ea14e461498 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/functions/TestSailingFunctionsRegistration.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/impl/functions/TestSailingFunctionsRegistration.java @@ -19,8 +19,8 @@ import com.sap.sailing.datamining.test.util.OpenFunctionManager; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Nationality; import com.sap.sailing.domain.common.Moving; -import com.sap.sailing.domain.common.Speed; import com.sap.sse.common.Named; +import com.sap.sse.common.Speed; import com.sap.sse.datamining.factories.FunctionFactory; import com.sap.sse.datamining.functions.Function; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingClusterGroups.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingClusterGroups.java index 4324f1be77a..91a7467ee78 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingClusterGroups.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingClusterGroups.java @@ -3,8 +3,8 @@ package com.sap.sailing.datamining; import java.util.ArrayList; import java.util.Collection; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Speed; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterBoundary; import com.sap.sse.datamining.data.ClusterFormatter; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingPredefinedQueries.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingPredefinedQueries.java index e205b5cd84f..0675fdd84f0 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingPredefinedQueries.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingPredefinedQueries.java @@ -18,9 +18,9 @@ import com.sap.sailing.datamining.impl.components.TrackedLegOfCompetitorRetrieva import com.sap.sailing.datamining.impl.components.TrackedLegRetrievalProcessor; import com.sap.sailing.datamining.impl.components.TrackedRaceRetrievalProcessor; import com.sap.sailing.datamining.impl.data.LeaderboardGroupWithContext; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.server.RacingEventService; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasBravoFixContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasBravoFixContext.java index 196a10be1bb..f733d6f9bb4 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasBravoFixContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasBravoFixContext.java @@ -1,11 +1,11 @@ package com.sap.sailing.datamining.data; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.NoWindException; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.tracking.BravoFix; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Statistic; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasBravoFixTrackContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasBravoFixTrackContext.java index 685dfa57d85..6afdab6e8dd 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasBravoFixTrackContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasBravoFixTrackContext.java @@ -1,8 +1,8 @@ package com.sap.sailing.datamining.data; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.tracking.BravoFixTrack; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Statistic; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasFoilingSegmentContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasFoilingSegmentContext.java index 8ae200b223d..5978b911fba 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasFoilingSegmentContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasFoilingSegmentContext.java @@ -2,11 +2,11 @@ package com.sap.sailing.datamining.data; import java.util.Locale; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Wind; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.datamining.annotations.Connector; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasGPSFixContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasGPSFixContext.java index c765896b044..5b0aaf971ca 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasGPSFixContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasGPSFixContext.java @@ -1,8 +1,8 @@ package com.sap.sailing.datamining.data; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.tracking.GPSFixMoving; +import com.sap.sse.common.Bearing; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Statistic; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java index 80a1ba25114..20f381dbdad 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java @@ -1,8 +1,8 @@ package com.sap.sailing.datamining.data; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Tack; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Dimension; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java index ea9d2c50ccb..cde98261efc 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java @@ -1,10 +1,10 @@ package com.sap.sailing.datamining.data; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Dimension; import com.sap.sse.datamining.annotations.Statistic; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java index 3958b151812..b9e258987e1 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java @@ -1,8 +1,8 @@ package com.sap.sailing.datamining.data; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Dimension; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingAverageDegreesAggregationProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingAverageDegreesAggregationProcessor.java index 9907b3fcc01..9ed6ac09b6b 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingAverageDegreesAggregationProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingAverageDegreesAggregationProcessor.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ExecutorService; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.BearingCluster; +import com.sap.sse.common.Bearing; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingMaxAggregationProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingMaxAggregationProcessor.java index da45343ca98..583b3162b23 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingMaxAggregationProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingMaxAggregationProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.SimpleAggregationProcessorDefinition; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingMinAggregationProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingMinAggregationProcessor.java index 40769033a7b..8ea98e108ca 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingMinAggregationProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelBearingMinAggregationProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.SimpleAggregationProcessorDefinition; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceAverageAggregationProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceAverageAggregationProcessor.java index f79264ad57d..3f355dc3840 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceAverageAggregationProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceAverageAggregationProcessor.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.SimpleAggregationProcessorDefinition; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMaxAggregationProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMaxAggregationProcessor.java index af9b9b14bf9..2e81d0059cf 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMaxAggregationProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMaxAggregationProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.SimpleAggregationProcessorDefinition; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMedianAggregationProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMedianAggregationProcessor.java index 2c108deb5d8..b208c2e5e85 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMedianAggregationProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMedianAggregationProcessor.java @@ -10,8 +10,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ExecutorService; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMinAggregationProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMinAggregationProcessor.java index 2cc8f101a64..550927f9fd4 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMinAggregationProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceMinAggregationProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.SimpleAggregationProcessorDefinition; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceSumAggregationProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceSumAggregationProcessor.java index 32a9d42c741..a958a0adb67 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceSumAggregationProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/aggregators/ParallelDistanceSumAggregationProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.SimpleAggregationProcessorDefinition; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/BravoFixTrackWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/BravoFixTrackWithContext.java index 6349f289fd7..31ca7dac00b 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/BravoFixTrackWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/BravoFixTrackWithContext.java @@ -3,8 +3,8 @@ package com.sap.sailing.datamining.impl.data; import com.sap.sailing.datamining.data.HasBravoFixTrackContext; import com.sap.sailing.datamining.data.HasRaceOfCompetitorContext; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.tracking.BravoFixTrack; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/BravoFixWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/BravoFixWithContext.java index fadb0dc0870..f44f7485881 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/BravoFixWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/BravoFixWithContext.java @@ -3,8 +3,6 @@ package com.sap.sailing.datamining.impl.data; import com.sap.sailing.datamining.data.HasBravoFixContext; import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.tracking.BravoFix; @@ -12,6 +10,8 @@ import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindPositionMode; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; public class BravoFixWithContext implements HasBravoFixContext { diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/CompleteManeuverCurveWithEstimationDataWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/CompleteManeuverCurveWithEstimationDataWithContext.java index 8e0d363e0c1..e26c9086bd3 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/CompleteManeuverCurveWithEstimationDataWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/CompleteManeuverCurveWithEstimationDataWithContext.java @@ -3,16 +3,16 @@ package com.sap.sailing.datamining.impl.data; import com.sap.sailing.datamining.data.HasCompleteManeuverCurveWithEstimationDataContext; import com.sap.sailing.datamining.data.HasRaceOfCompetitorContext; import com.sap.sailing.datamining.shared.ManeuverSettings; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.maneuverdetection.CompleteManeuverCurveWithEstimationData; import com.sap.sailing.domain.maneuverdetection.HasDetailedManeuverLoss; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.datamining.shared.impl.dto.ClusterDTO; /** diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/FoilingSegmentWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/FoilingSegmentWithContext.java index c3e38b5e479..0d9c5d04abf 100755 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/FoilingSegmentWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/FoilingSegmentWithContext.java @@ -7,9 +7,7 @@ import com.sap.sailing.datamining.Activator; import com.sap.sailing.datamining.data.HasBravoFixTrackContext; import com.sap.sailing.datamining.data.HasFoilingSegmentContext; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.BearingCluster; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.SpeedWithBearing; @@ -19,6 +17,8 @@ import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.BravoFixTrack; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.datamining.data.Cluster; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/GPSFixWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/GPSFixWithContext.java index 9b90ea1f04e..aa8f7814247 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/GPSFixWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/GPSFixWithContext.java @@ -2,10 +2,10 @@ package com.sap.sailing.datamining.impl.data; import com.sap.sailing.datamining.data.HasGPSFixContext; import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; public class GPSFixWithContext implements HasGPSFixContext { diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java index f7190c98f7d..521f31b40dd 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java @@ -3,7 +3,6 @@ package com.sap.sailing.datamining.impl.data; import com.sap.sailing.datamining.data.HasManeuverContext; import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; @@ -13,6 +12,7 @@ import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceOfCompetitorWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceOfCompetitorWithContext.java index ff51b9e67ab..f66f57ea9d5 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceOfCompetitorWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceOfCompetitorWithContext.java @@ -10,11 +10,9 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -26,6 +24,8 @@ import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindPositionMode; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.datamining.data.Cluster; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java index 96f465a8b9c..f0e7b4a0831 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java @@ -16,7 +16,6 @@ import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableSpeed; @@ -28,6 +27,7 @@ import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java index a4f9ec3b7b8..f0997820386 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java @@ -7,7 +7,6 @@ import com.sap.sailing.datamining.SailingClusterGroups; import com.sap.sailing.datamining.data.HasTrackedLegContext; import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.leaderboard.Leaderboard; @@ -15,6 +14,7 @@ import com.sap.sailing.domain.tracking.BravoFixTrack; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java index 40fabc1660d..ec231cd153d 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java @@ -31,12 +31,12 @@ import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.impl.DeclinationImporter; import com.sap.sailing.declination.impl.DeclinationRecordImpl; import com.sap.sailing.declination.impl.DeclinationStore; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.quadtree.QuadTree; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public abstract class DeclinationStoreTest extends AbstractDeclinationTest { diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java index 8cda73e4694..15fbea3ce81 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java @@ -12,8 +12,8 @@ import org.xml.sax.SAXException; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.impl.DeclinationImporter; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.impl.DegreePosition; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/Declination.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/Declination.java index 7bc474b5ec1..83b48e7e535 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/Declination.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/Declination.java @@ -1,7 +1,7 @@ package com.sap.sailing.declination; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java index 90784c5250c..ce150f34bea 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java @@ -6,10 +6,10 @@ import java.text.ParseException; import com.sap.sailing.declination.impl.DeclinationImporter; import com.sap.sailing.declination.impl.DeclinationServiceImpl; import com.sap.sailing.declination.impl.NOAAImporter; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Mile; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.CentralAngleDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; public interface DeclinationService { diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/ColoradoImporter.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/ColoradoImporter.java index 8019535cc76..8b3abf1b9b5 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/ColoradoImporter.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/ColoradoImporter.java @@ -16,9 +16,9 @@ import org.xml.sax.helpers.DefaultHandler; import com.sap.sailing.declination.Declination; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationRecordImpl.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationRecordImpl.java index 216c54ba116..7e1aa0e50c2 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationRecordImpl.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationRecordImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.declination.impl; import com.sap.sailing.declination.Declination; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; public class DeclinationRecordImpl implements Declination { private static final long serialVersionUID = 6918630656182340186L; diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationServiceImpl.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationServiceImpl.java index 154270264ca..ff06b670108 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationServiceImpl.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationServiceImpl.java @@ -9,9 +9,9 @@ import java.util.Map; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.DeclinationService; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.quadtree.QuadTree; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; public class DeclinationServiceImpl implements DeclinationService { diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationStore.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationStore.java index 327d0219fbc..996aaeb4b7b 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationStore.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationStore.java @@ -19,12 +19,12 @@ import javax.xml.parsers.ParserConfigurationException; import org.xml.sax.SAXException; import com.sap.sailing.declination.Declination; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.quadtree.QuadTree; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/NOAAImporter.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/NOAAImporter.java index 3febf4decc3..4f4b439d83b 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/NOAAImporter.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/NOAAImporter.java @@ -19,8 +19,8 @@ import org.xml.sax.SAXException; import com.sap.sailing.declination.Declination; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Imports magnetic declination data for earth from NOAA (http://www.ngdc.noaa.gov) diff --git a/java/com.sap.sailing.domain.bravoadapter/src/com/sap/sailing/domain/bravoadapter/impl/BravoGPSFixImporter.java b/java/com.sap.sailing.domain.bravoadapter/src/com/sap/sailing/domain/bravoadapter/impl/BravoGPSFixImporter.java index c6c635528d5..2c1d44c73d1 100755 --- a/java/com.sap.sailing.domain.bravoadapter/src/com/sap/sailing/domain/bravoadapter/impl/BravoGPSFixImporter.java +++ b/java/com.sap.sailing.domain.bravoadapter/src/com/sap/sailing/domain/bravoadapter/impl/BravoGPSFixImporter.java @@ -6,7 +6,6 @@ import java.util.Arrays; import java.util.Date; import java.util.concurrent.atomic.AtomicBoolean; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.sensordata.BravoExtendedSensorDataMetadata; @@ -19,6 +18,7 @@ import com.sap.sailing.domain.trackimport.FormatNotSupportedException; import com.sap.sailing.domain.trackimport.GPSFixImporter; import com.sap.sailing.server.gateway.windimport.bravo.FunnyDegreeConverter; import com.sap.sailing.server.trackfiles.impl.BravoExtendedDataImporterImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; public class BravoGPSFixImporter implements GPSFixImporter { @Override diff --git a/java/com.sap.sailing.domain.common/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sailing.domain.common/.settings/org.eclipse.core.resources.prefs index f75adda2c16..864421901f2 100755 --- a/java/com.sap.sailing.domain.common/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sailing.domain.common/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,4 @@ eclipse.preferences.version=1 -encoding//src/com/sap/sailing/domain/common/AbstractBearing.java=UTF-8 encoding//src/com/sap/sailing/domain/common/AbstractPosition.java=UTF-8 encoding//src/com/sap/sailing/domain/common/LegType.java=UTF-8 encoding//src/com/sap/sailing/domain/common/Position.java=UTF-8 diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractDistance.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractDistance.java index 3bb436cd02d..19b15315250 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractDistance.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractDistance.java @@ -2,7 +2,9 @@ package com.sap.sailing.domain.common; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.common.impl.NauticalMileDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; public abstract class AbstractDistance implements Distance { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java index 60df2d1d938..bf0ab3c1ef5 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java @@ -1,11 +1,13 @@ package com.sap.sailing.domain.common; import com.sap.sailing.domain.common.impl.CentralAngleDistance; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.RadianBearingImpl; import com.sap.sailing.domain.common.impl.RadianPosition; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.util.RoundingUtil; public class AbstractPosition implements Position { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractSpeedImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractSpeedImpl.java index cbc29b80c81..b2da70af598 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractSpeedImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractSpeedImpl.java @@ -1,7 +1,9 @@ package com.sap.sailing.domain.common; import com.sap.sailing.domain.common.impl.NauticalMileDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsDurationImpl; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BearingChangeAnalyzer.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BearingChangeAnalyzer.java index 639eaa2fa20..b3830a812f3 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BearingChangeAnalyzer.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BearingChangeAnalyzer.java @@ -1,6 +1,7 @@ package com.sap.sailing.domain.common; import com.sap.sailing.domain.common.impl.BearingChangeAnalyzerImpl; +import com.sap.sse.common.Bearing; /** * Helps analyze a change of a course over ground / {@link Bearing} and in particular can judge whether diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BearingCluster.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BearingCluster.java index 9b0d03b6f43..1acd615e57c 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BearingCluster.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BearingCluster.java @@ -3,6 +3,7 @@ package com.sap.sailing.domain.common; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.confidence.BearingWithConfidenceCluster; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; +import com.sap.sse.common.Bearing; /** * Contains a number of {@link Bearing} objects and maintains the average bearing. For a given {@link Bearing} it diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java index d4c071c3ec2..09c8560c3a5 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; public enum BoatClassMasterdata { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Placemark.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Placemark.java index 3ec6aae6c15..1dd04d6492f 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Placemark.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Placemark.java @@ -3,6 +3,8 @@ package com.sap.sailing.domain.common; import java.io.Serializable; import java.util.Comparator; +import com.sap.sse.common.Distance; + /** * Used to define a populated place in the world.
* Used by {@link ReverseGeocoder}. diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java index 20132975fb8..512a00bd032 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java @@ -2,6 +2,9 @@ package com.sap.sailing.domain.common; import java.io.Serializable; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; + public interface Position extends Serializable { double getLatRad(); diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/SpeedWithBearing.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/SpeedWithBearing.java index 09f41446588..922e93cf28b 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/SpeedWithBearing.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/SpeedWithBearing.java @@ -1,5 +1,7 @@ package com.sap.sailing.domain.common; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.datamining.annotations.Statistic; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TargetTimeInfo.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TargetTimeInfo.java index 294217b53cd..8f63eb58391 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TargetTimeInfo.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TargetTimeInfo.java @@ -1,5 +1,7 @@ package com.sap.sailing.domain.common; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Wind.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Wind.java index 3c6ac7b076e..1421d6deb82 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Wind.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Wind.java @@ -1,5 +1,6 @@ package com.sap.sailing.domain.common; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Timed; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/BearingWithConfidence.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/BearingWithConfidence.java index c8d46bc70f0..9d1969ee0fd 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/BearingWithConfidence.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/BearingWithConfidence.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.confidence; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.DoublePair; +import com.sap.sse.common.Bearing; public interface BearingWithConfidence extends HasConfidenceAndIsScalable { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/BearingWithConfidenceCluster.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/BearingWithConfidenceCluster.java index 3080278f786..2a4ec5c2aa6 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/BearingWithConfidenceCluster.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/BearingWithConfidenceCluster.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.DoublePair; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Util; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/ConfidenceFactory.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/ConfidenceFactory.java index 6756cba5235..4b5ccd56e07 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/ConfidenceFactory.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/ConfidenceFactory.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.confidence; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.confidence.impl.ConfidenceBasedAveragerFactoryImpl; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; public interface ConfidenceFactory { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/HasConfidence.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/HasConfidence.java index f74b51bee77..38203e4247e 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/HasConfidence.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/HasConfidence.java @@ -2,7 +2,7 @@ package com.sap.sailing.domain.common.confidence; import java.io.Serializable; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.scalablevalue.ScalableValue; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/BearingWithConfidenceImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/BearingWithConfidenceImpl.java index 179a56e65c9..481ce6e424f 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/BearingWithConfidenceImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/BearingWithConfidenceImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.common.confidence.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.DoublePair; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.scalablevalue.IsScalable; import com.sap.sse.common.scalablevalue.ScalableValue; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/ConfidenceBasedAveragerFactoryImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/ConfidenceBasedAveragerFactoryImpl.java index c481c03a61a..278ceba6c71 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/ConfidenceBasedAveragerFactoryImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/ConfidenceBasedAveragerFactoryImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.common.confidence.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.confidence.ConfidenceBasedAverager; import com.sap.sailing.domain.common.confidence.ConfidenceFactory; import com.sap.sailing.domain.common.confidence.Weigher; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; public class ConfidenceBasedAveragerFactoryImpl implements ConfidenceFactory { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/HyperbolicDistanceWeigher.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/HyperbolicDistanceWeigher.java index 5e24d99d9a7..9fb10b391ff 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/HyperbolicDistanceWeigher.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/HyperbolicDistanceWeigher.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.confidence.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.confidence.Weigher; +import com.sap.sse.common.Distance; /** * Uses {@link Position#getQuickApproximateNauticalMileDistance(Position)} to come diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/PositionAndTimePointWeigher.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/PositionAndTimePointWeigher.java index 3fd4127fc55..e76032899a2 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/PositionAndTimePointWeigher.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/confidence/impl/PositionAndTimePointWeigher.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.common.confidence.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.confidence.ConfidenceFactory; import com.sap.sailing.domain.common.confidence.Weigher; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/BoatClassDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/BoatClassDTO.java index e4c26069b26..7e713d0c2c9 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/BoatClassDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/BoatClassDTO.java @@ -2,7 +2,7 @@ package com.sap.sailing.domain.common.dto; import java.io.Serializable; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; public class BoatClassDTO extends NamedDTO implements Serializable, Comparable { private static final long serialVersionUID = 1981789833769906676L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java index e1a17dc135a..21fe321e69a 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java @@ -3,11 +3,11 @@ package com.sap.sailing.domain.common.dto; import java.io.Serializable; import java.util.List; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.impl.MillisecondsDurationImpl; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardRowDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardRowDTO.java index e9f22db5586..11e9a7d4066 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardRowDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardRowDTO.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.util.Date; import java.util.Map; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractSpeedWithAbstractBearingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractSpeedWithAbstractBearingImpl.java index 3cf3e10cb9e..312bfd98721 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractSpeedWithAbstractBearingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractSpeedWithAbstractBearingImpl.java @@ -1,13 +1,14 @@ package com.sap.sailing.domain.common.impl; import com.sap.sailing.domain.common.AbstractSpeedImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.CourseChange; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public abstract class AbstractSpeedWithAbstractBearingImpl extends AbstractSpeedImpl implements SpeedWithBearing { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractSpeedWithBearingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractSpeedWithBearingImpl.java index 48e70984197..4e04d735483 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractSpeedWithBearingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractSpeedWithBearingImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.SpeedWithBearing; +import com.sap.sse.common.Bearing; public abstract class AbstractSpeedWithBearingImpl extends AbstractSpeedWithAbstractBearingImpl implements SpeedWithBearing { private static final long serialVersionUID = -8594305027333573010L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/BearingChangeAnalyzerImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/BearingChangeAnalyzerImpl.java index b2f97382906..0c14ec6e16b 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/BearingChangeAnalyzerImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/BearingChangeAnalyzerImpl.java @@ -1,7 +1,8 @@ package com.sap.sailing.domain.common.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.BearingChangeAnalyzer; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; public class BearingChangeAnalyzerImpl implements BearingChangeAnalyzer { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CentralAngleDistance.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CentralAngleDistance.java index 73004c81439..aaf7cf53611 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CentralAngleDistance.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/CentralAngleDistance.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.impl; import com.sap.sailing.domain.common.AbstractDistance; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Mile; +import com.sap.sse.common.Distance; public class CentralAngleDistance extends AbstractDistance { private static final long serialVersionUID = -388639688376644968L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KilometersPerHourSpeedImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KilometersPerHourSpeedImpl.java index 4b6b0692d0e..41029775fa4 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KilometersPerHourSpeedImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KilometersPerHourSpeedImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.impl; import com.sap.sailing.domain.common.AbstractSpeedImpl; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Speed; public class KilometersPerHourSpeedImpl extends AbstractSpeedImpl implements Speed { private static final long serialVersionUID = -524654796500981303L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KnotSpeedImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KnotSpeedImpl.java index 93f3c474cff..8018cc0119d 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KnotSpeedImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KnotSpeedImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.impl; import com.sap.sailing.domain.common.AbstractSpeedImpl; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Speed; public class KnotSpeedImpl extends AbstractSpeedImpl implements Speed { private static final long serialVersionUID = 5150851454271610069L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KnotSpeedWithBearingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KnotSpeedWithBearingImpl.java index cc87cffb114..8ab80fd0927 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KnotSpeedWithBearingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/KnotSpeedWithBearingImpl.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.common.impl; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; public class KnotSpeedWithBearingImpl extends AbstractSpeedWithBearingImpl { private static final long serialVersionUID = -2300633070560631053L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterDistance.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterDistance.java index 6675e5caa4a..dc3842a43f0 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterDistance.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterDistance.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.impl; import com.sap.sailing.domain.common.AbstractDistance; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; public class MeterDistance extends AbstractDistance { private static final long serialVersionUID = 1205385257141317881L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterPerSecondSpeedImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterPerSecondSpeedImpl.java index 17605cd4c38..28b42dc7d95 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterPerSecondSpeedImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterPerSecondSpeedImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.impl; import com.sap.sailing.domain.common.AbstractSpeedImpl; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Speed; public class MeterPerSecondSpeedImpl extends AbstractSpeedImpl implements Speed { private static final long serialVersionUID = -524654796500981303L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterPerSecondSpeedWithDegreeBearingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterPerSecondSpeedWithDegreeBearingImpl.java index 9db65d50e74..9ce54fe9069 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterPerSecondSpeedWithDegreeBearingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterPerSecondSpeedWithDegreeBearingImpl.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.common.impl; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; public class MeterPerSecondSpeedWithDegreeBearingImpl extends AbstractSpeedWithAbstractBearingImpl { private static final long serialVersionUID = -524654796500981303L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NauticalMileDistance.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NauticalMileDistance.java index 1f6ffd376cd..55827877be0 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NauticalMileDistance.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NauticalMileDistance.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.impl; import com.sap.sailing.domain.common.AbstractDistance; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; public class NauticalMileDistance extends AbstractDistance { private static final long serialVersionUID = 3771473789235934127L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java index 855d6c7832a..99b558700a0 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.common.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Placemark; import com.sap.sailing.domain.common.Position; import com.sap.sse.common.CountryCodeFactory; +import com.sap.sse.common.Distance; /** * Used to define a populated place in the world.
diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/RadianBearingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/RadianBearingImpl.java index 8c76a3229f7..d79515ad3a3 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/RadianBearingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/RadianBearingImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.impl; -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; public class RadianBearingImpl extends AbstractBearing implements Bearing { private static final long serialVersionUID = 5044142324540650696L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/TargetTimeInfoImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/TargetTimeInfoImpl.java index 21ae85c7ae8..8ba5a4366eb 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/TargetTimeInfoImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/TargetTimeInfoImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.common.impl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.TargetTimeInfo; import com.sap.sailing.domain.common.Wind; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java index b20e9850b87..22901946fb5 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.common.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; public class WindImpl extends KnotSpeedWithBearingImpl implements Wind { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableBearing.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableBearing.java index 0608fbed17c..c360ecafa30 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableBearing.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableBearing.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.scalablevalue.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.DoublePair; import com.sap.sailing.domain.common.impl.RadianBearingImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.scalablevalue.ScalableValue; import com.sap.sse.common.scalablevalue.ScalableValueWithDistance; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableDistance.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableDistance.java index 065b6f4899f..e5fef63d91d 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableDistance.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableDistance.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.scalablevalue.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.scalablevalue.ScalableValue; import com.sap.sse.common.scalablevalue.ScalableValueWithDistance; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableSpeed.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableSpeed.java index 02ec27f22c8..bda6f74933b 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableSpeed.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableSpeed.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.scalablevalue.impl; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Speed; import com.sap.sse.common.scalablevalue.ScalableValue; import com.sap.sse.common.scalablevalue.ScalableValueWithDistance; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableSpeedWithBearing.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableSpeedWithBearing.java index 9e60c1480cc..85f8d247e0f 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableSpeedWithBearing.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/scalablevalue/impl/ScalableSpeedWithBearing.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.common.scalablevalue.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.DoubleTriple; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.RadianBearingImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.scalablevalue.ScalableValue; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/BravoExtendedFix.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/BravoExtendedFix.java index d38e8be6b5d..42de84877fe 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/BravoExtendedFix.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/BravoExtendedFix.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.common.tracking; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; /** * Extended version of {@link BravoFix} that provides access to more measures found in the extended data format. diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/BravoFix.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/BravoFix.java index 3cb3a5e7302..51f54938759 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/BravoFix.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/BravoFix.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.tracking; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.annotations.Dimension; import com.sap.sse.datamining.annotations.Statistic; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/GPSFix.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/GPSFix.java index 549d807d35d..ce252c35cbc 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/GPSFix.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/GPSFix.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.common.tracking; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Positioned; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Timed; public interface GPSFix extends Positioned, Timed, WithValidityCache, WithEstimatedSpeedCache { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixMovingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixMovingImpl.java index d5b8a289104..cf4b5d4a665 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixMovingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixMovingImpl.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.common.tracking.impl; import com.sap.sailing.domain.common.AbstractSpeedImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.CourseChange; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; import com.sap.sailing.domain.common.impl.AbstractSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactWindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactWindImpl.java index a3cd2ad5e38..e2b2c9690ed 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactWindImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactWindImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.AbstractTimePoint; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractGPSFixImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractGPSFixImpl.java index fa005aeced5..db28bd55efb 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractGPSFixImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractGPSFixImpl.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; public abstract class AbstractGPSFixImpl implements GPSFix { private static final long serialVersionUID = 9037068515469957639L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java index 4fc24390061..27d65d6f44a 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java @@ -1,14 +1,14 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.sensordata.BravoExtendedSensorDataMetadata; import com.sap.sailing.domain.common.sensordata.ColumnMetadata; import com.sap.sailing.domain.common.tracking.BravoExtendedFix; import com.sap.sailing.domain.common.tracking.BravoFix; import com.sap.sailing.domain.common.tracking.DoubleVectorFix; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Implementation of {@link BravoExtendedFix}. {@link BravoExtendedFix} adds more measures compared to {@link BravoFix}. diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoFixImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoFixImpl.java index 1d980ff8b2a..531ffece96b 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoFixImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoFixImpl.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.sensordata.BravoSensorDataMetadata; import com.sap.sailing.domain.common.sensordata.ColumnMetadata; import com.sap.sailing.domain.common.tracking.BravoFix; import com.sap.sailing.domain.common.tracking.DoubleVectorFix; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Implementation of {@link BravoFix} that wraps a {@link DoubleVectorFix} which holds the actual sensor data. The diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactPositionHelper.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactPositionHelper.java index a3e4b0ad30a..3bb72a30c7c 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactPositionHelper.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactPositionHelper.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; /** * A utility class that "compact" fix implementations such as {@link VeryCompactGPSFixImpl} etc. can use diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/GPSFixMovingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/GPSFixMovingImpl.java index 47d347c78b7..d107b8c2334 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/GPSFixMovingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/GPSFixMovingImpl.java @@ -2,11 +2,11 @@ package com.sap.sailing.domain.common.tracking.impl; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class GPSFixMovingImpl extends GPSFixImpl implements GPSFixMoving { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java index 0aada51af19..2abfe3e4589 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.AbstractPosition; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixMovingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixMovingImpl.java index 867c1b85d26..cc14f625de5 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixMovingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixMovingImpl.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.AbstractPosition; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactWindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactWindImpl.java index 70816fbb09f..294b15eb9fb 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactWindImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactWindImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.AbstractPosition; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; /** * Keeps the precise values of lat/lng and speed/course. diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java index f187cbd689f..d9b7c7fca0a 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java @@ -3,13 +3,13 @@ package com.sap.sailing.domain.common.tracking.impl; import java.util.logging.Level; import java.util.logging.Logger; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.AbstractPosition; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java index baf7f57daca..77c271e87c2 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java @@ -3,13 +3,13 @@ package com.sap.sailing.domain.common.tracking.impl; import java.util.logging.Level; import java.util.logging.Logger; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.AbstractPosition; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java index 1fad308c1a2..88f51a7c503 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.AbstractPosition; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; /** * Uses scaled, rounded internal representations of the values for lat/lng and speed/course. See diff --git a/java/com.sap.sailing.domain.deckmanadapter/src/com/sap/sailing/domain/deckmanadapter/Record.java b/java/com.sap.sailing.domain.deckmanadapter/src/com/sap/sailing/domain/deckmanadapter/Record.java index eb4e8d60fe1..5895d489f7b 100755 --- a/java/com.sap.sailing.domain.deckmanadapter/src/com/sap/sailing/domain/deckmanadapter/Record.java +++ b/java/com.sap.sailing.domain.deckmanadapter/src/com/sap/sailing/domain/deckmanadapter/Record.java @@ -9,7 +9,6 @@ import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Positioned; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -18,6 +17,7 @@ import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.deckmanadapter.impl.FieldType; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class Record implements Timed, Positioned { diff --git a/java/com.sap.sailing.domain.expeditionadapter/src/com/sap/sailing/domain/expeditionadapter/impl/ExpeditionGPSFixImporter.java b/java/com.sap.sailing.domain.expeditionadapter/src/com/sap/sailing/domain/expeditionadapter/impl/ExpeditionGPSFixImporter.java index 6b3b24a89ab..0819a778556 100755 --- a/java/com.sap.sailing.domain.expeditionadapter/src/com/sap/sailing/domain/expeditionadapter/impl/ExpeditionGPSFixImporter.java +++ b/java/com.sap.sailing.domain.expeditionadapter/src/com/sap/sailing/domain/expeditionadapter/impl/ExpeditionGPSFixImporter.java @@ -9,7 +9,6 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -21,6 +20,7 @@ import com.sap.sailing.domain.trackimport.GPSFixImporter; import com.sap.sailing.server.trackfiles.impl.CompressedStreamsUtil; import com.sap.sailing.server.trackfiles.impl.ExpeditionExtendedDataImporterImpl; import com.sap.sailing.server.trackfiles.impl.ExpeditionImportFileHandler; +import com.sap.sse.common.impl.DegreeBearingImpl; public class ExpeditionGPSFixImporter implements GPSFixImporter { private static final String LAT_COLUMN_HEADING = ExpeditionExtendedDataImporterImpl.COL_NAME_LAT; diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/impl/WindReceiverTest.java b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/impl/WindReceiverTest.java index 3449e77b462..5918ad81753 100755 --- a/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/impl/WindReceiverTest.java +++ b/java/com.sap.sailing.domain.igtimiadapter.test/src/com/sap/sailing/domain/igtimiadapter/impl/WindReceiverTest.java @@ -16,7 +16,6 @@ import org.junit.rules.Timeout; import com.sap.sailing.declination.DeclinationService; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.igtimiadapter.IgtimiWindListener; import com.sap.sailing.domain.igtimiadapter.datatypes.AWA; @@ -27,6 +26,7 @@ import com.sap.sailing.domain.igtimiadapter.datatypes.HDG; import com.sap.sailing.domain.igtimiadapter.datatypes.SOG; import com.sap.sailing.domain.igtimiadapter.shared.IgtimiWindReceiver; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WindReceiverTest { diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWA.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWA.java index 7795cb43747..c0d7f25679f 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWA.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWA.java @@ -2,11 +2,11 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Apparent wind angle, relative to the device's or vessel's orientation, in degrees from 0 to 360, with values 180-360 diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWS.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWS.java index 3772bc63d3a..f0417c5c4e3 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWS.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWS.java @@ -2,10 +2,10 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/COG.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/COG.java index ba9eee2b2f8..0395b707a95 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/COG.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/COG.java @@ -2,11 +2,11 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Course over ground diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsAltitude.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsAltitude.java index 798b2a74618..e9af099eda3 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsAltitude.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsAltitude.java @@ -2,10 +2,10 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; public class GpsAltitude extends Fix { diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityHdop.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityHdop.java index 2ccbe2881cd..56ac41a14bc 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityHdop.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityHdop.java @@ -2,10 +2,10 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; public class GpsQualityHdop extends Fix { diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDG.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDG.java index 5bb7b85660a..2f238f5822f 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDG.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDG.java @@ -2,11 +2,11 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * True heading; the difference to {@link HDGM} is the local declination at the point in time the measurement was made diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDGM.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDGM.java index a4f29b4a95e..4eb4b8194bf 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDGM.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDGM.java @@ -2,11 +2,11 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Magnetic heading diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/SOG.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/SOG.java index 7bdcd23689b..a59c5c58bcb 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/SOG.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/SOG.java @@ -2,10 +2,10 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/STW.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/STW.java index 5201fbc48d0..f3056dea21b 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/STW.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/STW.java @@ -2,10 +2,10 @@ package com.sap.sailing.domain.igtimiadapter.datatypes; import java.util.Map; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.igtimiadapter.IgtimiFixReceiver; import com.sap.sailing.domain.igtimiadapter.Sensor; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/shared/IgtimiWindReceiver.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/shared/IgtimiWindReceiver.java index 3f18e1323a2..73354a1608e 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/shared/IgtimiWindReceiver.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/shared/IgtimiWindReceiver.java @@ -13,9 +13,7 @@ import java.util.logging.Logger; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.DeclinationService; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -40,6 +38,8 @@ import com.sap.sailing.domain.igtimiadapter.websocket.WebSocketConnectionManager import com.sap.sailing.domain.tracking.DynamicTrack; import com.sap.sailing.domain.tracking.WindListener; import com.sap.sailing.domain.tracking.impl.DynamicTrackImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java index bb14eda60d2..6209a4e5f98 100644 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java @@ -183,7 +183,6 @@ import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.dto.AnniversaryType; import com.sap.sailing.domain.common.dto.EventType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -251,6 +250,7 @@ import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.WithID; import com.sap.sse.common.impl.AbstractColor; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.impl.RGBColor; diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java index 10127a7c2bf..533795008e1 100644 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java @@ -90,13 +90,11 @@ import com.sap.sailing.domain.base.configuration.DeviceConfigurationMatcher; import com.sap.sailing.domain.base.configuration.RegattaConfiguration; import com.sap.sailing.domain.base.configuration.impl.DeviceConfigurationMatcherSingle; import com.sap.sailing.domain.base.impl.FleetImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.DeviceIdentifier; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.Positioned; import com.sap.sailing.domain.common.RaceIdentifier; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; @@ -126,8 +124,10 @@ import com.sap.sailing.server.gateway.serialization.impl.CompetitorJsonSerialize import com.sap.sailing.server.gateway.serialization.impl.CompetitorWithBoatRefJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.DeviceConfigurationJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.RegattaConfigurationJsonSerializer; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; import com.sap.sse.common.NoCorrespondingServiceRegisteredException; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TimeRange; import com.sap.sse.common.Timed; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java index 802d90c8fbe..3c3773a6f68 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java @@ -26,7 +26,6 @@ import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -50,6 +49,7 @@ import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.gateway.deserialization.impl.DeviceAndSessionIdentifierWithGPSFixesDeserializer; import com.sap.sailing.server.impl.RacingEventServiceImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class AbstractGPSFixStoreTest extends RaceLogTrackingTestHelper { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java index 286b25910ee..45f75237c38 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java @@ -44,7 +44,6 @@ import com.sap.sailing.domain.base.impl.FleetImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.base.impl.SeriesImpl; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.racelog.tracking.NotDenotedForRaceLogTrackingException; @@ -69,6 +68,7 @@ import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.impl.RacingEventServiceImpl; import com.sap.sse.common.NoCorrespondingServiceRegisteredException; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class CreateAndTrackWithRaceLogTest extends RaceLogTrackingTestHelper { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RaceLogFixTrackerManagerTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RaceLogFixTrackerManagerTest.java index 69197beb49d..a7e8ea9110f 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RaceLogFixTrackerManagerTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/RaceLogFixTrackerManagerTest.java @@ -35,7 +35,6 @@ import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.base.impl.WaypointImpl; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -59,6 +58,7 @@ import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sse.common.Timed; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class RaceLogFixTrackerManagerTest { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java index 9c104ebeac4..e1ecf871f84 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java @@ -58,11 +58,9 @@ import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.base.impl.WaypointImpl; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; @@ -98,11 +96,13 @@ import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tracking.impl.SensorFixTrackImpl; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.WithID; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class SensorFixStoreAndLoadTest { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreTest.java index 1b11a7f9f3f..8f3adf0ac6d 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreTest.java @@ -15,7 +15,6 @@ import org.mockito.Mockito; import com.mongodb.DB; import com.mongodb.MongoException; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; @@ -33,6 +32,7 @@ import com.sap.sailing.domain.racelog.tracking.test.mock.MockSmartphoneImeiServi import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier; import com.sap.sse.common.NoCorrespondingServiceRegisteredException; import com.sap.sse.common.Timed; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.impl.TimeRangeImpl; diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/manual/PostFixes.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/manual/PostFixes.java index a39ea2e9748..accaae52048 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/manual/PostFixes.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/manual/PostFixes.java @@ -8,11 +8,8 @@ import java.util.List; import java.util.Timer; import java.util.TimerTask; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -25,7 +22,10 @@ import com.sap.sailing.domain.racelogtracking.test.AbstractJsonOverHttpTest; import com.sap.sailing.server.gateway.serialization.impl.DeviceAndSessionIdentifierWithGPSFixesSerializer; import com.sap.sailing.server.gateway.serialization.impl.DeviceIdentifierJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.GPSFixMovingJsonSerializer; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class PostFixes extends AbstractJsonOverHttpTest { diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/BoatClass.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/BoatClass.java index 806abbef6cd..0198b2d23e6 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/BoatClass.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/BoatClass.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.base; import com.sap.sailing.domain.common.BoatHullType; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.IsManagedByCache; import com.sap.sse.common.Named; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Waypoint.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Waypoint.java index bc2eb191d26..e1341a259eb 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Waypoint.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Waypoint.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.base; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.PassingInstruction; +import com.sap.sse.common.Bearing; import com.sap.sse.common.IsManagedByCache; import com.sap.sse.common.NamedWithID; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java index 52170a49d73..1d7c196882d 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java @@ -4,8 +4,8 @@ import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.common.BoatClassMasterdata; import com.sap.sailing.domain.common.BoatHullType; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.NamedImpl; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/WaypointImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/WaypointImpl.java index d94436a109c..d43db4535ee 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/WaypointImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/WaypointImpl.java @@ -6,8 +6,8 @@ import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.PassingInstruction; +import com.sap.sse.common.Bearing; public class WaypointImpl implements Waypoint { private static final long serialVersionUID = 1600863368078653897L; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/statistics/Statistics.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/statistics/Statistics.java index 083fff1f42d..85c4267d5e8 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/statistics/Statistics.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/statistics/Statistics.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.statistics; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/statistics/impl/StatisticsImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/statistics/impl/StatisticsImpl.java index da8ad333508..2349b875e8d 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/statistics/impl/StatisticsImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/statistics/impl/StatisticsImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.statistics.impl; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.statistics.Statistics; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/classes/services/MessageFileServiceImpl.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/classes/services/MessageFileServiceImpl.java index 79545285a45..9bbdcc6abc3 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/classes/services/MessageFileServiceImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/classes/services/MessageFileServiceImpl.java @@ -14,10 +14,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; @@ -40,6 +37,9 @@ import com.sap.sailing.domain.swisstimingadapter.impl.CompetitorWithoutID; import com.sap.sailing.domain.swisstimingadapter.impl.MarkImpl; import com.sap.sailing.domain.swisstimingadapter.impl.RaceImpl; import com.sap.sailing.domain.swisstimingadapter.impl.SailMasterMessageImpl; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class MessageFileServiceImpl implements MessageFileService { diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java index d225acc9a2e..0f721ed937d 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java @@ -24,7 +24,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.swisstimingadapter.Competitor; import com.sap.sailing.domain.swisstimingadapter.Course; import com.sap.sailing.domain.swisstimingadapter.Fix; @@ -38,6 +37,7 @@ import com.sap.sailing.domain.swisstimingadapter.SailMasterMessage; import com.sap.sailing.domain.swisstimingadapter.StartList; import com.sap.sailing.domain.swisstimingadapter.SwissTimingFactory; import com.sap.sailing.domain.swisstimingadapter.impl.RaceImpl; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java index d9a6692f8b2..26ad27b3ea1 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java @@ -18,8 +18,6 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.swisstimingadapter.Competitor; import com.sap.sailing.domain.swisstimingadapter.Course; import com.sap.sailing.domain.swisstimingadapter.Fix; @@ -30,6 +28,8 @@ import com.sap.sailing.domain.swisstimingadapter.SailMasterConnector; import com.sap.sailing.domain.swisstimingadapter.SailMasterListener; import com.sap.sailing.domain.swisstimingadapter.StartList; import com.sap.sailing.domain.swisstimingadapter.SwissTimingFactory; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java index 5798359d9e8..006074633c6 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.swisstimingadapter; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; /** * Data fix transmitted periodically from the SwissTiming Sail Master system, telling boat position and speed diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterAdapter.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterAdapter.java index 28a5fde6a2c..371042bb66f 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterAdapter.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterAdapter.java @@ -3,7 +3,7 @@ package com.sap.sailing.domain.swisstimingadapter; import java.util.Collection; import java.util.List; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java index c9e0df9d82f..a7c3ee4a7f8 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java @@ -6,8 +6,8 @@ import java.text.ParseException; import java.util.List; import java.util.Map; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; @@ -54,7 +54,7 @@ public interface SailMasterConnector { /** * Enables receiving RPD (Race Position Data) events to be emitted by the server. If such events are received, they * are forwarded to {@link #addSailMasterListener(SailMasterListener) registered} listeners by calling their - * {@link SailMasterListener#receivedRacePositionData(String, RaceStatus, TimePoint, TimePoint, Long, Integer, com.sap.sailing.domain.common.Distance, java.util.Collection)} + * {@link SailMasterListener#receivedRacePositionData(String, RaceStatus, TimePoint, TimePoint, Long, Integer, com.sap.sse.common.Distance, java.util.Collection)} * method. */ void enableRacePositionData() throws UnknownHostException, IOException, InterruptedException; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterListener.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterListener.java index 575b1de511c..d66e0dd25ab 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterListener.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterListener.java @@ -3,7 +3,7 @@ package com.sap.sailing.domain.swisstimingadapter; import java.util.Collection; import java.util.List; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingMessage.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingMessage.java index fa0a143de2a..c00fa7f0512 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingMessage.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingMessage.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.swisstimingadapter; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.udpconnector.UDPMessage; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; public interface SwissTimingMessage extends UDPMessage { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java index ace8f0dc2f2..c9d5151694b 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.swisstimingadapter.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.swisstimingadapter.Fix; import com.sap.sailing.domain.swisstimingadapter.TrackerType; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; public class FixImpl implements Fix { private final String boatID; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java index 285a988c981..661ddbd487f 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java @@ -27,12 +27,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.sap.sailing.domain.base.BoatClass; -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; @@ -51,8 +47,12 @@ import com.sap.sailing.domain.swisstimingadapter.SailMasterListener; import com.sap.sailing.domain.swisstimingadapter.SailMasterMessage; import com.sap.sailing.domain.swisstimingadapter.StartList; import com.sap.sailing.domain.swisstimingadapter.TrackerType; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageImpl.java index 4f8c26a55c6..476073582bb 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageImpl.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.swisstimingadapter.impl; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.swisstimingadapter.SwissTimingMessage; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; public class SwissTimingMessageImpl implements SwissTimingMessage { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageParserImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageParserImpl.java index 2763884b642..c48538ae9ce 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageParserImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageParserImpl.java @@ -3,11 +3,11 @@ package com.sap.sailing.domain.swisstimingadapter.impl; import java.net.DatagramPacket; import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedWithBearingImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.swisstimingadapter.SwissTimingFormatException; import com.sap.sailing.domain.swisstimingadapter.SwissTimingMessage; import com.sap.sailing.domain.swisstimingadapter.SwissTimingMessageParser; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class SwissTimingMessageParserImpl implements SwissTimingMessageParser { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java index 87881b9e7b1..a466d7d4768 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java @@ -24,13 +24,11 @@ import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceWithAdditionalID; @@ -63,8 +61,10 @@ import com.sap.sailing.domain.tracking.TrackingDataLoader; import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.impl.TrackedRaceStatusImpl; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import difflib.PatchFailedException; diff --git a/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingReplayAdapterServiceTest.java b/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingReplayAdapterServiceTest.java index 2d9746526a3..821679bc40b 100644 --- a/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingReplayAdapterServiceTest.java +++ b/java/com.sap.sailing.domain.swisstimingreplayadapter.test/src/com/sap/sailing/domain/swisstimingreplayadapter/test/SwissTimingReplayAdapterServiceTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore; import com.sap.sailing.domain.swisstimingadapter.DomainFactory; @@ -31,6 +30,7 @@ import com.sap.sailing.domain.swisstimingreplayadapter.impl.SwissTimingReplaySer import com.sap.sailing.domain.swisstimingreplayadapter.impl.SwissTimingReplayToDomainAdapter; import com.sap.sailing.domain.test.DummyTrackedRegattaRegistry; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; public class SwissTimingReplayAdapterServiceTest { diff --git a/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java b/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java index 63f048a03a8..c7acbc5a45c 100755 --- a/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java +++ b/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java @@ -25,13 +25,11 @@ import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -57,9 +55,11 @@ import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sailing.domain.tracking.impl.TrackedRaceStatusImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import difflib.PatchFailedException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BearingChangeAnalyzerTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BearingChangeAnalyzerTest.java index ead1b1e6420..bdb94f185e4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BearingChangeAnalyzerTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BearingChangeAnalyzerTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import com.sap.sailing.domain.common.BearingChangeAnalyzer; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; public class BearingChangeAnalyzerTest { private final BearingChangeAnalyzer bearingChangeAnalyzer = BearingChangeAnalyzer.INSTANCE; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BeaufortTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BeaufortTest.java index cb54b39a073..840e24c06b2 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BeaufortTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/BeaufortTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.MeterPerSecondSpeedImpl; +import com.sap.sse.common.Speed; public class BeaufortTest { @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ScalableBearingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ScalableBearingTest.java index da81d89b9a0..46fb4348f21 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ScalableBearingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/ScalableBearingTest.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; public class ScalableBearingTest { @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/CurveEnteringAndExitingComputationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/CurveEnteringAndExitingComputationTest.java index db22b6410e5..b8c59a5cc6f 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/CurveEnteringAndExitingComputationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/CurveEnteringAndExitingComputationTest.java @@ -10,15 +10,15 @@ import java.util.List; import org.junit.Test; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.tracking.SpeedWithBearingStep; import com.sap.sailing.domain.tracking.SpeedWithBearingStepsIterable; import com.sap.sailing.domain.tracking.impl.SpeedWithBearingStepImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverComputationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverComputationTest.java index 805fd0c5457..a7aceba5379 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverComputationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverComputationTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; @@ -34,6 +33,7 @@ import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassing/impl/WaypointPositionAndDistanceCacheTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassing/impl/WaypointPositionAndDistanceCacheTest.java index 89793dcc36e..30656406c87 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassing/impl/WaypointPositionAndDistanceCacheTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassing/impl/WaypointPositionAndDistanceCacheTest.java @@ -25,7 +25,6 @@ import com.sap.sailing.domain.base.impl.CourseImpl; import com.sap.sailing.domain.base.impl.MarkImpl; import com.sap.sailing.domain.base.impl.WaypointImpl; import com.sap.sailing.domain.common.PassingInstruction; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.NauticalMileDistance; @@ -38,6 +37,7 @@ import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WaypointPositionAndDistanceCacheTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java index 02808ebf6f5..f2bc1915824 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java @@ -25,7 +25,6 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.configuration.impl.EmptyRegattaConfiguration; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; @@ -40,6 +39,7 @@ import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class CandidateFinderImplWhiteBoxTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java index feaf8d260b5..76f727927d8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java @@ -36,7 +36,6 @@ import com.sap.sailing.domain.base.impl.WaypointImpl; import com.sap.sailing.domain.common.RankingMetrics; import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -56,6 +55,7 @@ import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java index 702ef040606..7493e0f594c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java @@ -36,7 +36,6 @@ import com.sap.sailing.domain.base.impl.WaypointImpl; import com.sap.sailing.domain.common.RankingMetrics; import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -55,6 +54,7 @@ import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java index 8c82f95ade9..5bb04381369 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java @@ -10,7 +10,6 @@ import java.util.Collections; import org.junit.Test; import com.sap.sailing.domain.base.impl.PositionWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.BearingCluster; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; @@ -19,10 +18,11 @@ import com.sap.sailing.domain.common.confidence.ConfidenceBasedAverager; import com.sap.sailing.domain.common.confidence.ConfidenceFactory; import com.sap.sailing.domain.common.confidence.HasConfidence; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.RadianBearingImpl; import com.sap.sailing.domain.common.scalablevalue.impl.ScalablePosition; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; public class BearingTest { @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java index 9dbe676062a..cb5580f4500 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java @@ -18,7 +18,6 @@ import org.junit.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.impl.DouglasPeucker; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.WindImpl; @@ -28,6 +27,7 @@ import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.util.ThreadPoolUtil; import com.tractrac.model.lib.api.event.CreateModelException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java index 05b5112832e..882a7f84304 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConfidenceTest.java @@ -13,7 +13,6 @@ import org.junit.Test; import com.sap.sailing.domain.base.PositionWithConfidence; import com.sap.sailing.domain.base.impl.PositionWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; @@ -25,7 +24,6 @@ import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; import com.sap.sailing.domain.common.confidence.impl.ScalableDoubleWithConfidence; import com.sap.sailing.domain.common.confidence.impl.ScalableWind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; @@ -37,7 +35,9 @@ import com.sap.sailing.domain.confidence.ConfidenceBasedWindAverager; import com.sap.sailing.domain.confidence.ConfidenceFactory; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.WindWithConfidenceImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.scalablevalue.ScalableValue; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeCalculatorTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeCalculatorTest.java index 030e4a70149..74bfe1b6226 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeCalculatorTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseChangeCalculatorTest.java @@ -6,8 +6,8 @@ import org.junit.Before; import org.junit.Test; import com.sap.sailing.domain.common.NauticalSide; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.tracking.impl.CourseChangeCalculator; +import com.sap.sse.common.impl.DegreeBearingImpl; public class CourseChangeCalculatorTest { private CourseChangeCalculator ccc; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DirectGapCalculationVersusOneDesignRankingMetricTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DirectGapCalculationVersusOneDesignRankingMetricTest.java index 1dce9263770..b137dd45abd 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DirectGapCalculationVersusOneDesignRankingMetricTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DirectGapCalculationVersusOneDesignRankingMetricTest.java @@ -17,7 +17,6 @@ import org.junit.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; @@ -29,6 +28,7 @@ import com.sap.sailing.domain.tracking.WindPositionMode; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java index 64121bc1458..68b862a2208 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java @@ -11,10 +11,8 @@ import org.junit.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorWithBoat; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; @@ -22,8 +20,10 @@ import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.TrackingDataLoader; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sailing.domain.tracking.impl.TrackedRaceStatusImpl; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java index a2d9e3e74fd..3a7eeb81eaf 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java @@ -17,7 +17,6 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; @@ -27,6 +26,7 @@ import com.sap.sailing.domain.leaderboard.impl.ThresholdBasedResultDiscardingRul import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java index 329ca0264bb..47ba2ace978 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java @@ -7,11 +7,8 @@ import org.junit.Test; import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Mark; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -20,7 +17,10 @@ import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.LineDetails; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class LineAnalysisTest extends TrackBasedTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java index e116bc2d074..d8814591da8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java @@ -21,13 +21,13 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java index 51d17c4fd90..db10d9f6392 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java @@ -26,7 +26,6 @@ import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -38,6 +37,7 @@ import com.sap.sailing.domain.tracking.impl.TrackedLegImpl; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisQingdao2014Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisQingdao2014Test.java index 3911f1c209e..28ff3fec3ac 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisQingdao2014Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisQingdao2014Test.java @@ -20,13 +20,13 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java index a8df5ba0e45..0a8482cf869 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java @@ -27,7 +27,6 @@ import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.WindImpl; @@ -38,6 +37,7 @@ import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java index 4f50776a56f..fdac87ccde4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java @@ -24,7 +24,6 @@ import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -34,6 +33,7 @@ import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java index 03dfa7acbdb..0a113cd183d 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java @@ -20,13 +20,13 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tractracadapter.ReceiverType; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPassingUpdateFromRaceLogFinishPositioingListTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPassingUpdateFromRaceLogFinishPositioingListTest.java index c8fe26bb138..44ed836b1e9 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPassingUpdateFromRaceLogFinishPositioingListTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPassingUpdateFromRaceLogFinishPositioingListTest.java @@ -37,7 +37,6 @@ import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.impl.CourseAreaImpl; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; @@ -51,6 +50,7 @@ import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPositionTimeFilterTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPositionTimeFilterTest.java index 48b0411db29..0cc77240555 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPositionTimeFilterTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MarkPositionTimeFilterTest.java @@ -15,7 +15,6 @@ import org.junit.Test; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.impl.MarkImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -24,6 +23,7 @@ import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.impl.DynamicGPSFixTrackImpl; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class MarkPositionTimeFilterTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PassingInstructionParserTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PassingInstructionParserTest.java index 20b2c34fa18..b6c937c655e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PassingInstructionParserTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PassingInstructionParserTest.java @@ -16,11 +16,11 @@ import org.junit.Test; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.tractracadapter.ReceiverType; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test.java index 60de33bd088..aff8e6b33de 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PhilippBuhlsDoublePenaltyCircleAtKielerWoche2014Test.java @@ -21,13 +21,13 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java index 09ac3e68ac1..c056d51f9d4 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java @@ -5,13 +5,13 @@ import static org.junit.Assert.fail; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; /** * Contains equality assertions for "compact" fixes, allowing for deltas to be specified, assuming diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java index 00105e03aa1..8a559c92978 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java @@ -6,12 +6,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Mile; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; @@ -20,7 +17,10 @@ import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixImpl; import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl; import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class PositionTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceExecutionOrderProvdiderAttachDetachTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceExecutionOrderProvdiderAttachDetachTest.java index c9939994336..e6f511b8fc0 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceExecutionOrderProvdiderAttachDetachTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RaceExecutionOrderProvdiderAttachDetachTest.java @@ -28,7 +28,6 @@ import com.sap.sailing.domain.base.impl.SeriesImpl; import com.sap.sailing.domain.base.impl.TrackedRaces; import com.sap.sailing.domain.common.TimingConstants; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -45,6 +44,7 @@ import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.TrackedRaceImpl; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java index 10485470d91..576affaee4c 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java @@ -34,14 +34,11 @@ import com.sap.sailing.domain.base.impl.MarkImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.base.impl.WaypointImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -58,7 +55,10 @@ import com.sap.sailing.domain.tracking.WindPositionMode; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class ReachingLegTest extends TrackBasedTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java index 259a0d3e2d1..adc457c59ae 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; @@ -29,6 +28,7 @@ import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ShortTimeWindCacheTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ShortTimeWindCacheTest.java index f9b34978669..24b416779b6 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ShortTimeWindCacheTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ShortTimeWindCacheTest.java @@ -18,7 +18,6 @@ import org.mockito.stubbing.Answer; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.WindSource; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -28,6 +27,7 @@ import com.sap.sailing.domain.tracking.impl.TrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.WindWithConfidenceImpl; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SpeedUnitTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SpeedUnitTest.java index c7980fb5d9b..88bd4db96c8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SpeedUnitTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SpeedUnitTest.java @@ -4,11 +4,11 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterPerSecondSpeedImpl; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class SpeedUnitTest { @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTest.java index 177c7b75e5a..cb13735852e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTest.java @@ -28,7 +28,6 @@ import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.TeamImpl; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -37,6 +36,7 @@ import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.impl.DynamicGPSFixMovingTrackImpl; import com.sap.sse.common.Color; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public abstract class StoredTrackBasedTest extends TrackBasedTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TWATest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TWATest.java index c4c079c5d46..644b6496bb2 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TWATest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TWATest.java @@ -12,11 +12,9 @@ import org.mockito.Matchers; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.impl.CompetitorImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -30,7 +28,9 @@ import com.sap.sailing.domain.tracking.impl.DynamicGPSFixMovingTrackImpl; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.TrackedLegImpl; import com.sap.sailing.domain.tracking.impl.TrackedLegOfCompetitorImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class TWATest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTest.java index 8809eb0126b..7c29ebe6f4e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackTest.java @@ -22,7 +22,6 @@ import com.sap.sailing.domain.base.impl.TeamImpl; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -30,6 +29,7 @@ import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sse.common.Color; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test.java index 81d6938d63e..f93459314e2 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TackThatLookedABitLikePenaltyCircleAtTravemuenderWoche2014Test.java @@ -21,13 +21,13 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TargetTimeEstimationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TargetTimeEstimationTest.java index d43e284758e..9d3eb621fbc 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TargetTimeEstimationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TargetTimeEstimationTest.java @@ -21,7 +21,6 @@ import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.SpeedWithBearingWithConfidenceImpl; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; @@ -30,7 +29,6 @@ import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -42,8 +40,10 @@ import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.MarkPositionAtTimePointCacheImpl; import com.sap.sailing.domain.tracking.impl.TrackedLegImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class TargetTimeEstimationTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimeInLegProgressesTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimeInLegProgressesTest.java index 54d1d9798ab..dc13930d00a 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimeInLegProgressesTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TimeInLegProgressesTest.java @@ -16,13 +16,13 @@ import org.junit.Test; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java index 5733057968d..4f7b0e204a3 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java @@ -50,7 +50,6 @@ import com.sap.sailing.domain.common.BoatClassMasterdata; import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -71,6 +70,7 @@ import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sse.common.Color; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java index cd251fc2970..3f7a1f16ca6 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java @@ -15,12 +15,12 @@ import org.junit.Before; import org.junit.Test; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.DynamicTrackedRace; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java index ea12bede9ae..f3de3065721 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java @@ -29,13 +29,8 @@ import org.junit.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.BoatImpl; -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -57,12 +52,17 @@ import com.sap.sailing.domain.tracking.impl.DynamicGPSFixTrackImpl; import com.sap.sailing.domain.tracking.impl.GPSFixTrackImpl; import com.sap.sailing.domain.tracking.impl.MaxSpeedCache; import com.sap.sailing.domain.tracking.impl.TrackImpl; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TimeRange; import com.sap.sse.common.Timed; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class TrackTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/VirtualWindFixesTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/VirtualWindFixesTest.java index 1119f7650a6..1f6fba5d0ee 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/VirtualWindFixesTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/VirtualWindFixesTest.java @@ -11,7 +11,6 @@ import org.junit.Test; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.tracking.TrackedRace; @@ -21,6 +20,7 @@ import com.sap.sailing.domain.tracking.impl.VirtualWindFixesAsNavigableSet; import com.sap.sse.InvalidDateException; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.util.DateParser; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationLockingUnderLoadTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationLockingUnderLoadTest.java index 991ed179689..95797d836ab 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationLockingUnderLoadTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationLockingUnderLoadTest.java @@ -21,7 +21,6 @@ import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -34,6 +33,7 @@ import com.sap.sailing.domain.tracking.impl.TrackedRaceStatusImpl; import com.sap.sailing.domain.tracking.impl.WindTrackImpl; import com.sap.sailing.domain.tracking.impl.WindWithConfidenceImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java index fae597619ba..e27eeccae24 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java @@ -22,13 +22,11 @@ import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.NauticalMileDistance; @@ -44,8 +42,10 @@ import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.CombinedWindTrackImpl; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sailing.domain.tracking.impl.TrackBasedEstimationWindTrackImpl; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java index 5569f885410..df9603d1959 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java @@ -20,7 +20,6 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; @@ -32,6 +31,7 @@ import com.sap.sailing.domain.tracking.impl.TrackBasedEstimationWindTrackImpl; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java index d969dde8309..89576879b08 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java @@ -18,7 +18,6 @@ import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -28,6 +27,7 @@ import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WindEstimationOnStoredTracksTest extends StoredTrackBasedTestWithTrackedRace { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java index 753bac42751..c32a54c0218 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java @@ -36,14 +36,12 @@ import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.base.impl.TeamImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.confidence.impl.PositionAndTimePointWeigher; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -66,10 +64,12 @@ import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sailing.domain.tracking.impl.WindTrackImpl; import com.sap.sailing.domain.tracking.impl.WindWithConfidenceImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Color; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WindTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java index e5472f22423..02a9297240f 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java @@ -22,7 +22,6 @@ import org.junit.AfterClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; @@ -42,6 +41,7 @@ import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.tractrac.model.lib.api.event.CreateModelException; import com.tractrac.subscription.lib.api.SubscriberInitializationException; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java index 9752ba115be..2012379d515 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java @@ -12,7 +12,6 @@ import org.junit.AfterClass; import org.junit.Test; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -28,6 +27,7 @@ import com.sap.sailing.domain.test.measurements.MeasurementCase; import com.sap.sailing.domain.test.measurements.MeasurementXMLFile; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import junit.framework.Assert; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingWhiteBoxTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingWhiteBoxTest.java index ce612f023d7..ac03a5b9533 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingWhiteBoxTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingWhiteBoxTest.java @@ -15,7 +15,6 @@ import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.WaypointImpl; import com.sap.sailing.domain.common.PassingInstruction; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -29,6 +28,7 @@ import com.sap.sailing.domain.markpassingcalculation.impl.CandidateFinderImpl; import com.sap.sailing.domain.markpassingcalculation.impl.CandidateImpl; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java index 9c6478a6fe5..87c76fafa75 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java @@ -30,13 +30,10 @@ import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.configuration.RegattaConfiguration; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaIdentifier; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; @@ -86,8 +83,11 @@ import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.WindTrackImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.IsManagedByCache; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java index f83fb7a88dc..dafc1053642 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java @@ -26,12 +26,9 @@ import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.BoatImpl; import com.sap.sailing.domain.base.impl.CourseImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; @@ -67,8 +64,11 @@ import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.IsManagedByCache; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithSpeedInfoTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithSpeedInfoTest.java index facd44e971d..45c10cbc38e 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithSpeedInfoTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationWithSpeedInfoTest.java @@ -5,13 +5,13 @@ import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; public class PositionInterpolationAndExtrapolationWithSpeedInfoTest extends PositionInterpolationAndExtrapolationTest { diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java index 9892d333e1f..52b7ebc3f41 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java @@ -54,7 +54,6 @@ import com.sap.sailing.domain.base.impl.TeamImpl; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.ScoringSchemeType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; @@ -90,6 +89,7 @@ import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.AbstractColor; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.util.WeakIdentityHashMap; diff --git a/java/com.sap.sailing.domain.windfinderadapter/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderReportParser.java b/java/com.sap.sailing.domain.windfinderadapter/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderReportParser.java index c9a15cf3041..c7bfbe361cf 100755 --- a/java/com.sap.sailing.domain.windfinderadapter/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderReportParser.java +++ b/java/com.sap.sailing.domain.windfinderadapter/src/com/sap/sailing/domain/windfinderadapter/impl/WindFinderReportParser.java @@ -11,13 +11,13 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.windfinder.ReviewedSpotsCollection; import com.sap.sailing.domain.windfinder.Spot; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WindFinderReportParser { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithConfidence.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithConfidence.java index 9c47310e2da..5ac33500b4e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithConfidence.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithConfidence.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.base; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.confidence.HasConfidenceAndIsScalable; +import com.sap.sse.common.Speed; public interface SpeedWithConfidence extends HasConfidenceAndIsScalable { } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java index ca95530c97f..76ea5395921 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java @@ -19,7 +19,6 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Placemark; import com.sap.sailing.domain.common.Position; @@ -69,6 +68,7 @@ import com.sap.sailing.domain.tracking.TrackedRegattaRegistry; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; import com.sap.sailing.domain.tracking.impl.TrackedRaceImpl; import com.sap.sailing.geocoding.ReverseGeocoder; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DouglasPeucker.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DouglasPeucker.java index 449e34d3fcc..c00de4ef15e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DouglasPeucker.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DouglasPeucker.java @@ -10,11 +10,11 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixTrack; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java index 67dcb12cc16..550abeed121 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.CourseChange; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; import com.sap.sailing.domain.common.impl.AbstractSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; public class KilometersPerHourSpeedWithBearingImpl extends KilometersPerHourSpeedImpl implements SpeedWithBearing { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/SpeedWithConfidenceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/SpeedWithConfidenceImpl.java index d02ff428740..3ee141ef442 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/SpeedWithConfidenceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/SpeedWithConfidenceImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.base.impl; import com.sap.sailing.domain.base.SpeedWithConfidence; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.confidence.impl.HasConfidenceImpl; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableSpeed; +import com.sap.sse.common.Speed; import com.sap.sse.common.scalablevalue.ScalableValue; public class SpeedWithConfidenceImpl extends HasConfidenceImpl implements SpeedWithConfidence { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/confidence/impl/ConfidenceBasedWindAveragerImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/confidence/impl/ConfidenceBasedWindAveragerImpl.java index c4a4a89bd54..b0ed0ba767e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/confidence/impl/ConfidenceBasedWindAveragerImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/confidence/impl/ConfidenceBasedWindAveragerImpl.java @@ -2,7 +2,6 @@ package com.sap.sailing.domain.confidence.impl; import java.util.Iterator; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; @@ -15,6 +14,7 @@ import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.confidence.ConfidenceBasedWindAverager; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.WindWithConfidenceImpl; +import com.sap.sse.common.Speed; /** * In order to enable the aggregation of {@link Wind} objects whose {@link WindSource}'s {@link WindSourceType} suggests diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java index b41961648e3..098bdb90cf9 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java @@ -18,19 +18,19 @@ import com.sap.sailing.domain.base.RaceColumnListener; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.Series; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LeaderboardType; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindException; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.dto.LeaderboardDTO; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.leaderboard.caching.LeaderboardDTOCache; import com.sap.sailing.domain.leaderboard.caching.LiveLeaderboardUpdater; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.TrackedRegattaRegistry; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LeaderboardDTOCalculationReuseCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LeaderboardDTOCalculationReuseCache.java index 028253e5010..46150dd8240 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LeaderboardDTOCalculationReuseCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/caching/LeaderboardDTOCalculationReuseCache.java @@ -5,11 +5,9 @@ import java.util.concurrent.ConcurrentMap; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -18,9 +16,11 @@ import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Triple; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java index 70982df935a..6025feba8c5 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java @@ -36,15 +36,12 @@ import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.RaceColumnInSeries; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaNameAndRaceName; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.dto.BasicRaceDTO; import com.sap.sailing.domain.common.dto.CompetitorDTO; @@ -78,7 +75,10 @@ import com.sap.sailing.domain.tracking.TrackedRegattaRegistry; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; import com.sap.sailing.domain.tracking.WindPositionMode; import com.sap.sailing.domain.tracking.impl.AbstractRaceChangeListener; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.util.ThreadPoolUtil; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java index 84e2ab49c5a..808d4bca7b5 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java @@ -24,11 +24,9 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.RaceColumnListener; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindError; import com.sap.sailing.domain.common.NoWindException; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.NumberOfCompetitorsInLeaderboardFetcher; @@ -41,8 +39,10 @@ import com.sap.sailing.domain.racelog.RaceLogIdentifier; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.util.impl.RaceColumnListeners; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.ObscuringIterable; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/DelegatingRegattaLeaderboardWithCompetitorElimination.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/DelegatingRegattaLeaderboardWithCompetitorElimination.java index 49dac7c5967..d0dfd8cf9af 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/DelegatingRegattaLeaderboardWithCompetitorElimination.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/DelegatingRegattaLeaderboardWithCompetitorElimination.java @@ -26,7 +26,6 @@ import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.common.LeaderboardType; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindException; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.leaderboard.NumberOfCompetitorsInLeaderboardFetcher; import com.sap.sailing.domain.leaderboard.RegattaLeaderboard; @@ -39,6 +38,7 @@ import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule; import com.sap.sailing.domain.regattalike.IsRegattaLike; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sse.common.ObscuringIterable; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java index 0cc722ebbad..9c5256ab2f9 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.maneuverdetection; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.tracking.CompleteManeuverCurve; +import com.sap.sse.common.Bearing; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Dimension; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/HasDetailedManeuverLoss.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/HasDetailedManeuverLoss.java index 1a6e59bdb7d..430f09c4de1 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/HasDetailedManeuverLoss.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/HasDetailedManeuverLoss.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.maneuverdetection; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.impl.MillisecondsDurationImpl; public interface HasDetailedManeuverLoss { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java index d65b57a8a8a..b685ef2d6ac 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.maneuverdetection; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.datamining.annotations.Statistic; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java index 94ef90b66ec..89bae2e81e7 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.maneuverdetection.CompleteManeuverCurveWithEstimationData; import com.sap.sailing.domain.maneuverdetection.ManeuverCurveWithUnstableCourseAndSpeedWithEstimationData; import com.sap.sailing.domain.maneuverdetection.ManeuverMainCurveWithEstimationData; +import com.sap.sse.common.Bearing; /** * diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverDetectorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverDetectorImpl.java index 8b75854a5a3..7ad6d7a9384 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverDetectorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverDetectorImpl.java @@ -8,7 +8,6 @@ import java.util.ListIterator; import java.util.stream.Collectors; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -17,6 +16,7 @@ import com.sap.sailing.domain.maneuverdetection.IncrementalManeuverDetector; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.CompleteManeuverCurve; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveBoundaryExtension.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveBoundaryExtension.java index 35c20764c73..39f422782c6 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveBoundaryExtension.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveBoundaryExtension.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java index 4039e6dce24..25d93da3926 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.maneuverdetection.ManeuverCurveWithUnstableCourseAndSpeedWithEstimationData; import com.sap.sailing.domain.tracking.impl.ManeuverCurveBoundariesImpl; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; public class ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl extends ManeuverCurveBoundariesImpl diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java index 1cfcb51ef58..f485b572642 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java @@ -13,18 +13,14 @@ import java.util.stream.Collectors; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.BearingChangeAnalyzer; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.maneuverdetection.CompleteManeuverCurveWithEstimationData; @@ -46,10 +42,14 @@ import com.sap.sailing.domain.tracking.impl.ManeuverCurveBoundariesImpl; import com.sap.sailing.domain.tracking.impl.ManeuverWithMainCurveBoundariesImpl; import com.sap.sailing.domain.tracking.impl.ManeuverWithStableSpeedAndCourseBoundariesImpl; import com.sap.sailing.domain.tracking.impl.SpeedWithBearingStepImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverLoss.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverLoss.java index 0050dec02a2..e05bf9bb81c 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverLoss.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverLoss.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; /** * diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveDetailsWithBearingSteps.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveDetailsWithBearingSteps.java index 5bb1a08e06a..998de50e2f9 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveDetailsWithBearingSteps.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveDetailsWithBearingSteps.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; import com.sap.sailing.domain.tracking.SpeedWithBearingStepsIterable; import com.sap.sailing.domain.tracking.impl.ManeuverCurveBoundariesImpl; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java index 7b1026ebfc5..6085ecbb05a 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.maneuverdetection.HasDetailedManeuverLoss; import com.sap.sailing.domain.maneuverdetection.ManeuverMainCurveWithEstimationData; import com.sap.sailing.domain.tracking.impl.ManeuverCurveBoundariesImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/WindMeasurement.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/WindMeasurement.java index b0796909bd1..0b264620b50 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/WindMeasurement.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/WindMeasurement.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateChooserImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateChooserImpl.java index 159350a4db1..8eacde8a691 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateChooserImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateChooserImpl.java @@ -19,8 +19,6 @@ import java.util.logging.Logger; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -33,7 +31,9 @@ import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java index f835591208f..4ac0edc9c15 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java @@ -26,11 +26,8 @@ import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -42,12 +39,15 @@ import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.MarkPositionAtTimePointCache; import com.sap.sailing.domain.tracking.impl.MarkPositionAtTimePointCacheImpl; import com.sap.sailing.domain.tracking.impl.TimedComparator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TimeRange; import com.sap.sse.common.Timed; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.TimeRangeImpl; import com.sap.sse.concurrent.LockUtil; import com.sap.sse.util.ThreadPoolUtil; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/DistanceCandidateImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/DistanceCandidateImpl.java index 8f45b683e8b..9da938a4fae 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/DistanceCandidateImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/DistanceCandidateImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.markpassingcalculation.impl; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; public class DistanceCandidateImpl extends CandidateWithSide { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/WaypointPositionAndDistanceCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/WaypointPositionAndDistanceCache.java index 5a2701cfeb5..c75f23184a8 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/WaypointPositionAndDistanceCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/WaypointPositionAndDistanceCache.java @@ -19,12 +19,12 @@ import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.impl.AbstractRaceChangeListener; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TimeRange; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/splining/Vector2D.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/splining/Vector2D.java index 731a0bd68a0..368a5dfc122 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/splining/Vector2D.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/splining/Vector2D.java @@ -3,8 +3,8 @@ package com.sap.sailing.domain.markpassingcalculation.splining; import java.util.ArrayList; import java.util.List; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; /** * A vector in the 2 dimensional plane that supports numerous vector operations. diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/NoPolarDataAvailableException.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/NoPolarDataAvailableException.java index f8787e8abe0..f47f65f0cf4 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/NoPolarDataAvailableException.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/NoPolarDataAvailableException.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.polars; import com.sap.sailing.domain.base.BoatClass; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; public class NoPolarDataAvailableException extends Exception { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java index 3843f2bcc65..0e1c1ce4e70 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java @@ -10,14 +10,14 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.ManeuverType; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.Util.Pair; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java index 52fbe0571c1..a5a26187e77 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java @@ -17,9 +17,7 @@ import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.CompetitorImpl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.leaderboard.caching.LeaderboardDTOCalculationReuseCache; import com.sap.sailing.domain.tracking.MarkPassing; @@ -29,7 +27,9 @@ import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; import com.sap.sailing.domain.tracking.WindPositionMode; import com.sap.sailing.domain.tracking.impl.AbstractRaceRankComparator; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveCertificate.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveCertificate.java index f6483b41476..0b2f635454d 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveCertificate.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveCertificate.java @@ -15,14 +15,14 @@ import org.apache.commons.math.analysis.polynomials.PolynomialFunctionLagrangeFo import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsDurationImpl; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveRankingMetric.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveRankingMetric.java index e46b7f6ee5c..6be12ee2051 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveRankingMetric.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/ORCPerformanceCurveRankingMetric.java @@ -6,12 +6,12 @@ import java.util.function.Supplier; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/OneDesignRankingMetric.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/OneDesignRankingMetric.java index 6a8ead5c077..2f38163ebef 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/OneDesignRankingMetric.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/OneDesignRankingMetric.java @@ -7,7 +7,6 @@ import java.util.function.Supplier; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedLeg; @@ -17,6 +16,7 @@ import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; import com.sap.sailing.domain.tracking.WindPositionMode; import com.sap.sailing.domain.tracking.impl.RaceRankComparator; import com.sap.sailing.domain.tracking.impl.WindwardToGoComparator; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/RankingMetric.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/RankingMetric.java index 609ed25b23b..0dd2269675b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/RankingMetric.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/RankingMetric.java @@ -6,12 +6,12 @@ import java.util.function.Function; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.leaderboard.caching.LeaderboardDTOCalculationReuseCache; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/TimeOnTimeAndDistanceRankingMetric.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/TimeOnTimeAndDistanceRankingMetric.java index 582a6a8ec9e..903be16a0a7 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/TimeOnTimeAndDistanceRankingMetric.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/TimeOnTimeAndDistanceRankingMetric.java @@ -9,7 +9,6 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Mile; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.tracking.MarkPassing; @@ -17,6 +16,7 @@ import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsDurationImpl; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/BravoFixTrack.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/BravoFixTrack.java index 78551932bfd..56693744f86 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/BravoFixTrack.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/BravoFixTrack.java @@ -2,10 +2,10 @@ package com.sap.sailing.domain.tracking; import java.io.Serializable; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.tracking.BravoExtendedFix; import com.sap.sailing.domain.common.tracking.BravoFix; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.WithID; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java index a0fa91d8fcd..18606aa093e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java @@ -3,15 +3,15 @@ package com.sap.sailing.domain.tracking; import java.util.Iterator; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TimeRange; import com.sap.sse.common.Timed; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/LegBearingCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/LegBearingCache.java index 4ebcbf5f692..198442613cb 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/LegBearingCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/LegBearingCache.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.tracking; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/LineDetails.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/LineDetails.java index ac829d2eb67..55cfb7f7235 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/LineDetails.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/LineDetails.java @@ -2,9 +2,9 @@ package com.sap.sailing.domain.tracking; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NauticalSide; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java index 81ec0ceb343..7011612e984 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.tracking; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NauticalSide; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.datamining.annotations.Dimension; import com.sap.sse.datamining.annotations.Statistic; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/ManeuverCurveBoundaries.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/ManeuverCurveBoundaries.java index c623ae4251b..1558f3ed651 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/ManeuverCurveBoundaries.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/ManeuverCurveBoundaries.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.tracking; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/MarkPositionAtTimePointCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/MarkPositionAtTimePointCache.java index 05489c61ad4..69c06f62877 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/MarkPositionAtTimePointCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/MarkPositionAtTimePointCache.java @@ -2,8 +2,8 @@ package com.sap.sailing.domain.tracking; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java index 1954482836f..abd27937eb6 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java @@ -5,14 +5,14 @@ import java.util.LinkedHashMap; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.TargetTimeInfo.LegTargetTimeInfo; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarDataService; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java index 56ac285cd92..14274120e21 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java @@ -5,15 +5,15 @@ import java.io.Serializable; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.ranking.RankingMetric.RankingInfo; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java index 965b2d0b48d..6120df5646a 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java @@ -25,13 +25,10 @@ import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.DouglasPeucker; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; @@ -57,8 +54,11 @@ import com.sap.sailing.domain.ranking.RankingMetric; import com.sap.sailing.domain.ranking.RankingMetric.RankingInfo; import com.sap.sailing.domain.tracking.impl.NonCachingMarkPositionAtTimePointCache; import com.sap.sailing.domain.tracking.impl.TrackedRaceImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.IsManagedByCache; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrack.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrack.java index 37b6fc6c7c0..b57dc1f0be9 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrack.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrack.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.tracking; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java index 9f2844f4f53..6a1c4a359af 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java @@ -5,10 +5,7 @@ import java.io.ObjectInputStream; import java.io.Serializable; import java.util.function.Function; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.confidence.impl.ScalableDouble; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableDistance; import com.sap.sailing.domain.common.tracking.BravoExtendedFix; import com.sap.sailing.domain.common.tracking.BravoFix; @@ -19,9 +16,12 @@ import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.GPSTrackListener; import com.sap.sailing.domain.tracking.Track; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.WithID; import com.sap.sse.common.scalablevalue.ScalableValue; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseChangeCalculator.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseChangeCalculator.java index 332e0048f77..c2e4df10521 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseChangeCalculator.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseChangeCalculator.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.NauticalSide; +import com.sap.sse.common.Bearing; public class CourseChangeCalculator { private static final double THRESHOLD_UP_TO_WHICH_TO_ACCEPT_DIRECTION_IN_DEGREES = 90; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java index 6e1c263e019..850dcb7ed62 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java @@ -13,7 +13,6 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.impl.MeterDistance; @@ -25,6 +24,7 @@ import com.sap.sailing.domain.tracking.RaceChangeListener; import com.sap.sailing.domain.tracking.Track; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java index 86a5b854bc4..2293e0231b6 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java @@ -10,10 +10,7 @@ import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithBearingWithConfidenceImpl; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; @@ -30,6 +27,9 @@ import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleExceptio import com.sap.sailing.domain.common.tracking.impl.PreciseCompactGPSFixMovingImpl; import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; public class DynamicGPSFixMovingTrackImpl extends GPSFixTrackImpl implements DynamicGPSFixTrack { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java index 9b064eb6b62..38994b6b37b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java @@ -16,10 +16,7 @@ import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithBearingWithConfidenceImpl; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.common.Wind; @@ -30,7 +27,6 @@ import com.sap.sailing.domain.common.confidence.ConfidenceFactory; import com.sap.sailing.domain.common.confidence.HasConfidence; import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.NauticalMileDistance; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -43,11 +39,15 @@ import com.sap.sailing.domain.tracking.SpeedWithBearingStep; import com.sap.sailing.domain.tracking.SpeedWithBearingStepsIterable; import com.sap.sailing.domain.tracking.Track; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TimeRange; import com.sap.sse.common.Timed; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.impl.TimeRangeImpl; import com.sap.sse.util.impl.ArrayListNavigableSet; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/LineDetailsImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/LineDetailsImpl.java index 54630aaf598..7a57e9ebabe 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/LineDetailsImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/LineDetailsImpl.java @@ -2,10 +2,10 @@ package com.sap.sailing.domain.tracking.impl; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.tracking.LineDetails; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; public class LineDetailsImpl implements LineDetails { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverCurveBoundariesImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverCurveBoundariesImpl.java index be93f2b158e..097f0a1d3ca 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverCurveBoundariesImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverCurveBoundariesImpl.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java index 7a372e41027..243bdf82024 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java @@ -1,17 +1,17 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.tracking.impl.AbstractGPSFixImpl; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; import com.sap.sailing.domain.tracking.MarkPassing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverWithMainCurveBoundariesImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverWithMainCurveBoundariesImpl.java index d37dec0d884..739d33b9162 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverWithMainCurveBoundariesImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverWithMainCurveBoundariesImpl.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; import com.sap.sailing.domain.tracking.MarkPassing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverWithStableSpeedAndCourseBoundariesImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverWithStableSpeedAndCourseBoundariesImpl.java index 832b379d044..15f1f606e6a 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverWithStableSpeedAndCourseBoundariesImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverWithStableSpeedAndCourseBoundariesImpl.java @@ -1,12 +1,12 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; import com.sap.sailing.domain.tracking.MarkPassing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MarkPositionAtTimePointCacheImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MarkPositionAtTimePointCacheImpl.java index 3a287135f45..22ad498d0fb 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MarkPositionAtTimePointCacheImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MarkPositionAtTimePointCacheImpl.java @@ -5,10 +5,10 @@ import java.util.Map; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; public class MarkPositionAtTimePointCacheImpl extends NonCachingMarkPositionAtTimePointCache { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MaxSpeedCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MaxSpeedCache.java index 3d26cdc2176..6d6fcd965b6 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MaxSpeedCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MaxSpeedCache.java @@ -7,11 +7,11 @@ import java.util.Map; import java.util.Map.Entry; import java.util.NavigableSet; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.GPSTrackListener; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/NoCachingWindLegTypeAndLegBearingCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/NoCachingWindLegTypeAndLegBearingCache.java index 09487c60106..72e2f506e25 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/NoCachingWindLegTypeAndLegBearingCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/NoCachingWindLegTypeAndLegBearingCache.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.tracking.impl; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/NonCachingMarkPositionAtTimePointCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/NonCachingMarkPositionAtTimePointCache.java index 08e4efc6494..734851b6099 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/NonCachingMarkPositionAtTimePointCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/NonCachingMarkPositionAtTimePointCache.java @@ -2,11 +2,11 @@ package com.sap.sailing.domain.tracking.impl; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.tracking.MarkPositionAtTimePointCache; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; public class NonCachingMarkPositionAtTimePointCache implements MarkPositionAtTimePointCache { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java index 900dc9aa829..219b3b0bf2d 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java @@ -8,11 +8,11 @@ import java.util.SortedSet; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; import com.sap.sailing.domain.tracking.WindPositionMode; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java index bbfb7df3a95..34c361098b1 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java @@ -23,7 +23,6 @@ import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.confidence.impl.PositionAndTimePointWeigher; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -41,6 +40,7 @@ import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.AbstractTimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.impl.SerializableComparator; import com.sap.sse.concurrent.LockUtil; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java index 02765e3b3bd..ef84b1e6943 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java @@ -24,12 +24,9 @@ import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; import com.sap.sailing.domain.common.Wind; @@ -48,7 +45,10 @@ import com.sap.sailing.domain.tracking.TrackedRaceStatus; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; import com.sap.sailing.domain.tracking.WindPositionMode; import com.sap.sailing.domain.tracking.WindWithConfidence; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java index 0501c5af59a..f1e5123c530 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java @@ -10,13 +10,10 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -32,7 +29,10 @@ import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; import com.sap.sailing.domain.tracking.WindPositionMode; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java index cfde4bc9fac..8f83da7ed82 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java @@ -68,8 +68,6 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.CourseImpl; import com.sap.sailing.domain.base.impl.DouglasPeucker; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NauticalSide; @@ -77,7 +75,6 @@ import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaNameAndRaceName; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; @@ -147,8 +144,11 @@ import com.sap.sailing.domain.tracking.WindPositionMode; import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.IsManagedByCache; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java index 29801f01011..e08d0e51273 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java @@ -11,11 +11,8 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.CourseChange; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.impl.PositionAndTimePointWeigher; @@ -28,7 +25,10 @@ import com.sap.sailing.domain.confidence.ConfidenceFactory; import com.sap.sailing.domain.tracking.WindListener; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindwardToGoComparator.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindwardToGoComparator.java index 18ff9e14f23..031ffff2ffa 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindwardToGoComparator.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindwardToGoComparator.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.Map; import java.util.SortedSet; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindError; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.tracking.MarkPassing; @@ -14,6 +13,7 @@ import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.WindLegTypeAndLegBearingCache; import com.sap.sailing.domain.tracking.WindPositionMode; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/RegattaUtil.java b/java/com.sap.sailing.domain/src/com/sap/sailing/util/RegattaUtil.java index 9b35378b91e..77a1b5ea4c3 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/RegattaUtil.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/util/RegattaUtil.java @@ -2,8 +2,8 @@ package com.sap.sailing.util; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Regatta; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; public class RegattaUtil { diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java index 5d024f16490..fc0dc8e4a1f 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java @@ -2,11 +2,11 @@ package com.sap.sailing.expeditionconnector; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.udpconnector.UDPMessage; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; public interface ExpeditionMessage extends UDPMessage { diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java index 843a9e4c798..6b89f1f7e14 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java @@ -11,13 +11,13 @@ import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceWithAdditionalID; import com.sap.sailing.domain.tracking.AbstractWindTracker; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.WindTracker; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Can be subscribed to a {@link UDPExpeditionReceiver} and forwards wind information diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageImpl.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageImpl.java index f0508c90773..14046090bea 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageImpl.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageImpl.java @@ -9,9 +9,7 @@ import java.util.Set; import java.util.TimeZone; import java.util.TreeSet; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -19,7 +17,9 @@ import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.expeditionconnector.ExpeditionMessage; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class ExpeditionMessageImpl implements ExpeditionMessage { diff --git a/java/com.sap.sailing.grib/src/com/sap/sailing/grib/impl/SpeedAndDirectionWindField.java b/java/com.sap.sailing.grib/src/com/sap/sailing/grib/impl/SpeedAndDirectionWindField.java index 92c5d324e8a..8165f0f7bad 100755 --- a/java/com.sap.sailing.grib/src/com/sap/sailing/grib/impl/SpeedAndDirectionWindField.java +++ b/java/com.sap.sailing.grib/src/com/sap/sailing/grib/impl/SpeedAndDirectionWindField.java @@ -11,13 +11,13 @@ import java.util.logging.Logger; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterPerSecondSpeedWithDegreeBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.WindWithConfidenceImpl; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; +import com.sap.sse.common.impl.DegreeBearingImpl; import ucar.ma2.Array; import ucar.ma2.Index; diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java index c6990f69bd3..9b2de775002 100644 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java @@ -25,12 +25,9 @@ import com.sap.sailing.domain.base.SharedDomainFactory; import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; @@ -74,8 +71,11 @@ import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.WindTrackImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.IsManagedByCache; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.util.ThreadLocalTransporter; diff --git a/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs index 2618262490a..b8fc9e75f7b 100755 --- a/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs @@ -16,8 +16,6 @@ encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properti encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties=UTF-8 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties=UTF-8 encoding//src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManagerComponent.java=utf-8 -encoding//src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractResultsPresenter.java=utf-8 -encoding//src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/PlainResultsPresenter.java=utf-8 encoding//src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompetitorFilterPanel.java=utf-8 encoding//src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java=utf-8 encoding//src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiMultiRaceLeaderboardPanel.java=utf-8 diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF index 447face8910..773d1172942 100644 --- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF @@ -36,6 +36,7 @@ Require-Bundle: com.sap.sailing.domain, com.sap.sse.common, com.sap.sse.datamining.shared, com.sap.sse.datamining, + com.sap.sse.datamining.ui, com.sap.sailing.xrr.schema, com.sap.sailing.xrr.structureimport, com.sap.sse.security, @@ -82,6 +83,7 @@ Export-Package: com.google.gwt.user.client.rpc.core.com.sap.sailing.domain.commo com.sap.sailing.gwt.ui.actions, com.sap.sailing.gwt.ui.client, com.sap.sailing.gwt.ui.client.shared.charts, + com.sap.sailing.gwt.ui.client.shared.controls, com.sap.sailing.gwt.ui.client.shared.racemap, com.sap.sailing.gwt.ui.server, com.sap.sailing.gwt.ui.shared, diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/datamining/shared/FoilingSegmentsDataMiningSettings_CustomFieldSerializer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/datamining/shared/FoilingSegmentsDataMiningSettings_CustomFieldSerializer.java index 1b2cda75229..bf5b4c8e149 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/datamining/shared/FoilingSegmentsDataMiningSettings_CustomFieldSerializer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/datamining/shared/FoilingSegmentsDataMiningSettings_CustomFieldSerializer.java @@ -5,9 +5,9 @@ import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; import com.google.gwt.user.client.rpc.SerializationStreamWriter; import com.sap.sailing.datamining.shared.FoilingSegmentsDataMiningSettings; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; public final class FoilingSegmentsDataMiningSettings_CustomFieldSerializer extends CustomFieldSerializer { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/impl/DegreeBearingImpl_CustomFieldSerializer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/impl/DegreeBearingImpl_CustomFieldSerializer.java index b971c4ff470..b39e568c4b1 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/impl/DegreeBearingImpl_CustomFieldSerializer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/impl/DegreeBearingImpl_CustomFieldSerializer.java @@ -4,7 +4,7 @@ import com.google.gwt.user.client.rpc.CustomFieldSerializer; import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; public class DegreeBearingImpl_CustomFieldSerializer extends CustomFieldSerializer { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java index 9097c9cf654..dcd17aab50a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java @@ -6,11 +6,11 @@ import com.google.gwt.user.client.rpc.CustomFieldSerializer; import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.tracking.impl.VeryCompactWindImpl.VeryCompactPosition; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; public final class CompactWindImpl { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java index 590c5dab804..3582b2f534a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java @@ -6,11 +6,11 @@ import com.google.gwt.user.client.rpc.CustomFieldSerializer; import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.tracking.impl.VeryCompactWindImpl.VeryCompactPosition; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; public final class VeryCompactWindImpl { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java index 8336e6ff22c..4f5c3837267 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java @@ -4,7 +4,6 @@ import java.util.List; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Label; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.dto.CompetitorDTO; @@ -22,6 +21,7 @@ import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardEntryPoint; import com.sap.sailing.gwt.ui.leaderboard.SingleRaceLeaderboardPanel; import com.sap.sailing.gwt.ui.leaderboard.SixtyInchLeaderBoardStyle; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java index 6db249025c9..0a75c671e3e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.autoplay.client.places.screens.afterliveraceloop.boats; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.gwt.ui.leaderboard.SingleRaceLeaderboardPanel; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; public interface RaceEndWithBoatsView { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java index 513741a9b5c..4750e387dca 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java @@ -10,11 +10,11 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ResizeComposite; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.gwt.autoplay.client.places.screens.preliveraceloop.leaderboard.PreLiveRaceLeaderBoardWithImageViewImpl.ImageProvider; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.leaderboard.SingleRaceLeaderboardPanel; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.gwt.client.panels.ResizableFlowPanel; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java index 676ad719698..cdf6310b879 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java @@ -1,10 +1,10 @@ package com.sap.sailing.gwt.autoplay.client.places.screens.liveraceloop.racemapwithleaderboard; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMap; import com.sap.sailing.gwt.ui.leaderboard.SingleRaceLeaderboardPanel; +import com.sap.sse.common.Distance; public interface LiveRaceWithRacemapAndLeaderBoardView { void startingWith(Slide7Presenter p, AcceptsOneWidget panel, RaceMap raceMap, diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java index 568ed50aeb9..1197f14fcd7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java @@ -8,11 +8,11 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ResizeComposite; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMap; import com.sap.sailing.gwt.ui.leaderboard.SingleRaceLeaderboardPanel; +import com.sap.sse.common.Distance; import com.sap.sse.gwt.client.panels.ResizableFlowPanel; public class LiveRaceWithRacemapAndLeaderBoardViewImpl extends ResizeComposite implements LiveRaceWithRacemapAndLeaderBoardView { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/BoatClassMasterdataSuggestOracle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/BoatClassMasterdataSuggestOracle.java index 8e50daed68a..75b99c45e30 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/BoatClassMasterdataSuggestOracle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/BoatClassMasterdataSuggestOracle.java @@ -3,6 +3,7 @@ package com.sap.sailing.gwt.common.client.suggestion; import java.util.Arrays; import com.sap.sailing.domain.common.BoatClassMasterdata; +import com.sap.sse.gwt.client.suggestion.AbstractListSuggestOracle; public class BoatClassMasterdataSuggestOracle extends AbstractListSuggestOracle { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/sixtyinch/GetSixtyInchStatisticAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/sixtyinch/GetSixtyInchStatisticAction.java index e0fa85873b7..a33f0a34f31 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/sixtyinch/GetSixtyInchStatisticAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/sixtyinch/GetSixtyInchStatisticAction.java @@ -6,7 +6,6 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.RegattaNameAndRaceName; import com.sap.sailing.domain.common.TargetTimeInfo; @@ -14,6 +13,7 @@ import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/sixtyinch/GetSixtyInchStatisticDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/sixtyinch/GetSixtyInchStatisticDTO.java index 5303fa97a16..8e90a5b4cd1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/sixtyinch/GetSixtyInchStatisticDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/sixtyinch/GetSixtyInchStatisticDTO.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.home.communication.event.sixtyinch; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.gwt.dispatch.shared.commands.DTO; import com.sap.sse.gwt.dispatch.shared.commands.Result; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/EventStatisticsDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/EventStatisticsDTO.java index a88ab055bca..096e76aa1c5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/EventStatisticsDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/EventStatisticsDTO.java @@ -2,9 +2,9 @@ package com.sap.sailing.gwt.home.communication.event.statistics; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.gwt.home.communication.event.SimpleCompetitorDTO; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; import com.sap.sse.gwt.dispatch.shared.commands.DTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventlist/EventListYearDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventlist/EventListYearDTO.java index 794f112f4c2..111a0c5554d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventlist/EventListYearDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventlist/EventListYearDTO.java @@ -6,10 +6,10 @@ import java.util.List; import com.google.gwt.core.shared.GwtIncompatible; import com.google.gwt.user.client.rpc.IsSerializable; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.statistics.Statistics; import com.sap.sailing.gwt.home.communication.event.SimpleCompetitorDTO; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaMetadataDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaMetadataDTO.java index b8c694b6a6a..2a0e1cc6d13 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaMetadataDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaMetadataDTO.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class RegattaMetadataDTO extends RegattaReferenceDTO implements HasRegattaMetadata { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.java index 8a723a7db9a..0ea958cc6d1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.java @@ -15,7 +15,6 @@ import com.sap.sailing.domain.base.EventBase; import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.Regatta; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.domain.common.dto.LeaderboardDTO; import com.sap.sailing.domain.common.dto.LeaderboardEntryDTO; @@ -36,6 +35,7 @@ import com.sap.sailing.gwt.home.server.EventActionUtil.RaceCallback; import com.sap.sailing.gwt.server.HomeServiceUtil; import com.sap.sailing.server.RacingEventService; import com.sap.sailing.util.RegattaUtil; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/StatisticsCalculator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/StatisticsCalculator.java index 29f61f2efb0..ef81d53f894 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/StatisticsCalculator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/StatisticsCalculator.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.home.server; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.gwt.home.communication.event.statistics.EventStatisticsDTO; import com.sap.sailing.gwt.home.server.EventActionUtil.LeaderboardCallback; import com.sap.sailing.server.statistics.TrackedRaceStatisticsCache; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractAsyncSuggestBoxFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractAsyncSuggestBoxFilter.java index 6dc21a55f60..9114660d4d0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractAsyncSuggestBoxFilter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractAsyncSuggestBoxFilter.java @@ -2,8 +2,8 @@ package com.sap.sailing.gwt.home.shared.partials.filter; import java.util.Collection; -import com.sap.sailing.gwt.common.client.suggestion.AbstractSuggestOracle; import com.sap.sse.common.filter.Filter; +import com.sap.sse.gwt.client.suggestion.AbstractSuggestOracle; public abstract class AbstractAsyncSuggestBoxFilter extends AbstractSuggestBoxFilter { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractListSuggestBoxFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractListSuggestBoxFilter.java index 295387bf884..5aa5d7f8d59 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractListSuggestBoxFilter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractListSuggestBoxFilter.java @@ -2,7 +2,7 @@ package com.sap.sailing.gwt.home.shared.partials.filter; import java.util.Collection; -import com.sap.sailing.gwt.common.client.suggestion.AbstractListSuggestOracle; +import com.sap.sse.gwt.client.suggestion.AbstractListSuggestOracle; public abstract class AbstractListSuggestBoxFilter extends AbstractSuggestBoxFilter { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractSuggestBoxFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractSuggestBoxFilter.java index 213c658f923..8dbde089b5d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractSuggestBoxFilter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/AbstractSuggestBoxFilter.java @@ -1,8 +1,8 @@ package com.sap.sailing.gwt.home.shared.partials.filter; -import com.sap.sailing.gwt.common.client.suggestion.AbstractSuggestOracle; -import com.sap.sailing.gwt.common.client.suggestion.CustomSuggestBox; -import com.sap.sailing.gwt.common.client.suggestion.CustomSuggestBox.SuggestionSelectionHandler; +import com.sap.sse.gwt.client.suggestion.AbstractSuggestOracle; +import com.sap.sse.gwt.client.suggestion.CustomSuggestBox; +import com.sap.sse.gwt.client.suggestion.CustomSuggestBox.SuggestionSelectionHandler; public abstract class AbstractSuggestBoxFilter extends AbstractTextInputFilter { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/RacesByCompetitorTextBoxFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/RacesByCompetitorTextBoxFilter.java index 99f0d86007d..9b41c70a289 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/RacesByCompetitorTextBoxFilter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/filter/RacesByCompetitorTextBoxFilter.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.sap.sailing.gwt.common.client.suggestion.AbstractListSuggestOracle; import com.sap.sailing.gwt.home.communication.event.SimpleCompetitorDTO; import com.sap.sailing.gwt.home.communication.race.SimpleRaceMetadataDTO; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.Util; import com.sap.sse.common.filter.AbstractListFilter; import com.sap.sse.common.filter.Filter; +import com.sap.sse.gwt.client.suggestion.AbstractListSuggestOracle; public class RacesByCompetitorTextBoxFilter extends AbstractListSuggestBoxFilter { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/multiselection/SuggestedMultiSelection.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/multiselection/SuggestedMultiSelection.java index f94aa43c7ae..a88c53ae485 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/multiselection/SuggestedMultiSelection.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/multiselection/SuggestedMultiSelection.java @@ -15,7 +15,6 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.domain.common.dto.BoatClassDTO; -import com.sap.sailing.gwt.common.client.suggestion.AbstractSuggestOracle; import com.sap.sailing.gwt.home.communication.event.SimpleCompetitorWithIdDTO; import com.sap.sailing.gwt.home.shared.partials.filter.AbstractAsyncSuggestBoxFilter; import com.sap.sailing.gwt.home.shared.partials.filter.AbstractFilterWidget; @@ -23,6 +22,7 @@ import com.sap.sailing.gwt.home.shared.partials.filter.AbstractSuggestBoxFilter; import com.sap.sailing.gwt.home.shared.partials.multiselection.SuggestedMultiSelectionDataProvider.SuggestionItemsCallback; import com.sap.sailing.gwt.ui.client.FlagImageResolver; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.gwt.client.suggestion.AbstractSuggestOracle; public final class SuggestedMultiSelection extends Composite implements SuggestedMultiSelectionDataProvider.Display { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/settingtypes/DistanceSetting.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/settingtypes/DistanceSetting.java index bb4fc48491e..48b18e2c12b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/settingtypes/DistanceSetting.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/settingtypes/DistanceSetting.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.settings.client.settingtypes; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.gwt.settings.client.settingtypes.converter.DistanceConverter; +import com.sap.sse.common.Distance; import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings; import com.sap.sse.common.settings.generic.base.AbstractValueSetting; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/settingtypes/converter/DistanceConverter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/settingtypes/converter/DistanceConverter.java index 44b6c4c6daa..baac7608cbf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/settingtypes/converter/DistanceConverter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/settingtypes/converter/DistanceConverter.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.settings.client.settingtypes.converter; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; import com.sap.sse.common.settings.generic.ValueConverter; import com.sap.sse.common.settings.value.DoubleValue; import com.sap.sse.common.settings.value.Value; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatEditDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatEditDialog.java index 4f3b37e6c74..a46692cdaaf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatEditDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatEditDialog.java @@ -6,12 +6,12 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.SuggestBox; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.BoatClassDTO; import com.sap.sailing.domain.common.dto.BoatDTO; import com.sap.sailing.gwt.common.client.suggestion.BoatClassMasterdataSuggestOracle; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.Color; +import com.sap.sse.common.Distance; import com.sap.sse.common.impl.RGBColor; import com.sap.sse.gwt.client.dialog.DataEntryDialog; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorWithBoatCreateDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorWithBoatCreateDialog.java index 6a57c5aa5a9..7f97b5f4870 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorWithBoatCreateDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorWithBoatCreateDialog.java @@ -11,12 +11,12 @@ import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.google.gwt.view.client.SelectionChangeEvent; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.BoatClassDTO; import com.sap.sailing.domain.common.dto.BoatDTO; import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.common.Distance; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.celltable.RefreshableSingleSelectionModel; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorWithBoatEditDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorWithBoatEditDialog.java index bc4171025cb..7a7edc4fd60 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorWithBoatEditDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorWithBoatEditDialog.java @@ -4,12 +4,12 @@ import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.BoatClassDTO; import com.sap.sailing.domain.common.dto.BoatDTO; import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.Color; +import com.sap.sse.common.Distance; import com.sap.sse.common.impl.RGBColor; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CopyCourseAndCompetitorsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CopyCourseAndCompetitorsDialog.java index ad4f5c0d18a..e8a53167ce5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CopyCourseAndCompetitorsDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CopyCourseAndCompetitorsDialog.java @@ -9,10 +9,10 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Widget; import com.google.gwt.view.client.SelectionChangeEvent; import com.google.gwt.view.client.SelectionChangeEvent.Handler; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.gwt.ui.adminconsole.AbstractLeaderboardConfigPanel.RaceColumnDTOAndFleetDTOWithNameBasedEquality; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.common.Distance; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.celltable.RefreshableMultiSelectionModel; import com.sap.sse.gwt.client.dialog.DataEntryDialog; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java index cda13ec5d28..4171113f86a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java @@ -8,13 +8,13 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.SuggestBox; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.VerticalPanel; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.dto.BoatClassDTO; import com.sap.sailing.gwt.common.client.suggestion.BoatClassMasterdataSuggestOracle; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.shared.EventDTO; import com.sap.sailing.gwt.ui.shared.RegattaDTO; import com.sap.sailing.gwt.ui.shared.SeriesDTO; +import com.sap.sse.common.Distance; import com.sap.sse.gwt.client.IconResources; import com.sap.sse.gwt.client.controls.listedit.ListEditorComposite; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java index 362d978711d..757f26b1fbb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java @@ -31,7 +31,6 @@ import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.SelectionChangeEvent; import com.google.gwt.view.client.SelectionChangeEvent.Handler; import com.sap.sailing.domain.common.CourseDesignerMode; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; @@ -60,6 +59,7 @@ import com.sap.sailing.gwt.ui.shared.RaceLogSetFinishingAndFinishTimeDTO; import com.sap.sailing.gwt.ui.shared.RaceLogSetStartTimeAndProcedureDTO; import com.sap.sailing.gwt.ui.shared.RegattaDTO; import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 8103ee9e021..4049a4b1a41 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -11,7 +11,7 @@ import com.sap.sse.gwt.client.DefaultRule_1_0n; @DefaultLocale("en") public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, - com.sap.sse.gwt.adminconsole.StringMessages, CommonStringMessages { + com.sap.sse.gwt.adminconsole.StringMessages, CommonStringMessages, com.sap.sse.datamining.ui.StringMessages { public static final StringMessages INSTANCE = GWT.create(StringMessages.class); String manage2Sail(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/WindIndicator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/WindIndicator.java index ac4d07d8a63..f865a0b735d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/WindIndicator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/WindIndicator.java @@ -6,8 +6,8 @@ import com.google.gwt.canvas.dom.client.Context2d.LineCap; import com.google.gwt.event.logical.shared.AttachEvent; import com.google.gwt.user.client.ui.Composite; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * WindIndicator Widget allows visualizing the wind direction and other wind related information. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/BoatOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/BoatOverlay.java index 01729f1d788..f81dfaa05fa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/BoatOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/BoatOverlay.java @@ -7,7 +7,6 @@ import com.google.gwt.maps.client.MapWidget; import com.google.gwt.maps.client.base.LatLng; import com.google.gwt.maps.client.base.Point; import com.google.gwt.maps.client.base.Size; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.dto.BoatClassDTO; @@ -17,6 +16,7 @@ import com.sap.sailing.gwt.ui.shared.SpeedWithBearingDTO; import com.sap.sailing.gwt.ui.shared.racemap.BoatClassVectorGraphics; import com.sap.sailing.gwt.ui.shared.racemap.CanvasOverlayV3; import com.sap.sse.common.Color; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CoordinateSystem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CoordinateSystem.java index e7345c6ad43..7c62ef3906e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CoordinateSystem.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CoordinateSystem.java @@ -1,8 +1,8 @@ package com.sap.sailing.gwt.ui.client.shared.racemap; import com.google.gwt.maps.client.base.LatLng; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; /** * Maps original coordinates, headings, bearings, and directions to a map coordinate space. The default mapping will diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CourseMarkOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CourseMarkOverlay.java index 4c3602a1964..e471e45c284 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CourseMarkOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/CourseMarkOverlay.java @@ -9,8 +9,6 @@ import com.google.gwt.maps.client.MapWidget; import com.google.gwt.maps.client.base.LatLng; import com.google.gwt.maps.client.base.Point; import com.google.gwt.maps.client.base.Size; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MarkType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.MeterDistance; @@ -19,6 +17,8 @@ import com.sap.sailing.gwt.ui.shared.MarkDTO; import com.sap.sailing.gwt.ui.shared.racemap.CanvasOverlayV3; import com.sap.sailing.gwt.ui.shared.racemap.MarkVectorGraphics; import com.sap.sailing.gwt.ui.shared.racemap.MarkVectorGraphicsFactory; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/DelegateCoordinateSystem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/DelegateCoordinateSystem.java index 0ec0cd0edb2..116e8d16ff9 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/DelegateCoordinateSystem.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/DelegateCoordinateSystem.java @@ -1,8 +1,8 @@ package com.sap.sailing.gwt.ui.client.shared.racemap; import com.google.gwt.maps.client.base.LatLng; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; /** * Holds a {@link CoordinateSystem} that can be exchanged, using {@link #setCoordinateSystem}. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/IdentityCoordinateSystem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/IdentityCoordinateSystem.java index a1af1d2e244..e5e1322de1d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/IdentityCoordinateSystem.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/IdentityCoordinateSystem.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.ui.client.shared.racemap; import com.google.gwt.maps.client.base.LatLng; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; +import com.sap.sse.common.Bearing; public class IdentityCoordinateSystem implements CoordinateSystem { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java index 486360ca7f1..4b9b660e9eb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java @@ -72,9 +72,7 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RequiresResize; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Bounds; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.Position; @@ -84,7 +82,6 @@ import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.dto.BoatDTO; import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.domain.common.dto.LeaderboardDTO; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; @@ -134,13 +131,16 @@ import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapAPIKey; import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapStyleHelper; import com.sap.sailing.gwt.ui.shared.racemap.RaceSimulationOverlay; import com.sap.sailing.gwt.ui.shared.racemap.WindStreamletsRaceboardOverlay; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Color; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.filter.Filter; import com.sap.sse.common.filter.FilterSet; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.impl.RGBColor; import com.sap.sse.gwt.client.ErrorReporter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettings.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettings.java index 323d1f22d65..31cb09359ef 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettings.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettings.java @@ -4,12 +4,12 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.gwt.settings.client.settingtypes.DistanceSetting; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapHelpLinesSettings.HelpLineTypes; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings; import com.sap.sse.common.settings.generic.BooleanSetting; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java index b1ba8198427..4a5693faf86 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapSettingsDialogComponent.java @@ -18,13 +18,13 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.LongBox; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.gwt.ui.client.ManeuverTypeFormatter; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapHelpLinesSettings.HelpLineTypes; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapZoomSettings.ZoomTypes; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; import com.sap.sse.gwt.client.controls.IntegerBox; import com.sap.sse.gwt.client.dialog.DataEntryDialog; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RotateAndTranslateCoordinateSystem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RotateAndTranslateCoordinateSystem.java index 4f2ba6b5401..e183bf70f5b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RotateAndTranslateCoordinateSystem.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RotateAndTranslateCoordinateSystem.java @@ -1,10 +1,10 @@ package com.sap.sailing.gwt.ui.client.shared.racemap; import com.google.gwt.maps.client.base.LatLng; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Translates and rotates a coordinate space. The translation is specified by providing the position diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java index 09d8cf9181c..be857d40ddf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java @@ -15,11 +15,16 @@ import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication; import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint; import com.sap.sailing.gwt.ui.client.RemoteServiceMappingConstants; -import com.sap.sailing.gwt.ui.datamining.execution.SimpleQueryRunner; -import com.sap.sailing.gwt.ui.datamining.presentation.TabbedResultsPresenter; -import com.sap.sailing.gwt.ui.datamining.selection.QueryDefinitionProviderWithControls; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.UUIDDataMiningSession; +import com.sap.sse.datamining.ui.AnchorDataMiningSettingsControl; +import com.sap.sse.datamining.ui.DataMiningService; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.ResultsPresenter; +import com.sap.sse.datamining.ui.execution.SimpleQueryRunner; +import com.sap.sse.datamining.ui.presentation.AbstractTabbedResultsPresenter; +import com.sap.sse.datamining.ui.selection.QueryDefinitionProviderWithControls; import com.sap.sse.gwt.client.EntryPointHelper; import com.sap.sse.gwt.client.shared.components.ComponentResources; import com.sap.sse.gwt.resources.Highcharts; @@ -60,7 +65,7 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { public Widget get() { DataMiningSettingsControl settingsControl = new AnchorDataMiningSettingsControl(null, null, getStringMessages()); - ResultsPresenter resultsPresenter = new TabbedResultsPresenter(/* parent */ null, /* context */ null, + ResultsPresenter resultsPresenter = new AbstractTabbedResultsPresenter(/* parent */ null, /* context */ null, /* delegate drillDownCallback */ groupKey -> { queryDefinitionProviderWithControls.drillDown(groupKey, /* onSuccessCallback */ ()->queryRunner.runQuery()); }, getStringMessages()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java similarity index 86% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManager.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java index a0ea973075c..2951715578c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManager.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java @@ -3,11 +3,11 @@ package com.sap.sailing.gwt.ui.datamining; import java.util.HashMap; import java.util.Map; +import com.sap.sailing.datamining.shared.FoilingSegmentsDataMiningSettings; import com.sap.sailing.datamining.shared.ManeuverSettings; import com.sap.sailing.datamining.shared.ManeuverSettingsImpl; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsSettings; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsSettingsImpl; -import com.sap.sailing.datamining.shared.FoilingSegmentsDataMiningSettings; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.datamining.presentation.ManeuverSettingsDialogComponent; import com.sap.sailing.gwt.ui.datamining.presentation.ManeuverSpeedDetailsSettingsDialogComponent; @@ -16,13 +16,15 @@ import com.sap.sailing.gwt.ui.polarmining.PolarDataMiningSettingsDialogComponent import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettingsImpl; import com.sap.sse.common.settings.SerializableSettings; +import com.sap.sse.datamining.ui.DataMiningSettingsInfo; +import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; -public class DataMiningSettingsInfoManager { +public class DataMiningSettingsInfoManagerImpl implements DataMiningSettingsInfoManager { private final Map, DataMiningSettingsInfo> infosMappedBySettingsType; - public DataMiningSettingsInfoManager() { + public DataMiningSettingsInfoManagerImpl() { infosMappedBySettingsType = new HashMap<>(); // GWT doesn't support Class.isAssignableFrom and Class.getInterfaces. @@ -43,6 +45,12 @@ public class DataMiningSettingsInfoManager { infosMappedBySettingsType.put(FoilingSegmentsDataMiningSettings.class, foilingDataMiningSettingsInfo); } + /* + * (non-Javadoc) + * + * @see com.sap.sailing.gwt.ui.datamining.DataMiningSettingsInfoManagerTmp#getSettingsInfo(java.lang.Class) + */ + @Override public DataMiningSettingsInfo getSettingsInfo(Class settingsType) { return infosMappedBySettingsType.get(settingsType); } @@ -50,8 +58,10 @@ public class DataMiningSettingsInfoManager { private class PolarDataMiningSettingsInfo implements DataMiningSettingsInfo { @SuppressWarnings("unchecked") @Override - public SettingsDialogComponent createSettingsDialogComponent(SettingsType settings) { - return (SettingsDialogComponent) new PolarDataMiningSettingsDialogComponent((PolarDataMiningSettings) settings); + public SettingsDialogComponent createSettingsDialogComponent( + SettingsType settings) { + return (SettingsDialogComponent) new PolarDataMiningSettingsDialogComponent( + (PolarDataMiningSettings) settings); } @Override @@ -113,8 +123,10 @@ public class DataMiningSettingsInfoManager { private class FoilingSegmentsDataMiningSettingsInfo implements DataMiningSettingsInfo { @SuppressWarnings("unchecked") @Override - public SettingsDialogComponent createSettingsDialogComponent(SettingsType settings) { - return (SettingsDialogComponent) new FoilingSegmentsDataMiningSettingsDialogComponent((FoilingSegmentsDataMiningSettings) settings); + public SettingsDialogComponent createSettingsDialogComponent( + SettingsType settings) { + return (SettingsDialogComponent) new FoilingSegmentsDataMiningSettingsDialogComponent( + (FoilingSegmentsDataMiningSettings) settings); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java new file mode 100644 index 00000000000..2ea1a226dd9 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java @@ -0,0 +1,53 @@ +package com.sap.sailing.gwt.ui.datamining.presentation; + +import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sailing.gwt.ui.polarmining.PolarBackendResultsPresenter; +import com.sap.sailing.gwt.ui.polarmining.PolarResultsPresenter; +import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.presentation.AbstractTabbedResultsPresenter; +import com.sap.sse.datamining.ui.presentation.MultiResultsPresenter; +import com.sap.sse.datamining.ui.presentation.ResultsChart.DrillDownCallback; +import com.sap.sse.gwt.client.shared.components.Component; +import com.sap.sse.gwt.client.shared.settings.ComponentContext; + +public class TabbedSailingResultsPresenter extends AbstractTabbedResultsPresenter { + + public TabbedSailingResultsPresenter(Component parent, ComponentContext context, + DrillDownCallback drillDownCallback, StringMessages stringMessages) { + super(parent, context, drillDownCallback, stringMessages); + + } + + @Override + public void showResult(QueryResultDTO result) { // TODO make abstract + if (result != null) { + if (result.getResultType().equals("com.sap.sailing.polars.datamining.shared.PolarAggregation")) { + CloseableTabHeader oldHeader = getSelectedHeader(); + addTabAndFocus(new PolarResultsPresenter(TabbedSailingResultsPresenter.this, getComponentContext(), + stringMessages)); + removeTab(oldHeader); + } else if (result.getResultType().equals("com.sap.sailing.polars.datamining.shared.PolarBackendData")) { + CloseableTabHeader oldHeader = getSelectedHeader(); + addTabAndFocus(new PolarBackendResultsPresenter(TabbedSailingResultsPresenter.this, + getComponentContext(), stringMessages)); + removeTab(oldHeader); + } else if (result.getResultType() + .equals("com.sap.sailing.datamining.shared.ManeuverSpeedDetailsAggregation")) { + CloseableTabHeader oldHeader = getSelectedHeader(); + addTabAndFocus(new ManeuverSpeedDetailsResultsPresenter(TabbedSailingResultsPresenter.this, + getComponentContext(), stringMessages)); + removeTab(oldHeader); + } else { + if (!(getSelectedPresenter() instanceof MultiResultsPresenter)) { + CloseableTabHeader oldHeader = getSelectedHeader(); + addTabAndFocus( + new MultiResultsPresenter(this, getComponentContext(), drillDownCallback, stringMessages)); + removeTab(oldHeader); + } + } + getSelectedHeader().setText(result.getResultSignifier()); + } + getSelectedPresenter().showResult(result); + } + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java index 87870c8a5b0..213a8bc42d5 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java @@ -58,7 +58,6 @@ import com.google.gwt.view.client.MultiSelectionModel; import com.google.gwt.view.client.SelectionChangeEvent; import com.google.gwt.view.client.SelectionChangeEvent.Handler; import com.sap.sailing.domain.common.DetailType; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.InvertibleComparator; import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.MaxPointsReason; @@ -100,6 +99,7 @@ import com.sap.sailing.gwt.ui.client.shared.filter.LeaderboardFetcher; import com.sap.sailing.gwt.ui.common.client.DateAndTimeFormatterUtil; import com.sap.sailing.gwt.ui.leaderboard.DetailTypeColumn.LegDetailField; import com.sap.sailing.gwt.ui.shared.RaceTimesInfoDTO; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java index 9f92632c2d3..23e010ebded 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java @@ -21,13 +21,13 @@ import com.google.gwt.user.client.ui.SimpleLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.charts.ChartToCsvExporter; -import com.sap.sailing.gwt.ui.datamining.presentation.AbstractResultsPresenter; import com.sap.sailing.gwt.ui.datamining.presentation.ChartFactory; import com.sap.sailing.polars.datamining.shared.PolarBackendData; import com.sap.sse.common.settings.Settings; import com.sap.sse.common.util.NaturalComparator; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.presentation.AbstractResultsPresenter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java index 3f947da4d18..0e3108150c8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java @@ -31,7 +31,6 @@ import com.google.gwt.user.client.ui.SimpleLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.charts.ChartToCsvExporter; -import com.sap.sailing.gwt.ui.datamining.presentation.AbstractResultsPresenter; import com.sap.sailing.gwt.ui.datamining.presentation.ChartFactory; import com.sap.sailing.polars.datamining.shared.PolarAggregation; import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; @@ -39,6 +38,7 @@ import com.sap.sse.common.settings.Settings; import com.sap.sse.common.util.NaturalComparator; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.presentation.AbstractResultsPresenter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java index f0ad825a4b3..10b0265e093 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java @@ -28,7 +28,6 @@ import com.google.gwt.user.client.ui.MenuItem; import com.google.gwt.user.client.ui.RequiresResize; import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; @@ -81,6 +80,7 @@ import com.sap.sailing.gwt.ui.leaderboard.CompetitorFilterPanel; import com.sap.sailing.gwt.ui.leaderboard.SingleRaceLeaderboardPanel; import com.sap.sailing.gwt.ui.raceboard.RaceBoardResources.RaceBoardMainCss; import com.sap.sailing.gwt.ui.shared.RegattaDTO; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; import com.sap.sse.common.filter.FilterSet; import com.sap.sse.common.settings.AbstractSettings; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java index 740f0e3bdd2..c93bced603e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java @@ -21,7 +21,6 @@ import org.osgi.util.tracker.ServiceTracker; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.sap.sailing.domain.common.security.Permission; import com.sap.sailing.domain.common.security.Permission.Mode; -import com.sap.sailing.gwt.ui.datamining.DataMiningService; import com.sap.sailing.server.RacingEventService; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.DataMiningServer; @@ -50,17 +49,18 @@ import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.datamining.shared.impl.dto.ReducedDimensionsDTO; +import com.sap.sse.datamining.ui.DataMiningService; import com.sap.sse.i18n.ResourceBundleStringMessages; public class DataMiningServiceImpl extends RemoteServiceServlet implements DataMiningService { private static final long serialVersionUID = -7951930891674894528L; private final BundleContext context; - + private final ServiceTracker dataMiningServerTracker; private final DataMiningDTOFactory dtoFactory; - + public DataMiningServiceImpl() { context = Activator.getDefault(); dataMiningServerTracker = createAndOpenDataMiningServerTracker(context); @@ -74,39 +74,44 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM result.open(); return result; } - + private DataMiningServer getDataMiningServer() { return dataMiningServerTracker.getService(); } - + @Override public Date getComponentsChangedTimepoint() { SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ)); return getDataMiningServer().getComponentsChangedTimepoint(); } - + @Override public HashSet getAllStatistics(String localeInfoName) { SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ)); Iterable> statistics = getDataMiningServer().getAllStatistics(); return functionsAsDTOs(statistics, localeInfoName); } - + @Override - public HashSet getStatisticsFor(DataRetrieverChainDefinitionDTO retrieverChainDefinition, String localeInfoName) { - SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, retrieverChainDefinition.getName())); - Class retrievedDataType = getDataMiningServer().getDataRetrieverChainDefinitionForDTO(retrieverChainDefinition).getRetrievedDataType(); + public HashSet getStatisticsFor(DataRetrieverChainDefinitionDTO retrieverChainDefinition, + String localeInfoName) { + SecurityUtils.getSubject().checkPermission( + Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, retrieverChainDefinition.getName())); + Class retrievedDataType = getDataMiningServer() + .getDataRetrieverChainDefinitionForDTO(retrieverChainDefinition).getRetrievedDataType(); Iterable> statistics = getDataMiningServer().getStatisticsFor(retrievedDataType); return functionsAsDTOs(statistics, localeInfoName); } - + @Override - public HashSet getAggregatorDefinitionsFor(FunctionDTO extractionFunction, String localeInfoName) { - SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, extractionFunction.getFunctionName())); + public HashSet getAggregatorDefinitionsFor(FunctionDTO extractionFunction, + String localeInfoName) { + SecurityUtils.getSubject().checkPermission( + Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, extractionFunction.getFunctionName())); Class returnType = getReturnType(extractionFunction); @SuppressWarnings("unchecked") - Iterable> definitions = - (Iterable>)(Iterable) getDataMiningServer().getAggregationProcessorDefinitions(returnType); + Iterable> definitions = (Iterable>) (Iterable) getDataMiningServer() + .getAggregationProcessorDefinitions(returnType); return aggregatorDefinitionsAsDTOs(definitions, localeInfoName); } @@ -118,72 +123,84 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM Iterable> definitions, String localeInfoName) { ResourceBundleStringMessages stringMessages = getDataMiningServer().getStringMessages(); Locale locale = ResourceBundleStringMessages.Util.getLocaleFor(localeInfoName); - + HashSet definitionDTOs = new HashSet<>(); - for (AggregationProcessorDefinition definition : definitions) { + for (AggregationProcessorDefinition definition : definitions) { definitionDTOs.add(dtoFactory.createAggregationProcessorDefinitionDTO(definition, stringMessages, locale)); } return definitionDTOs; } @Override - public HashSet getDimensionsFor(DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, String localeInfoName) { - SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, dataRetrieverChainDefinitionDTO.getName())); - Class retrievedType = getDataMiningServer().getDataRetrieverChainDefinitionForDTO(dataRetrieverChainDefinitionDTO).getRetrievedDataType(); + public HashSet getDimensionsFor(DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, + String localeInfoName) { + SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, + dataRetrieverChainDefinitionDTO.getName())); + Class retrievedType = getDataMiningServer() + .getDataRetrieverChainDefinitionForDTO(dataRetrieverChainDefinitionDTO).getRetrievedDataType(); Iterable> dimensions = getDataMiningServer().getDimensionsFor(retrievedType); return functionsAsDTOs(dimensions, localeInfoName); } - + @Override public ReducedDimensionsDTO getReducedDimensionsMappedByLevelFor( DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, String localeInfoName) { - SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, dataRetrieverChainDefinitionDTO.getName())); - DataRetrieverChainDefinition dataRetrieverChainDefinition = getDataMiningServer().getDataRetrieverChainDefinitionForDTO(dataRetrieverChainDefinitionDTO); - ReducedDimensions reducedDimensions = getDataMiningServer().getReducedDimensionsMappedByLevelFor(dataRetrieverChainDefinition); + SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, + dataRetrieverChainDefinitionDTO.getName())); + DataRetrieverChainDefinition dataRetrieverChainDefinition = getDataMiningServer() + .getDataRetrieverChainDefinitionForDTO(dataRetrieverChainDefinitionDTO); + ReducedDimensions reducedDimensions = getDataMiningServer() + .getReducedDimensionsMappedByLevelFor(dataRetrieverChainDefinition); return reducedDimensionsAsDTO(reducedDimensions, localeInfoName); } - private ReducedDimensionsDTO reducedDimensionsAsDTO( - ReducedDimensions dimensions, String localeInfoName) { + private ReducedDimensionsDTO reducedDimensionsAsDTO(ReducedDimensions dimensions, String localeInfoName) { HashMap> dimensionDTOs = new HashMap<>(); ResourceBundleStringMessages stringMessages = getDataMiningServer().getStringMessages(); Locale locale = ResourceBundleStringMessages.Util.getLocaleFor(localeInfoName); - for (final Entry, Iterable>> dimensionsEntry : dimensions.getReducedDimensions().entrySet()) { + for (final Entry, Iterable>> dimensionsEntry : dimensions + .getReducedDimensions().entrySet()) { dimensionDTOs.put(dtoFactory.createDataRetrieverLevelDTO(dimensionsEntry.getKey(), stringMessages, locale), - functionsAsDTOs(dimensionsEntry.getValue(), localeInfoName)); + functionsAsDTOs(dimensionsEntry.getValue(), localeInfoName)); } HashMap fromOriginalToReducedDTO = new HashMap<>(); - for (final Entry, Function> fromOriginalToReduced : dimensions.getFromOriginalDimensionToReducedDimension().entrySet()) { - fromOriginalToReducedDTO.put(dtoFactory.createFunctionDTO(fromOriginalToReduced.getKey(), stringMessages, locale), + for (final Entry, Function> fromOriginalToReduced : dimensions + .getFromOriginalDimensionToReducedDimension().entrySet()) { + fromOriginalToReducedDTO.put( + dtoFactory.createFunctionDTO(fromOriginalToReduced.getKey(), stringMessages, locale), dtoFactory.createFunctionDTO(fromOriginalToReduced.getValue(), stringMessages, locale)); } return new ReducedDimensionsDTO(dimensionDTOs, fromOriginalToReducedDTO); } - + private HashSet functionsAsDTOs(Iterable> functions, String localeInfoName) { Locale locale = ResourceBundleStringMessages.Util.getLocaleFor(localeInfoName); ResourceBundleStringMessages stringMessages = getDataMiningServer().getStringMessages(); - + HashSet functionDTOs = new HashSet(); for (Function function : functions) { functionDTOs.add(dtoFactory.createFunctionDTO(function, stringMessages, locale)); } return functionDTOs; } - + @Override public ArrayList getDataRetrieverChainDefinitions(String localeInfoName) { SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ)); - Iterable> dataRetrieverChainDefinitions = getDataMiningServer().getDataRetrieverChainDefinitions(); + Iterable> dataRetrieverChainDefinitions = getDataMiningServer() + .getDataRetrieverChainDefinitions(); return dataRetrieverChainDefinitionsAsDTOs(dataRetrieverChainDefinitions, localeInfoName); } - + @Override - public ArrayList getDataRetrieverChainDefinitionsFor(FunctionDTO statisticToCalculate, String localeInfoName) { - SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, statisticToCalculate.getFunctionName())); + public ArrayList getDataRetrieverChainDefinitionsFor( + FunctionDTO statisticToCalculate, String localeInfoName) { + SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, + statisticToCalculate.getFunctionName())); Class baseDataType = getBaseDataType(statisticToCalculate); @SuppressWarnings("unchecked") - Iterable> dataRetrieverChainDefinitions = (Iterable>)(Iterable) getDataMiningServer().getDataRetrieverChainDefinitionsByDataType(baseDataType); + Iterable> dataRetrieverChainDefinitions = (Iterable>) (Iterable) getDataMiningServer() + .getDataRetrieverChainDefinitionsByDataType(baseDataType); return dataRetrieverChainDefinitionsAsDTOs(dataRetrieverChainDefinitions, localeInfoName); } @@ -191,38 +208,46 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM Function function = getDataMiningServer().getFunctionForDTO(statisticToCalculate); return function.getDeclaringType(); } - + private ArrayList dataRetrieverChainDefinitionsAsDTOs( Iterable> dataRetrieverChainDefinitions, String localeInfoName) { ResourceBundleStringMessages serverStringMessages = getDataMiningServer().getStringMessages(); Locale locale = ResourceBundleStringMessages.Util.getLocaleFor(localeInfoName); - + ArrayList DTOs = new ArrayList<>(); for (DataRetrieverChainDefinition dataRetrieverChainDefinition : dataRetrieverChainDefinitions) { DTOs.add(dtoFactory.createDataRetrieverChainDefinitionDTO(dataRetrieverChainDefinition, - serverStringMessages, locale)); + serverStringMessages, locale)); } return DTOs; } @Override - public QueryResultDTO> getDimensionValuesFor(DataMiningSession session, DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, - DataRetrieverLevelDTO retrieverLevelDTO, HashSet dimensionDTOs, HashMap retrieverSettingsDTO, - HashMap>> filterSelectionDTO, String localeInfoName) { - SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, dataRetrieverChainDefinitionDTO.getName())); + public QueryResultDTO> getDimensionValuesFor(DataMiningSession session, + DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, DataRetrieverLevelDTO retrieverLevelDTO, + HashSet dimensionDTOs, + HashMap retrieverSettingsDTO, + HashMap>> filterSelectionDTO, + String localeInfoName) { + SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, + dataRetrieverChainDefinitionDTO.getName())); DataMiningServer dataMiningServer = getDataMiningServer(); - DataRetrieverChainDefinition retrieverChainDefinition = dataMiningServer.getDataRetrieverChainDefinitionForDTO(dataRetrieverChainDefinitionDTO); - DataRetrieverLevel retrieverLevel = retrieverChainDefinition.getDataRetrieverLevel(retrieverLevelDTO.getLevel()); + DataRetrieverChainDefinition retrieverChainDefinition = dataMiningServer + .getDataRetrieverChainDefinitionForDTO(dataRetrieverChainDefinitionDTO); + DataRetrieverLevel retrieverLevel = retrieverChainDefinition + .getDataRetrieverLevel(retrieverLevelDTO.getLevel()); Iterable> dimensions = functionDTOsAsFunctions(dimensionDTOs); // split up between boolean/enum dimensions and others; for the bool/enums we'll // simply enumerate all values instead of retrieving all objects List> nonBoolNonEnumResultDimensions = new ArrayList<>(); LinkedHashMap, List> boolOrEnumResultDimensionsWithValues = new LinkedHashMap<>(); for (final Function dimensionFunction : dimensions) { - if (dimensionFunction.getReturnType() == boolean.class || dimensionFunction.getReturnType() == Boolean.class) { + if (dimensionFunction.getReturnType() == boolean.class + || dimensionFunction.getReturnType() == Boolean.class) { boolOrEnumResultDimensionsWithValues.put(dimensionFunction, Arrays.asList(true, false)); } else if (dimensionFunction.getReturnType().isEnum()) { - boolOrEnumResultDimensionsWithValues.put(dimensionFunction, Arrays.asList(dimensionFunction.getReturnType().getEnumConstants())); + boolOrEnumResultDimensionsWithValues.put(dimensionFunction, + Arrays.asList(dimensionFunction.getReturnType().getEnumConstants())); } else { nonBoolNonEnumResultDimensions.add(dimensionFunction); } @@ -230,17 +255,25 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM final ExtensibleQueryResult> result; final Locale locale = ResourceBundleStringMessages.Util.getLocaleFor(localeInfoName); if (!nonBoolNonEnumResultDimensions.isEmpty()) { - Map, SerializableSettings> retrieverSettings = retrieverSettingsDTOAsRetrieverSettings(retrieverSettingsDTO, retrieverChainDefinition); - Map, Map, Collection>> filterSelection = filterSelectionDTOAsFilterSelection(filterSelectionDTO, retrieverChainDefinition); - Query> dimensionValuesQuery = dataMiningServer.createDimensionValuesQuery(retrieverChainDefinition, retrieverLevel, nonBoolNonEnumResultDimensions, retrieverSettings, filterSelection, locale); - result = (ExtensibleQueryResult>) dataMiningServer.runNewQueryAndAbortPreviousQueries(session, dimensionValuesQuery); + Map, SerializableSettings> retrieverSettings = retrieverSettingsDTOAsRetrieverSettings( + retrieverSettingsDTO, retrieverChainDefinition); + Map, Map, Collection>> filterSelection = filterSelectionDTOAsFilterSelection( + filterSelectionDTO, retrieverChainDefinition); + Query> dimensionValuesQuery = dataMiningServer.createDimensionValuesQuery( + retrieverChainDefinition, retrieverLevel, nonBoolNonEnumResultDimensions, retrieverSettings, + filterSelection, locale); + result = (ExtensibleQueryResult>) dataMiningServer + .runNewQueryAndAbortPreviousQueries(session, dimensionValuesQuery); } else { @SuppressWarnings("unchecked") final Class> clazz = (Class>) new HashSet().getClass(); - result = new QueryResultImpl>(QueryResultState.NORMAL, clazz, new HashMap>()); + result = new QueryResultImpl>(QueryResultState.NORMAL, clazz, + new HashMap>()); } for (final Entry, List> e : boolOrEnumResultDimensionsWithValues.entrySet()) { - result.addResult(new GenericGroupKey<>(dtoFactory.createFunctionDTO(e.getKey(), getDataMiningServer().getStringMessages(), locale)), new LinkedHashSet<>(e.getValue())); + result.addResult(new GenericGroupKey<>( + dtoFactory.createFunctionDTO(e.getKey(), getDataMiningServer().getStringMessages(), locale)), + new LinkedHashSet<>(e.getValue())); } return dtoFactory.createResultDTO(result); } @@ -262,7 +295,8 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM DataRetrieverChainDefinition retrieverChainDefinition) { Map, SerializableSettings> retrieverSettings = new HashMap<>(); for (DataRetrieverLevelDTO retrieverLevelDTO : retrieverSettingsDTO.keySet()) { - DataRetrieverLevel retrieverLevel = retrieverChainDefinition.getDataRetrieverLevel(retrieverLevelDTO.getLevel()); + DataRetrieverLevel retrieverLevel = retrieverChainDefinition + .getDataRetrieverLevel(retrieverLevelDTO.getLevel()); retrieverSettings.put(retrieverLevel, retrieverSettingsDTO.get(retrieverLevelDTO)); } return retrieverSettings; @@ -273,11 +307,13 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM DataRetrieverChainDefinition retrieverChainDefinition) { Map, Map, Collection>> filterSelection = new HashMap<>(); for (DataRetrieverLevelDTO retrieverLevelDTO : filterSelectionDTO.keySet()) { - HashMap> retrievalLevelSelection = filterSelectionDTO.get(retrieverLevelDTO); + HashMap> retrievalLevelSelection = filterSelectionDTO + .get(retrieverLevelDTO); for (FunctionDTO dimensionDTO : retrievalLevelSelection.keySet()) { if (!retrievalLevelSelection.get(dimensionDTO).isEmpty()) { Function function = getDataMiningServer().getFunctionForDTO(dimensionDTO); - DataRetrieverLevel retrieverLevel = retrieverChainDefinition.getDataRetrieverLevel(retrieverLevelDTO.getLevel()); + DataRetrieverLevel retrieverLevel = retrieverChainDefinition + .getDataRetrieverLevel(retrieverLevelDTO.getLevel()); if (function != null) { if (!filterSelection.containsKey(retrieverLevel)) { filterSelection.put(retrieverLevel, new HashMap, Collection>()); @@ -293,14 +329,16 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM @Override public QueryResultDTO runQuery(DataMiningSession session, StatisticQueryDefinitionDTO queryDefinitionDTO) { - SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, queryDefinitionDTO.getDataRetrieverChainDefinition().getName())); + SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, + queryDefinitionDTO.getDataRetrieverChainDefinition().getName())); DataMiningServer dataMiningServer = getDataMiningServer(); - StatisticQueryDefinition queryDefinition = dataMiningServer.getQueryDefinitionForDTO(queryDefinitionDTO); + StatisticQueryDefinition queryDefinition = dataMiningServer + .getQueryDefinitionForDTO(queryDefinitionDTO); Query query = dataMiningServer.createQuery(queryDefinition); QueryResult result = dataMiningServer.runNewQueryAndAbortPreviousQueries(session, query); return dtoFactory.createResultDTO(result); } - + @Override public HashSet getPredefinedQueryIdentifiers() { SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ)); @@ -310,20 +348,22 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM } return predefinedQueryNames; } - + @Override public QueryResultDTO runPredefinedQuery(DataMiningSession session, PredefinedQueryIdentifier identifier, String localeInfoName) { - SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, identifier.getIdentifier())); + SecurityUtils.getSubject().checkPermission( + Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, identifier.getIdentifier())); DataMiningServer dataMiningServer = getDataMiningServer(); - ModifiableStatisticQueryDefinitionDTO queryDefinitionDTO = dataMiningServer.getPredefinedQueryDefinitionDTO(identifier); + ModifiableStatisticQueryDefinitionDTO queryDefinitionDTO = dataMiningServer + .getPredefinedQueryDefinitionDTO(identifier); if (queryDefinitionDTO != null) { queryDefinitionDTO.setLocaleInfoName(localeInfoName); return runQuery(session, queryDefinitionDTO); } return null; } - + @Override public SerializationDummy pseudoMethodSoThatSomeClassesAreAddedToTheGWTSerializationPolicy() { return null; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index 089935dcb4b..4702ab22115 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -192,14 +192,12 @@ import com.sap.sailing.domain.base.impl.DynamicTeam; import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.SailingServerConfigurationImpl; import com.sap.sailing.domain.base.impl.TeamImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.CompetitorDescriptor; import com.sap.sailing.domain.common.CourseDesignerMode; import com.sap.sailing.domain.common.DataImportProgress; import com.sap.sailing.domain.common.DataImportSubProgress; import com.sap.sailing.domain.common.DetailType; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.LeaderboardType; import com.sap.sailing.domain.common.LegIdentifier; @@ -224,7 +222,6 @@ import com.sap.sailing.domain.common.RegattaScoreCorrections.ScoreCorrectionForC import com.sap.sailing.domain.common.RegattaScoreCorrections.ScoreCorrectionsForRace; import com.sap.sailing.domain.common.ScoreCorrectionProvider; import com.sap.sailing.domain.common.ScoringSchemeType; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; @@ -254,7 +251,6 @@ import com.sap.sailing.domain.common.dto.RaceLogTrackingInfoDTO; import com.sap.sailing.domain.common.dto.RegattaCreationParametersDTO; import com.sap.sailing.domain.common.dto.SeriesCreationParametersDTO; import com.sap.sailing.domain.common.dto.TrackedRaceDTO; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; @@ -516,9 +512,12 @@ import com.sap.sailing.xrr.structureimport.SeriesParameters; import com.sap.sailing.xrr.structureimport.StructureImporter; import com.sap.sailing.xrr.structureimport.buildstructure.SetRacenumberFromSeries; import com.sap.sse.ServerInfo; +import com.sap.sse.common.Bearing; import com.sap.sse.common.CountryCode; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.NoCorrespondingServiceRegisteredException; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TimeRange; import com.sap.sse.common.Timed; @@ -528,6 +527,7 @@ import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.WithID; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.impl.TimeRangeImpl; import com.sap.sse.common.mail.MailException; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java index 3f32d2c89a8..e75d75eb1b4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java @@ -14,15 +14,11 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.logging.Logger; import com.google.gwt.user.server.rpc.RemoteServiceServlet; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.PathType; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.dto.BoatClassDTO; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.NauticalMileDistance; @@ -79,9 +75,13 @@ import com.sap.sailing.simulator.windfield.WindControlParameters; import com.sap.sailing.simulator.windfield.WindFieldGenerator; import com.sap.sailing.simulator.windfield.WindFieldGeneratorFactory; import com.sap.sailing.simulator.windfield.impl.WindFieldGeneratorMeasured; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.util.ThreadPoolUtil; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceUtils.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceUtils.java index 5a8227eb146..e7fb1478513 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceUtils.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceUtils.java @@ -4,10 +4,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.RadianPosition; import com.sap.sailing.gwt.ui.shared.SimulatorUISelectionDTO; @@ -16,7 +14,9 @@ import com.sap.sailing.simulator.Path; import com.sap.sailing.simulator.SimulatorUISelection; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.impl.SimulatorUISelectionImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; public class SimulatorServiceUtils { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/GPSFixDTOWithSpeedWindTackAndLegType.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/GPSFixDTOWithSpeedWindTackAndLegType.java index eeba8ade28f..d7167eaf5ca 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/GPSFixDTOWithSpeedWindTackAndLegType.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/GPSFixDTOWithSpeedWindTackAndLegType.java @@ -6,7 +6,7 @@ import com.google.gwt.user.client.rpc.IsSerializable; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; public class GPSFixDTOWithSpeedWindTackAndLegType extends GPSFixDTO implements IsSerializable { public SpeedWithBearingDTO speedWithBearing; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java index 60dbcedc501..4b79c07ff37 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaDTO.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.UUID; import com.sap.sailing.domain.base.Regatta; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.RankingMetrics; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaIdentifier; @@ -18,6 +17,7 @@ import com.sap.sailing.domain.common.dto.NamedDTO; import com.sap.sailing.domain.common.dto.RaceColumnDTO; import com.sap.sailing.domain.common.dto.RaceDTO; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapSettings; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util.Pair; public class RegattaDTO extends NamedDTO { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java index c3c9272bb79..4bfec8d53b7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java @@ -3,7 +3,7 @@ package com.sap.sailing.gwt.ui.shared; import java.util.Date; import com.google.gwt.user.client.rpc.IsSerializable; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; public class RegattaOverviewEntryDTO implements IsSerializable { public String courseAreaIdAsString; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/AbstractMarkVectorGraphics.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/AbstractMarkVectorGraphics.java index 173ac31ed3a..71960b28805 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/AbstractMarkVectorGraphics.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/AbstractMarkVectorGraphics.java @@ -2,12 +2,12 @@ package com.sap.sailing.gwt.ui.shared.racemap; import com.google.gwt.canvas.dom.client.CanvasGradient; import com.google.gwt.canvas.dom.client.Context2d; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MarkType; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.gwt.ui.shared.CoursePositionsDTO; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Color; +import com.sap.sse.common.Distance; /** * A class for course mark graphics based on SVG graphics drawn to a HTML5 canvas diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatMarkVectorGraphics.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatMarkVectorGraphics.java index 4f8c27cbe18..8068496973a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatMarkVectorGraphics.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/BoatMarkVectorGraphics.java @@ -3,18 +3,18 @@ package com.sap.sailing.gwt.ui.shared.racemap; import java.util.Iterator; import com.google.gwt.canvas.dom.client.Context2d; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.MarkType; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.gwt.ui.shared.CoursePositionsDTO; import com.sap.sailing.gwt.ui.shared.MarkDTO; import com.sap.sailing.gwt.ui.shared.WaypointDTO; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Color; +import com.sap.sse.common.Distance; +import com.sap.sse.common.impl.DegreeBearingImpl; public class BoatMarkVectorGraphics extends AbstractMarkVectorGraphics { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/CanvasOverlayV3.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/CanvasOverlayV3.java index 8516195d134..ea48fb3eb9d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/CanvasOverlayV3.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/CanvasOverlayV3.java @@ -39,10 +39,10 @@ import com.google.gwt.maps.client.overlays.overlayhandlers.OverlayViewMethods; import com.google.gwt.maps.client.overlays.overlayhandlers.OverlayViewOnAddHandler; import com.google.gwt.maps.client.overlays.overlayhandlers.OverlayViewOnDrawHandler; import com.google.gwt.maps.client.overlays.overlayhandlers.OverlayViewOnRemoveHandler; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; +import com.sap.sse.common.Distance; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * The abstract base class for all canvas overlays. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/FixVectorGraphics.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/FixVectorGraphics.java index dd1857cd0c4..8d5e4f9c5d1 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/FixVectorGraphics.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/FixVectorGraphics.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.ui.shared.racemap; import com.google.gwt.canvas.dom.client.Context2d; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.FixType; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; /** * A class for course fix graphics based on SVG graphics drawn to a HTML5 canvas diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MarkVectorGraphics.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MarkVectorGraphics.java index cdf8ad1366d..294430fd9fc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MarkVectorGraphics.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MarkVectorGraphics.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.ui.shared.racemap; import com.google.gwt.canvas.dom.client.Context2d; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.gwt.ui.shared.CoursePositionsDTO; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; public interface MarkVectorGraphics { void drawMarkToCanvas(Context2d ctx, boolean isSelected, double width, double height, double scaleFactor); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java index 9a33017ffbc..e523c3e0c0e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java @@ -12,14 +12,14 @@ import com.google.gwt.maps.client.MapWidget; import com.google.gwt.maps.client.base.LatLng; import com.google.gwt.maps.client.base.Point; import com.google.gwt.maps.client.geometrylib.SphericalUtils; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.Mile; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldGenParamsDTO; +import com.sap.sse.common.AbstractBearing; import com.sap.sse.common.Named; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.gwt.client.player.Timer; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathLegendCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathLegendCanvasOverlay.java index cd463c596c5..f7ceee0724d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathLegendCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathLegendCanvasOverlay.java @@ -9,12 +9,12 @@ import com.google.gwt.canvas.dom.client.TextMetrics; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.i18n.client.TimeZone; import com.google.gwt.maps.client.MapWidget; -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; import com.sap.sailing.simulator.util.SailingSimulatorConstants; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Class to draw the legend for the different paths on the map. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathPolyline.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathPolyline.java index b72b8114c26..8296751968d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathPolyline.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathPolyline.java @@ -18,7 +18,6 @@ import com.google.gwt.maps.client.overlays.PolylineOptions; import com.google.gwt.maps.client.overlays.overlayhandlers.OverlayViewMethods; import com.google.gwt.maps.client.overlays.overlayhandlers.OverlayViewOnDrawHandler; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.RadianPosition; @@ -32,6 +31,7 @@ import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.simulator.racemap.TwoDPoint; import com.sap.sailing.gwt.ui.simulator.racemap.TwoDSegment; import com.sap.sailing.gwt.ui.simulator.racemap.TwoDVector; +import com.sap.sse.common.Bearing; import com.sap.sse.gwt.client.ErrorReporter; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindFieldCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindFieldCanvasOverlay.java index abfeab33061..cbb04639235 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindFieldCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindFieldCanvasOverlay.java @@ -14,14 +14,14 @@ import java.util.logging.Logger; import com.google.gwt.canvas.dom.client.Context2d; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.maps.client.MapWidget; -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldDTO; import com.sap.sailing.gwt.ui.shared.WindFieldGenParamsDTO; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; import com.sap.sailing.gwt.ui.simulator.util.ToolTip; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.gwt.client.player.Timer; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineGuidesCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineGuidesCanvasOverlay.java index cc7f0a0892b..63e3ec42005 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineGuidesCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineGuidesCanvasOverlay.java @@ -15,14 +15,14 @@ import com.google.gwt.canvas.dom.client.Context2d; import com.google.gwt.maps.client.MapWidget; import com.google.gwt.maps.client.base.LatLng; import com.google.gwt.maps.client.base.Point; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldDTO; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; import com.sap.sailing.gwt.ui.simulator.util.ToolTip; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.gwt.client.player.Timer; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/PositionDTOWeigher.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/PositionDTOWeigher.java index 2d40d280ed3..1bbca5f5673 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/PositionDTOWeigher.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/PositionDTOWeigher.java @@ -2,10 +2,10 @@ package com.sap.sailing.gwt.ui.simulator.streamlets; import java.util.Date; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.impl.DegreePosition; +import com.sap.sse.common.Distance; /** * A weigher that uses a {@link DegreePosition} and a {@link Date} to compute a confidence based on space and time diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/WindInfoForRaceVectorField.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/WindInfoForRaceVectorField.java index 370ce89116c..84266276d22 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/WindInfoForRaceVectorField.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/WindInfoForRaceVectorField.java @@ -14,7 +14,6 @@ import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.confidence.BearingWithConfidenceCluster; import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; import com.sap.sailing.gwt.ui.shared.WindDTO; @@ -22,6 +21,7 @@ import com.sap.sailing.gwt.ui.shared.WindInfoForRaceDTO; import com.sap.sailing.gwt.ui.shared.WindTrackInfoDTO; import com.sap.sailing.gwt.ui.simulator.streamlets.PositionDTOWeigher.AverageLatitudeProvider; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * Implements the {@link VectorField} interface by providing real wind data from a TrackedRace which has diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/ConvertWindData.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/ConvertWindData.java index dbf2cee96a0..6329ac72326 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/ConvertWindData.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/ConvertWindData.java @@ -5,9 +5,9 @@ import java.net.UnknownHostException; import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.MongoException; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.persistence.impl.FieldNames; import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.mongodb.MongoDBService; /** diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java index 79526c53c09..7705060c7aa 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java @@ -20,13 +20,11 @@ import com.sap.sailing.domain.base.impl.ControlPointWithTwoMarksImpl; import com.sap.sailing.domain.base.impl.CourseDataImpl; import com.sap.sailing.domain.base.impl.MarkImpl; import com.sap.sailing.domain.base.impl.WaypointImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.MarkType; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -37,9 +35,11 @@ import com.sap.sailing.domain.persistence.MongoRegattaLogStoreFactory; import com.sap.sailing.domain.persistence.PersistenceFactory; import com.sap.sailing.domain.racelog.RaceLogStore; import com.sap.sailing.domain.regattalog.RegattaLogStore; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.AbstractColor; +import com.sap.sse.common.impl.DegreeBearingImpl; import junit.framework.Assert; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java index 380b718f8be..d7c236fe87f 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java @@ -20,7 +20,6 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; @@ -43,6 +42,7 @@ import com.sap.sse.common.NoCorrespondingServiceRegisteredException; import com.sap.sse.common.TimePoint; import com.sap.sse.common.TypeBasedServiceFinderFactory; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class StoreGPSFixTrackTest extends AbstractMongoDBTest { diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java index 79f61d14e68..acd295befbe 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java @@ -13,7 +13,6 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.MongoException; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -21,6 +20,7 @@ import com.sap.sailing.domain.persistence.PersistenceFactory; import com.sap.sailing.domain.persistence.impl.DomainObjectFactoryImpl; import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class TestStoringAndRetrievingWindData extends AbstractMongoDBTest { diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java index 9026ed84863..7ced297a4fd 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java @@ -26,7 +26,6 @@ import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -50,6 +49,7 @@ import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sailing.server.impl.RacingEventServiceImpl; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.mongodb.MongoDBConfiguration; diff --git a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/NmeaUtil.java b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/NmeaUtil.java index ad9f06f4741..3b641440f67 100755 --- a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/NmeaUtil.java +++ b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/NmeaUtil.java @@ -1,9 +1,9 @@ package com.sap.sailing.nmeaconnector; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import net.sf.marineapi.nmea.parser.SentenceFactory; diff --git a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/TimedBearing.java b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/TimedBearing.java index b6df8f16443..a015e1bcb17 100755 --- a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/TimedBearing.java +++ b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/TimedBearing.java @@ -1,6 +1,6 @@ package com.sap.sailing.nmeaconnector; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Timed; public interface TimedBearing extends Timed, Bearing { diff --git a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/DegreeBearingWithTimepoint.java b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/DegreeBearingWithTimepoint.java index e1d4e762b98..552662b25fe 100755 --- a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/DegreeBearingWithTimepoint.java +++ b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/DegreeBearingWithTimepoint.java @@ -1,8 +1,8 @@ package com.sap.sailing.nmeaconnector.impl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.nmeaconnector.TimedBearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; public class DegreeBearingWithTimepoint extends DegreeBearingImpl implements TimedBearing { private static final long serialVersionUID = 8704478920647067862L; diff --git a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/KnotSpeedWithBearingAndTimepoint.java b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/KnotSpeedWithBearingAndTimepoint.java index eded0d58caf..c5504b3bf6c 100755 --- a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/KnotSpeedWithBearingAndTimepoint.java +++ b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/KnotSpeedWithBearingAndTimepoint.java @@ -1,9 +1,9 @@ package com.sap.sailing.nmeaconnector.impl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.tracking.Track; import com.sap.sailing.nmeaconnector.TimedSpeedWithBearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/NMEAWindReceiverImpl.java b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/NMEAWindReceiverImpl.java index c2f2b74fe30..54310639cf5 100755 --- a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/NMEAWindReceiverImpl.java +++ b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/NMEAWindReceiverImpl.java @@ -12,12 +12,9 @@ import java.util.logging.Logger; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.DeclinationService; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; @@ -35,7 +32,10 @@ import com.sap.sailing.domain.tracking.impl.DynamicTrackImpl; import com.sap.sailing.nmeaconnector.NMEAWindReceiver; import com.sap.sailing.nmeaconnector.TimedBearing; import com.sap.sailing.nmeaconnector.TimedSpeedWithBearing; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import net.sf.marineapi.nmea.event.AbstractSentenceListener; diff --git a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/NmeaUtilImpl.java b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/NmeaUtilImpl.java index faaa7036dbb..c2ba93df087 100755 --- a/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/NmeaUtilImpl.java +++ b/java/com.sap.sailing.nmeaconnector/src/com/sap/sailing/nmeaconnector/impl/NmeaUtilImpl.java @@ -5,18 +5,18 @@ import java.util.Map; import java.util.Map.Entry; import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedWithBearingImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.nmeaconnector.NmeaUtil; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import net.sf.marineapi.nmea.parser.SentenceFactory; import net.sf.marineapi.nmea.parser.SentenceParser; diff --git a/java/com.sap.sailing.polars.datamining.shared/src/com/sap/sailing/polars/datamining/shared/PolarStatistic.java b/java/com.sap.sailing.polars.datamining.shared/src/com/sap/sailing/polars/datamining/shared/PolarStatistic.java index b42d4894227..d674270f7e5 100644 --- a/java/com.sap.sailing.polars.datamining.shared/src/com/sap/sailing/polars/datamining/shared/PolarStatistic.java +++ b/java/com.sap.sailing.polars.datamining.shared/src/com/sap/sailing/polars/datamining/shared/PolarStatistic.java @@ -1,7 +1,7 @@ package com.sap.sailing.polars.datamining.shared; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; +import com.sap.sse.common.Speed; public interface PolarStatistic { diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/components/PolarGPSFixRetrievalProcessor.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/components/PolarGPSFixRetrievalProcessor.java index 04ffaf345aa..7ff4a486859 100644 --- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/components/PolarGPSFixRetrievalProcessor.java +++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/components/PolarGPSFixRetrievalProcessor.java @@ -8,7 +8,6 @@ import java.util.concurrent.ExecutorService; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.WindSpeedSteppingWithMaxDistance; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; @@ -21,6 +20,7 @@ import com.sap.sailing.polars.datamining.data.impl.GPSFixWithPolarContext; import com.sap.sailing.polars.datamining.data.impl.PolarStatisticImpl; import com.sap.sailing.polars.datamining.data.impl.SpeedClusterGroup; import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; import com.sap.sse.datamining.components.Processor; diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/components/aggregators/PolarBackendDataAggregationProcessor.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/components/aggregators/PolarBackendDataAggregationProcessor.java index 67886637055..10a9e8eceef 100644 --- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/components/aggregators/PolarBackendDataAggregationProcessor.java +++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/components/aggregators/PolarBackendDataAggregationProcessor.java @@ -10,13 +10,13 @@ import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.common.LegType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarDataService; import com.sap.sailing.polars.datamining.data.HasBackendPolarBoatClassContext; import com.sap.sailing.polars.datamining.shared.PolarBackendData; import com.sap.sailing.polars.datamining.shared.PolarBackendDataImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/GPSFixWithPolarContext.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/GPSFixWithPolarContext.java index 581283f1ed8..fd2d2a6f51c 100644 --- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/GPSFixWithPolarContext.java +++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/GPSFixWithPolarContext.java @@ -2,7 +2,6 @@ package com.sap.sailing.polars.datamining.data.impl; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.BravoFixTrack; import com.sap.sailing.domain.tracking.TrackedRace; @@ -11,6 +10,7 @@ import com.sap.sailing.polars.datamining.data.HasCompetitorPolarContext; import com.sap.sailing.polars.datamining.data.HasGPSFixPolarContext; import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; import com.sap.sailing.polars.datamining.shared.PolarStatistic; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; import com.sap.sse.datamining.data.Cluster; diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/PolarStatisticImpl.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/PolarStatisticImpl.java index fe702bde421..3fb74c4767b 100644 --- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/PolarStatisticImpl.java +++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/PolarStatisticImpl.java @@ -4,9 +4,7 @@ import java.util.HashSet; import java.util.Set; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; @@ -16,6 +14,8 @@ import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; import com.sap.sailing.polars.datamining.shared.PolarStatistic; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; public class PolarStatisticImpl implements PolarStatistic { diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/SpeedClusterGroup.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/SpeedClusterGroup.java index ae0ea02cb34..8b1fa2c6d64 100644 --- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/SpeedClusterGroup.java +++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/data/impl/SpeedClusterGroup.java @@ -3,9 +3,9 @@ package com.sap.sailing.polars.datamining.data.impl; import java.util.ArrayList; import java.util.Collection; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.WindSpeedSteppingWithMaxDistance; +import com.sap.sse.common.Speed; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterBoundary; import com.sap.sse.datamining.data.ClusterGroup; diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/BearingClusterGroupTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/BearingClusterGroupTest.java index c92afdcc90d..248bdb26d2f 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/BearingClusterGroupTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/BearingClusterGroupTest.java @@ -6,9 +6,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.polars.mining.BearingClusterGroup; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.datamining.data.Cluster; public class BearingClusterGroupTest { diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/SpeedClusterGroupTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/SpeedClusterGroupTest.java index d839f06d0cb..bf617af91a0 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/SpeedClusterGroupTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/clusters/test/SpeedClusterGroupTest.java @@ -7,9 +7,9 @@ import static org.junit.Assert.assertThat; import org.junit.Test; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.polars.datamining.data.impl.SpeedClusterGroup; +import com.sap.sse.common.Speed; import com.sap.sse.datamining.data.Cluster; public class SpeedClusterGroupTest { diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java index cf39e57c376..3085d005a3f 100644 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java @@ -29,13 +29,11 @@ import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.PolarSheetGenerationSettings; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -55,8 +53,10 @@ import com.sap.sailing.polars.mining.BearingClusterGroup; import com.sap.sailing.polars.mining.CubicRegressionPerCourseProcessor; import com.sap.sailing.polars.mining.PolarDataMiner; import com.sap.sailing.polars.mining.SpeedRegressionPerAngleClusterProcessor; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.datamining.data.ClusterGroup; diff --git a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/windestimation/TestWindEstimationFromManeuversOnAFew505Races.java b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/windestimation/TestWindEstimationFromManeuversOnAFew505Races.java index 9f42c59c552..fc124a86074 100755 --- a/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/windestimation/TestWindEstimationFromManeuversOnAFew505Races.java +++ b/java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/windestimation/TestWindEstimationFromManeuversOnAFew505Races.java @@ -19,12 +19,10 @@ import java.util.stream.Stream; import org.junit.Test; import com.sap.sailing.domain.base.CompetitorAndBoat; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.impl.ScalableDouble; import com.sap.sailing.domain.common.confidence.impl.ScalableWind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.test.OnlineTracTracBasedTest; @@ -32,7 +30,9 @@ import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sailing.polars.impl.PolarDataServiceImpl; import com.sap.sailing.polars.windestimation.ManeuverBasedWindEstimationTrackImpl.ManeuverClassification; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.util.kmeans.Cluster; import com.sap.sse.util.kmeans.KMeansMappingClusterer; import com.tractrac.model.lib.api.event.CreateModelException; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java index a545636e237..56b91be5abc 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java @@ -22,15 +22,12 @@ import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithBearingWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.PolarSheetGenerationSettings; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.PolarSheetGenerationSettingsImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -46,7 +43,10 @@ import com.sap.sailing.polars.mining.CubicRegressionPerCourseProcessor; import com.sap.sailing.polars.mining.PolarDataMiner; import com.sap.sailing.polars.mining.SpeedRegressionPerAngleClusterProcessor; import com.sap.sailing.polars.regression.impl.IncrementalAnyOrderLeastSquaresImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.datamining.data.ClusterGroup; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.replication.OperationExecutionListener; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleAndSpeedRegression.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleAndSpeedRegression.java index 2d3fa5db46f..4aec93bf628 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleAndSpeedRegression.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleAndSpeedRegression.java @@ -8,22 +8,22 @@ import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithBearingWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.polars.impl.CubicEquation; import com.sap.sailing.polars.regression.IncrementalLeastSquares; import com.sap.sailing.polars.regression.impl.IncrementalAnyOrderLeastSquaresImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * This container has two regressions. One for boatSpeed over windSpeed and one for TWA (true wind angle) over windSpeed diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleClusterPolarClusterKey.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleClusterPolarClusterKey.java index 22157d7b534..f3c7cc60625 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleClusterPolarClusterKey.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AngleClusterPolarClusterKey.java @@ -1,6 +1,6 @@ package com.sap.sailing.polars.mining; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; import com.sap.sse.datamining.annotations.Dimension; import com.sap.sse.datamining.data.Cluster; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java index b5c7c5eb10f..b696feb8c30 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingClusterGroup.java @@ -5,8 +5,8 @@ import java.util.Collection; import java.util.Comparator; import java.util.List; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterBoundary; import com.sap.sse.datamining.impl.data.ClusterWithLowerAndUpperBoundaries; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingComparator.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingComparator.java index 697d35781d6..f044f3d9e42 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingComparator.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/BearingComparator.java @@ -3,7 +3,7 @@ package com.sap.sailing.polars.mining; import java.io.Serializable; import java.util.Comparator; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; public class BearingComparator implements Comparator, Serializable { diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java index c0f5f0d0a0e..7bb4c51138b 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java @@ -14,10 +14,10 @@ import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.common.LegType; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarsChangedListener; +import com.sap.sse.common.Speed; import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.factories.GroupKeyFactory; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/GPSFixMovingWithPolarContext.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/GPSFixMovingWithPolarContext.java index 7820a9ed828..4ca0149c612 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/GPSFixMovingWithPolarContext.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/GPSFixMovingWithPolarContext.java @@ -6,7 +6,6 @@ import java.util.Set; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; @@ -15,15 +14,16 @@ import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.confidence.ConfidenceFactory; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindWithConfidence; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterGroup; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataDimensionCollectionFactory.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataDimensionCollectionFactory.java index df4c547c4c8..1a8813094f3 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataDimensionCollectionFactory.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataDimensionCollectionFactory.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.Collection; import com.sap.sailing.domain.base.BoatClass; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; +import com.sap.sse.common.Bearing; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.factories.FunctionFactory; import com.sap.sse.datamining.functions.Function; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java index 0638666b94b..81f77630d00 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java @@ -28,15 +28,12 @@ import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithBearingWithConfidenceImpl; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.PolarSheetGenerationSettings; import com.sap.sailing.domain.common.PolarSheetsData; import com.sap.sailing.domain.common.PolarSheetsHistogramData; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.PolarSheetsDataImpl; @@ -47,6 +44,9 @@ import com.sap.sailing.domain.polars.PolarsChangedListener; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.polars.impl.CubicEquation; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.data.ClusterGroup; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/RoundedTrueWindAngle.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/RoundedTrueWindAngle.java index 7e944425b58..50a1bfcd351 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/RoundedTrueWindAngle.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/RoundedTrueWindAngle.java @@ -1,6 +1,6 @@ package com.sap.sailing.polars.mining; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; /** * Rounds a {@link Bearing} and provides {@link #hashCode()} and {@link #equals(Object)} methods. diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java index 8c138dc7f88..ace5ec22a6e 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java @@ -13,14 +13,14 @@ import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarsChangedListener; import com.sap.sailing.polars.regression.IncrementalLeastSquares; import com.sap.sailing.polars.regression.impl.IncrementalAnyOrderLeastSquaresImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.data.Cluster; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/windestimation/ManeuverBasedWindEstimationTrackImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/windestimation/ManeuverBasedWindEstimationTrackImpl.java index 59678e3227c..d65ca72cdaf 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/windestimation/ManeuverBasedWindEstimationTrackImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/windestimation/ManeuverBasedWindEstimationTrackImpl.java @@ -20,20 +20,16 @@ import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.CompetitorAndBoatImpl; import com.sap.sailing.domain.base.impl.SpeedWithBearingWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.DoublePair; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.ConfidenceBasedAverager; import com.sap.sailing.domain.common.confidence.ConfidenceFactory; import com.sap.sailing.domain.common.confidence.HasConfidence; import com.sap.sailing.domain.common.confidence.impl.ScalableDouble; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; @@ -43,10 +39,14 @@ import com.sap.sailing.domain.polars.PolarDataService; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.impl.WindTrackImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.util.kmeans.Cluster; import com.sap.sse.util.kmeans.KMeansMappingClusterer; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/windestimation/ScalableBearingAndScalableDouble.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/windestimation/ScalableBearingAndScalableDouble.java index 50ce72a6725..a487847a0b4 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/windestimation/ScalableBearingAndScalableDouble.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/windestimation/ScalableBearingAndScalableDouble.java @@ -1,8 +1,8 @@ package com.sap.sailing.polars.windestimation; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.confidence.impl.ScalableDouble; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.scalablevalue.ScalableValue; import com.sap.sse.common.scalablevalue.ScalableValueWithDistance; diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/StatisticsJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/StatisticsJsonDeserializer.java index 6e9e34f0f23..673843751de 100644 --- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/StatisticsJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/StatisticsJsonDeserializer.java @@ -4,8 +4,6 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.SharedDomainFactory; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.statistics.Statistics; @@ -13,6 +11,8 @@ import com.sap.sailing.domain.statistics.impl.StatisticsImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.serialization.impl.StatisticsJsonSerializer; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/TargetTimeInfoDeserializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/TargetTimeInfoDeserializer.java index 42f6ff0610a..42a6bbedc16 100755 --- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/TargetTimeInfoDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/TargetTimeInfoDeserializer.java @@ -6,20 +6,20 @@ import java.util.List; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.TargetTimeInfo; import com.sap.sailing.domain.common.TargetTimeInfo.LegTargetTimeInfo; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.TargetTimeInfoImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.serialization.impl.TargetTimeInfoSerializer; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/WindJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/WindJsonDeserializer.java index 38c293d7310..05f5573fb85 100644 --- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/WindJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/WindJsonDeserializer.java @@ -2,16 +2,16 @@ package com.sap.sailing.server.gateway.deserialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.serialization.impl.WindJsonSerializer; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WindJsonDeserializer implements JsonDeserializer { diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/StatisticsJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/StatisticsJsonSerializer.java index 2ceb58cf8b5..582a3f93127 100644 --- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/StatisticsJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/StatisticsJsonSerializer.java @@ -3,9 +3,9 @@ package com.sap.sailing.server.gateway.serialization.impl; import org.json.simple.JSONObject; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.statistics.Statistics; import com.sap.sailing.server.gateway.serialization.JsonSerializer; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java index 6b2e7f8abc4..ab9600a491f 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java @@ -13,11 +13,9 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogWindFixEventImpl; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.SharedDomainFactory; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -33,8 +31,10 @@ import com.sap.sailing.server.gateway.serialization.impl.PositionJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.TeamJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.WindJsonSerializer; import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogWindFixEventSerializer; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class RaceLogWindFixEventSerializerTest { diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/GPSFixMovingJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/GPSFixMovingJsonDeserializer.java index 5cee7657673..5ba1178fc68 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/GPSFixMovingJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/GPSFixMovingJsonDeserializer.java @@ -2,15 +2,15 @@ package com.sap.sailing.server.gateway.deserialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.TypeBasedJsonDeserializer; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; public class GPSFixMovingJsonDeserializer extends TypeBasedJsonDeserializer { public static final String TYPE = "GPSFixMoving"; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/SpeedWithConfidenceWithIntegerRelationJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/SpeedWithConfidenceWithIntegerRelationJsonDeserializer.java index cf9cf344254..9a0037ef90d 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/SpeedWithConfidenceWithIntegerRelationJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/SpeedWithConfidenceWithIntegerRelationJsonDeserializer.java @@ -4,11 +4,11 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.serialization.impl.SpeedWithConfidenceWithIntegerRelationJsonSerializer; +import com.sap.sse.common.Speed; public class SpeedWithConfidenceWithIntegerRelationJsonDeserializer implements JsonDeserializer> { diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DistanceJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DistanceJsonSerializer.java index 057670efba5..3f2f62d5b13 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DistanceJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/DistanceJsonSerializer.java @@ -2,8 +2,8 @@ package com.sap.sailing.server.gateway.serialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.server.gateway.serialization.JsonSerializer; +import com.sap.sse.common.Distance; public class DistanceJsonSerializer implements JsonSerializer { diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarkPositionsJsonExportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarkPositionsJsonExportServlet.java index 04912c301cf..6406f90d217 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarkPositionsJsonExportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarkPositionsJsonExportServlet.java @@ -12,7 +12,6 @@ import org.json.simple.JSONArray; import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceColumn; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.racelog.RaceLogServletConstants; import com.sap.sailing.domain.leaderboard.Leaderboard; @@ -22,6 +21,7 @@ import com.sap.sailing.server.gateway.AbstractJsonHttpServlet; import com.sap.sailing.server.gateway.serialization.coursedata.impl.MarkJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.PositionJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.PositionedMarkJsonSerializer; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/BearingJsonSerializer.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/BearingJsonSerializer.java index 3e25fb2f08f..40266b83438 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/BearingJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/BearingJsonSerializer.java @@ -2,8 +2,8 @@ package com.sap.sailing.server.gateway.jaxrs.api; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.server.gateway.serialization.JsonSerializer; +import com.sap.sse.common.Bearing; public class BearingJsonSerializer implements JsonSerializer { @Override diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/DataMiningResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/DataMiningResource.java index b8647b47050..ead2bc6a9c4 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/DataMiningResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/DataMiningResource.java @@ -21,10 +21,10 @@ import org.osgi.util.tracker.ServiceTracker; import com.sap.sailing.datamining.SailingPredefinedQueries; import com.sap.sailing.datamining.data.HasTrackedRaceContext; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; import com.sap.sailing.server.gateway.jaxrs.RestServletContainer; import com.sap.sailing.server.gateway.serialization.NotJsonSerializableException; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.DataMiningServer; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.StatisticQueryDefinition; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java index 50980f2f49a..27059f5cca5 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java @@ -67,10 +67,8 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.CompetitorWithBoatImpl; import com.sap.sailing.domain.base.impl.CourseImpl; import com.sap.sailing.domain.base.impl.DynamicBoat; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.CourseDesignerMode; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.PassingInstruction; @@ -82,7 +80,6 @@ import com.sap.sailing.domain.common.dto.LeaderboardDTO; import com.sap.sailing.domain.common.dto.LeaderboardEntryDTO; import com.sap.sailing.domain.common.dto.LeaderboardRowDTO; import com.sap.sailing.domain.common.dto.RaceColumnDTO; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.RaceColumnConstants; import com.sap.sailing.domain.common.racelog.RaceLogServletConstants; @@ -119,12 +116,15 @@ import com.sap.sailing.server.gateway.serialization.impl.CompetitorWithBoatJsonS import com.sap.sailing.server.gateway.serialization.impl.FlatGPSFixJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.MarkJsonSerializerWithPosition; import com.sap.sse.InvalidDateException; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.Named; import com.sap.sse.common.NamedWithID; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; @Path("/v1/leaderboards") diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java index e3273ce98c7..cf4ea289102 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResourceV2.java @@ -27,7 +27,6 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.common.DetailType; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindException; @@ -39,6 +38,7 @@ import com.sap.sailing.domain.common.dto.LeaderboardRowDTO; import com.sap.sailing.domain.common.dto.LegEntryDTO; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sse.InvalidDateException; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java index b60212a857b..2d188d6ee57 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java @@ -23,13 +23,10 @@ import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.impl.ScalableDouble; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; @@ -41,7 +38,10 @@ import com.sap.sailing.polars.windestimation.ScalableBearingAndScalableDouble; import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; import com.sap.sailing.server.gateway.serialization.impl.PositionJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.WindJsonSerializer; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.util.kmeans.Cluster; /** diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java index 4cd59cf7dbf..891a97967b5 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java @@ -46,10 +46,8 @@ import com.sap.sailing.domain.base.impl.BoatImpl; import com.sap.sailing.domain.base.impl.DynamicBoat; import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.TeamImpl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.RegattaName; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; @@ -103,7 +101,9 @@ import com.sap.sailing.server.gateway.serialization.impl.TrackedRaceJsonSerializ import com.sap.sailing.server.gateway.serialization.impl.WindJsonSerializer; import com.sap.sailing.server.operationaltransformation.AddColumnToSeries; import com.sap.sse.InvalidDateException; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsDurationImpl; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/bravo/BravoWindImporter.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/bravo/BravoWindImporter.java index d1bb5d02cf8..b0b4b15b5c7 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/bravo/BravoWindImporter.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/bravo/BravoWindImporter.java @@ -16,7 +16,6 @@ import java.util.zip.ZipInputStream; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -28,6 +27,7 @@ import com.sap.sailing.domain.trackimport.FormatNotSupportedException; import com.sap.sailing.server.gateway.windimport.AbstractWindImporter; import com.sap.sailing.server.trackfiles.impl.BaseBravoDataImporterImpl; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class BravoWindImporter extends AbstractWindImporter { diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/expedition/WindLogParser.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/expedition/WindLogParser.java index 306261c701e..cbe0156a150 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/expedition/WindLogParser.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/expedition/WindLogParser.java @@ -9,16 +9,16 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.server.trackfiles.impl.ExpeditionExtendedDataImporterImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; public class WindLogParser { /** diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/BoatReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/BoatReplicationTest.java index 9d3d23884f7..4d9f5b8d21a 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/BoatReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/BoatReplicationTest.java @@ -34,7 +34,6 @@ import com.sap.sailing.domain.base.impl.TeamImpl; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaName; import com.sap.sailing.domain.common.ScoringSchemeType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; @@ -48,6 +47,7 @@ import com.sap.sailing.server.operationaltransformation.CreateTrackedRace; import com.sap.sailing.server.operationaltransformation.UpdateBoat; import com.sap.sse.common.Color; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java index 5d6b168e9ff..971e32fb63b 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java @@ -35,7 +35,6 @@ import com.sap.sailing.domain.base.impl.TeamImpl; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaName; import com.sap.sailing.domain.common.ScoringSchemeType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; @@ -49,6 +48,7 @@ import com.sap.sailing.server.operationaltransformation.CreateTrackedRace; import com.sap.sailing.server.operationaltransformation.UpdateCompetitor; import com.sap.sse.common.Color; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java index d80cbf182fd..6344896625f 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java @@ -46,7 +46,6 @@ import com.sap.sailing.domain.common.RegattaNameAndRaceName; import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -74,6 +73,7 @@ import com.sap.sailing.server.operationaltransformation.CreateFlexibleLeaderboar import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.media.MimeType; diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java index 8edf2353aff..de36fed6355 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java @@ -35,7 +35,6 @@ import com.sap.sailing.domain.common.RegattaNameAndRaceName; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -62,6 +61,7 @@ import com.sap.sailing.server.operationaltransformation.UpdateStartOfTracking; import com.sap.sse.common.Color; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class TrackedRaceContentsReplicationTest extends AbstractServerReplicationTest { diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java index 0c70fdfa6c0..25511608992 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java @@ -31,7 +31,6 @@ import com.sap.sailing.domain.base.impl.TeamImpl; import com.sap.sailing.domain.base.impl.WaypointImpl; import com.sap.sailing.domain.common.RegattaName; import com.sap.sailing.domain.common.RegattaNameAndRaceName; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -53,6 +52,7 @@ import com.sap.sailing.server.operationaltransformation.UpdateStartOfTracking; import com.sap.sse.common.Color; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.replication.ReplicationMasterDescriptor; import com.sap.sse.replication.testsupport.AbstractServerReplicationTestSetUp.ReplicationServiceTestImpl; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/statistics/StatisticsTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/statistics/StatisticsTest.java index 7dcc02f55b1..33dad23d16b 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/statistics/StatisticsTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/statistics/StatisticsTest.java @@ -33,7 +33,6 @@ import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.base.impl.WaypointImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; @@ -48,6 +47,7 @@ import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class StatisticsTest { diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java index 6776e0477ef..17ea0cf1cb6 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java @@ -95,7 +95,6 @@ import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.impl.DataImportProgressImpl; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -138,6 +137,7 @@ import com.sap.sse.common.Color; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.media.MimeType; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceColumnReloadTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceColumnReloadTest.java index 0977b4fe398..0272cd5a0c7 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceColumnReloadTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceColumnReloadTest.java @@ -41,7 +41,6 @@ import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -64,6 +63,7 @@ import com.sap.sailing.server.operationaltransformation.TrackRegatta; import com.sap.sse.common.Color; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.mongodb.MongoDBService; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java index e054974e774..9c9082548cd 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java @@ -40,7 +40,6 @@ import com.sap.sailing.domain.common.RegattaNameAndRaceName; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -63,6 +62,7 @@ import com.sap.sailing.server.operationaltransformation.TrackRegatta; import com.sap.sse.common.Color; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WindByRaceLogTest { diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoExtendedDataImportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoExtendedDataImportTest.java index c000be82511..9853664a911 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoExtendedDataImportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoExtendedDataImportTest.java @@ -12,7 +12,6 @@ import java.util.Map; import org.junit.Test; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.sensordata.BravoExtendedSensorDataMetadata; import com.sap.sailing.domain.common.tracking.BravoExtendedFix; import com.sap.sailing.domain.common.tracking.BravoFix; @@ -22,6 +21,7 @@ import com.sap.sailing.domain.trackimport.FormatNotSupportedException; import com.sap.sailing.domain.tracking.DynamicBravoFixTrack; import com.sap.sailing.domain.tracking.impl.BravoFixTrackImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class BravoExtendedDataImportTest extends AbstractBravoDataImportTest { diff --git a/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/RouteConverterGPSFixImporterImpl.java b/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/RouteConverterGPSFixImporterImpl.java index eaa78927d3d..d568e93d0ad 100644 --- a/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/RouteConverterGPSFixImporterImpl.java +++ b/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/RouteConverterGPSFixImporterImpl.java @@ -85,13 +85,13 @@ import slash.navigation.zip.ZipFormat; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 2943c3a8d5a..2262b8692f3 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -104,7 +104,6 @@ import com.sap.sailing.domain.base.impl.RemoteSailingServerReferenceImpl; import com.sap.sailing.domain.common.DataImportProgress; import com.sap.sailing.domain.common.DataImportSubProgress; import com.sap.sailing.domain.common.DeviceIdentifier; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MasterDataImportObjectCreationCount; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.Position; @@ -251,6 +250,7 @@ import com.sap.sailing.server.statistics.StatisticsCalculator; import com.sap.sailing.server.statistics.TrackedRaceStatisticsCache; import com.sap.sailing.server.util.EventUtil; import com.sap.sse.ServerInfo; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.Renamable; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java index ed4b5d27dd0..f95c15250c7 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java @@ -21,12 +21,9 @@ import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.CourseImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; @@ -61,8 +58,11 @@ import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.IsManagedByCache; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/StatisticsAggregator.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/StatisticsAggregator.java index 15810ce4979..05ed2f8e03f 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/StatisticsAggregator.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/StatisticsAggregator.java @@ -1,10 +1,10 @@ package com.sap.sailing.server.statistics; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.statistics.Statistics; import com.sap.sailing.domain.statistics.impl.StatisticsImpl; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/StatisticsCalculator.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/StatisticsCalculator.java index 0d3cd547cb6..763327aab17 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/StatisticsCalculator.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/StatisticsCalculator.java @@ -6,13 +6,13 @@ import java.util.Set; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.statistics.Statistics; import com.sap.sailing.domain.statistics.impl.StatisticsImpl; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedRace; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/TrackedRaceStatistics.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/TrackedRaceStatistics.java index 855bf2255f5..b728996a65b 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/TrackedRaceStatistics.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/TrackedRaceStatistics.java @@ -1,8 +1,8 @@ package com.sap.sailing.server.statistics; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/TrackedRaceStatisticsCalculator.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/TrackedRaceStatisticsCalculator.java index 39961315ab5..6fe3e84eb25 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/TrackedRaceStatisticsCalculator.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/statistics/TrackedRaceStatisticsCalculator.java @@ -5,8 +5,6 @@ import java.util.NavigableSet; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -15,6 +13,8 @@ import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindTrack; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java index 5f87f146f50..a74381d5b4c 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PolarDiagramCSVTest.java @@ -9,11 +9,7 @@ import junit.framework.Assert; import org.junit.Test; -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.impl.PolarDiagram49; @@ -22,6 +18,10 @@ import com.sap.sailing.simulator.impl.PolarDiagram49ORC; import com.sap.sailing.simulator.impl.PolarDiagram49STG; import com.sap.sailing.simulator.impl.PolarDiagram505STG; import com.sap.sailing.simulator.impl.PolarDiagramCSV; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagramCSVTest { private static double DELTA_PERCENTAGE = 0.54; diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SimulatorTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SimulatorTest.java index cbc77e05950..45639b94c38 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SimulatorTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SimulatorTest.java @@ -10,7 +10,6 @@ import junit.framework.Assert; import org.junit.Test; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.PathType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; @@ -26,6 +25,7 @@ import com.sap.sailing.simulator.util.SailingSimulatorConstants; import com.sap.sailing.simulator.windfield.WindControlParameters; import com.sap.sailing.simulator.windfield.WindFieldGenerator; import com.sap.sailing.simulator.windfield.impl.WindFieldGeneratorBlastImpl; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsDurationImpl; diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/TreeGrowTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/TreeGrowTest.java index e93a463081e..dcfa48baaa5 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/TreeGrowTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/TreeGrowTest.java @@ -10,7 +10,6 @@ import org.junit.Test; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.simulator.Path; @@ -26,6 +25,7 @@ import com.sap.sailing.simulator.windfield.WindFieldGenerator; import com.sap.sailing.simulator.windfield.impl.WindFieldGeneratorOscillationImpl; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/WindFieldGeneratorTest.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/WindFieldGeneratorTest.java index 6b6d5f12bb3..89e5479a3f5 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/WindFieldGeneratorTest.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/WindFieldGeneratorTest.java @@ -17,7 +17,6 @@ import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedWithBearingImpl; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.simulator.impl.RectangularGrid; import com.sap.sailing.simulator.impl.TimedPositionWithSpeedImpl; @@ -29,6 +28,7 @@ import com.sap.sailing.simulator.windfield.impl.WindFieldGeneratorOscillationImp import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGeneratorTracTracEval.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGeneratorTracTracEval.java index fc5d4d95098..0741b973d23 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGeneratorTracTracEval.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PathGeneratorTracTracEval.java @@ -5,10 +5,10 @@ import java.util.List; import junit.framework.Assert; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.simulator.Path; import com.sap.sailing.simulator.impl.PathGeneratorTracTrac; +import com.sap.sse.common.Distance; public class PathGeneratorTracTracEval { diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramCurrentDataPolar.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramCurrentDataPolar.java index 97744aee1f4..d3ee0557e9c 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramCurrentDataPolar.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramCurrentDataPolar.java @@ -5,12 +5,12 @@ import static org.junit.Assert.assertEquals; import java.io.FileWriter; import java.io.IOException; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.simulator.impl.PolarDiagram49STG; import com.sap.sailing.simulator.impl.PolarDiagramBase; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagramCurrentDataPolar { diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramInterpolate.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramInterpolate.java index 3cfe6cd03c2..171b8e95477 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramInterpolate.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramInterpolate.java @@ -3,10 +3,10 @@ package com.sap.sailing.simulator.test.util; import java.io.IOException; import java.util.NavigableMap; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.simulator.impl.PolarDiagram49STG; import com.sap.sailing.simulator.impl.PolarDiagramBase; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagramInterpolate { diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java index 5a14d240da6..857bdeb5503 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataPolar.java @@ -8,11 +8,11 @@ import java.util.NavigableMap; import java.util.Set; import java.util.TreeSet; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.impl.PolarDiagram49STG; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; public class PolarDiagramPlotDataPolar { diff --git a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataXY.java b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataXY.java index b1835535d30..bcb9e8bcef7 100644 --- a/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataXY.java +++ b/java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/PolarDiagramPlotDataXY.java @@ -7,10 +7,10 @@ import java.io.IOException; import java.util.NavigableMap; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.impl.PolarDiagram49STG; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; public class PolarDiagramPlotDataXY { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/BoatClassProperties.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/BoatClassProperties.java index 2af20e3f3ee..1e72ccb66e2 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/BoatClassProperties.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/BoatClassProperties.java @@ -1,6 +1,6 @@ package com.sap.sailing.simulator; -import com.sap.sailing.domain.common.Distance; +import com.sap.sse.common.Distance; public interface BoatClassProperties { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/Grid.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/Grid.java index 791fa894485..e3fc3d753e8 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/Grid.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/Grid.java @@ -3,11 +3,11 @@ package com.sap.sailing.simulator; import java.io.Serializable; import java.util.Map; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * The Grid interface defines access to a set of GPS-positions which form a lattice of supporting positions for diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/PolarDiagram.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/PolarDiagram.java index e5eedddd03c..632f8edde6e 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/PolarDiagram.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/PolarDiagram.java @@ -4,9 +4,9 @@ import java.io.Serializable; import java.util.NavigableMap; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.Util.Pair; public interface PolarDiagram extends Serializable { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/BoatClassPropertiesImpl.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/BoatClassPropertiesImpl.java index 6147ad18aeb..f2daccc5676 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/BoatClassPropertiesImpl.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/BoatClassPropertiesImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.simulator.impl; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.simulator.BoatClassProperties; +import com.sap.sse.common.Distance; public class BoatClassPropertiesImpl implements BoatClassProperties { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/CurvedGrid.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/CurvedGrid.java index 2020c299a82..f9de469ca9d 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/CurvedGrid.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/CurvedGrid.java @@ -3,10 +3,10 @@ package com.sap.sailing.simulator.impl; import java.util.HashMap; import java.util.Map; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.simulator.Grid; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; /** diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1Turner.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1Turner.java index 1e624c2c57b..fbdedc0bf2a 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1Turner.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1Turner.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; @@ -15,6 +13,8 @@ import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1Turner360.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1Turner360.java index 79c5f83bfd9..1c495c55aae 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1Turner360.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1Turner360.java @@ -2,8 +2,6 @@ package com.sap.sailing.simulator.impl; import java.util.LinkedList; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; @@ -14,6 +12,8 @@ import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1TurnerLeftDirect.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1TurnerLeftDirect.java index b1e704e0078..238787f7c00 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1TurnerLeftDirect.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1TurnerLeftDirect.java @@ -2,10 +2,7 @@ package com.sap.sailing.simulator.impl; import java.util.LinkedList; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.simulator.Grid; import com.sap.sailing.simulator.Path; @@ -13,6 +10,9 @@ import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1TurnerRightDirect.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1TurnerRightDirect.java index fdadbf3f484..82638bce11a 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1TurnerRightDirect.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGenerator1TurnerRightDirect.java @@ -2,10 +2,7 @@ package com.sap.sailing.simulator.impl; import java.util.LinkedList; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.simulator.Grid; import com.sap.sailing.simulator.Path; @@ -13,6 +10,9 @@ import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorDijkstra.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorDijkstra.java index 4a950e405ba..01df329eaca 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorDijkstra.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorDijkstra.java @@ -7,10 +7,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.simulator.Grid; import com.sap.sailing.simulator.Path; @@ -19,6 +16,9 @@ import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPosition; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorDynProgForward.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorDynProgForward.java index c3e3a1e0096..dd525b840b3 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorDynProgForward.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorDynProgForward.java @@ -4,10 +4,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.Vector; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.simulator.Grid; import com.sap.sailing.simulator.Path; @@ -17,6 +14,9 @@ import com.sap.sailing.simulator.TimedPosition; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindField; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistEuclidian.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistEuclidian.java index 223690fa575..b926d88e9e3 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistEuclidian.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistEuclidian.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; @@ -15,6 +13,8 @@ import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistEuclidian360.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistEuclidian360.java index 70eb0670574..3b237ec2ea7 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistEuclidian360.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistEuclidian360.java @@ -7,8 +7,6 @@ import java.util.List; import java.util.TimeZone; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; @@ -21,6 +19,8 @@ import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPosition; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistVMG.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistVMG.java index e6f91f719db..55280adf4a4 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistVMG.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorOpportunistVMG.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; @@ -13,6 +12,7 @@ import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java index 53c661fdd96..eda260f571d 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java @@ -16,11 +16,9 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; @@ -31,7 +29,9 @@ import com.sap.sailing.domain.tractracadapter.impl.TracTracAdapterFactoryImpl; import com.sap.sailing.simulator.Path; import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPositionWithSpeed; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; @SuppressWarnings("restriction") diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java index d2accd3b8a8..77b50821919 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java @@ -9,21 +9,21 @@ import java.util.Comparator; import java.util.List; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.simulator.Path; import com.sap.sailing.simulator.PolarDiagram; import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPosition; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class PathGeneratorTreeGrow extends PathGeneratorBase { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow360.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow360.java index c027265b487..70f0789d944 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow360.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow360.java @@ -12,8 +12,6 @@ import java.util.List; import java.util.TimeZone; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; @@ -25,6 +23,8 @@ import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPosition; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrowBitSet.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrowBitSet.java index ce0bc322c0b..e5eb5389c16 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrowBitSet.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrowBitSet.java @@ -10,8 +10,6 @@ import java.util.Comparator; import java.util.List; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; @@ -22,6 +20,8 @@ import com.sap.sailing.simulator.SimulationParameters; import com.sap.sailing.simulator.TimedPosition; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java index b2165f8cae8..b1e6deceaba 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java @@ -9,17 +9,17 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.simulator.Path; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindField; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; public class PathImpl implements Path, Serializable { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java index dbddc3e961d..1dd9d82bbde 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49.java @@ -4,10 +4,10 @@ import java.util.NavigableMap; import java.util.TreeMap; import com.sap.sailing.domain.base.DomainFactory; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagram49 extends PolarDiagramBase { private static final long serialVersionUID = -878812179468801167L; diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49Bethwaite.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49Bethwaite.java index 61961e501b8..221a52d6703 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49Bethwaite.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49Bethwaite.java @@ -4,10 +4,10 @@ import java.util.NavigableMap; import java.util.TreeMap; import com.sap.sailing.domain.base.DomainFactory; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagram49Bethwaite extends PolarDiagramBase { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49ORC.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49ORC.java index 77ccfd959cf..13dc027b0a8 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49ORC.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49ORC.java @@ -4,10 +4,10 @@ import java.util.NavigableMap; import java.util.TreeMap; import com.sap.sailing.domain.base.DomainFactory; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagram49ORC extends PolarDiagramBase { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49STG.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49STG.java index 4dcb0fd43ed..a51b7450cd5 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49STG.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram49STG.java @@ -4,10 +4,10 @@ import java.util.NavigableMap; import java.util.TreeMap; import com.sap.sailing.domain.base.DomainFactory; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagram49STG extends PolarDiagramBase { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram505STG.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram505STG.java index b64554e26dc..9034a701c76 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram505STG.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagram505STG.java @@ -4,10 +4,10 @@ import java.util.NavigableMap; import java.util.TreeMap; import com.sap.sailing.domain.base.DomainFactory; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagram505STG extends PolarDiagramBase { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramBase.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramBase.java index d78df0f8618..cd5f08e50ab 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramBase.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramBase.java @@ -12,17 +12,17 @@ import java.util.TreeMap; import java.util.TreeSet; import com.sap.sailing.domain.base.BoatClass; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.BoatClassMasterdata; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.RadianBearingImpl; import com.sap.sailing.simulator.BoatDirection; import com.sap.sailing.simulator.PointOfSail; import com.sap.sailing.simulator.PolarDiagram; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagramBase implements PolarDiagram, Serializable { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java index 36300b225d4..1807dae53a4 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramCSV.java @@ -13,10 +13,10 @@ import java.util.NavigableMap; import java.util.TreeMap; import com.sap.sailing.domain.base.DomainFactory; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagramCSV extends PolarDiagramBase { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java index 6da70b8ec64..3d7a34346ab 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java @@ -9,15 +9,15 @@ import java.util.NavigableMap; import java.util.TreeMap; import com.sap.sailing.domain.base.BoatClass; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.polars.PolarDataService; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PolarDiagramGPS extends PolarDiagramBase { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java index 467335702b0..9c7bcc774d2 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java @@ -5,9 +5,7 @@ import java.util.NavigableMap; import java.util.Set; import com.sap.sailing.domain.base.BoatClass; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -16,6 +14,8 @@ import com.sap.sailing.domain.polars.PolarDataService; import com.sap.sailing.simulator.BoatDirection; import com.sap.sailing.simulator.PointOfSail; import com.sap.sailing.simulator.PolarDiagram; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.sap.sse.common.Util.Pair; public class PolarDiagramGPSDirect implements PolarDiagram, Serializable { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/RectangularGrid.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/RectangularGrid.java index 40f65d9fa4e..1173190b714 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/RectangularGrid.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/RectangularGrid.java @@ -3,11 +3,11 @@ package com.sap.sailing.simulator.impl; import java.util.HashMap; import java.util.Map; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.simulator.Grid; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Util; /** diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/TimedPositionWithSpeedSimple.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/TimedPositionWithSpeedSimple.java index e3c0afd30d2..e02d1b17dec 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/TimedPositionWithSpeedSimple.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/TimedPositionWithSpeedSimple.java @@ -1,9 +1,9 @@ package com.sap.sailing.simulator.impl; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.simulator.TimedPositionWithSpeed; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; public class TimedPositionWithSpeedSimple implements TimedPositionWithSpeed { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorBlastImpl.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorBlastImpl.java index 8d233f18475..02ee68cb7f0 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorBlastImpl.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorBlastImpl.java @@ -5,7 +5,6 @@ import java.util.logging.Logger; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.simulator.Grid; @@ -15,6 +14,7 @@ import com.sap.sailing.simulator.windfield.WindFieldGenerator; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; public class WindFieldGeneratorBlastImpl extends WindFieldGeneratorImpl implements WindFieldGenerator { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorImpl.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorImpl.java index e203751b072..db6f16aac58 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorImpl.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorImpl.java @@ -8,7 +8,6 @@ import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedWithBearingImpl; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.simulator.Grid; @@ -23,6 +22,7 @@ import com.sap.sailing.simulator.windfield.WindFieldGenerator; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; public abstract class WindFieldGeneratorImpl implements WindFieldGenerator { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorMeasured.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorMeasured.java index f98b1fa14a2..cb419297107 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorMeasured.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorMeasured.java @@ -3,10 +3,8 @@ package com.sap.sailing.simulator.windfield.impl; import java.util.List; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.simulator.Grid; @@ -15,8 +13,10 @@ import com.sap.sailing.simulator.TimedPosition; import com.sap.sailing.simulator.TimedPositionWithSpeed; import com.sap.sailing.simulator.windfield.WindControlParameters; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.impl.DegreeBearingImpl; public class WindFieldGeneratorMeasured extends WindFieldGeneratorImpl implements WindFieldGenerator { diff --git a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorOscillationImpl.java b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorOscillationImpl.java index 51d41d57512..269e48d28bc 100644 --- a/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorOscillationImpl.java +++ b/java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/windfield/impl/WindFieldGeneratorOscillationImpl.java @@ -2,13 +2,9 @@ package com.sap.sailing.simulator.windfield.impl; import java.util.logging.Logger; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -16,9 +12,13 @@ import com.sap.sailing.simulator.Grid; import com.sap.sailing.simulator.TimedPosition; import com.sap.sailing.simulator.windfield.WindControlParameters; import com.sap.sailing.simulator.windfield.WindFieldGenerator; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; public class WindFieldGeneratorOscillationImpl extends WindFieldGeneratorImpl implements WindFieldGenerator { diff --git a/java/com.sap.sailing.xmlexport.test/src/com/sap/sailing/xmlexport/test/XMLExportTest.java b/java/com.sap.sailing.xmlexport.test/src/com/sap/sailing/xmlexport/test/XMLExportTest.java index 9ea495d1fba..2ba59236dcc 100644 --- a/java/com.sap.sailing.xmlexport.test/src/com/sap/sailing/xmlexport/test/XMLExportTest.java +++ b/java/com.sap.sailing.xmlexport.test/src/com/sap/sailing/xmlexport/test/XMLExportTest.java @@ -13,7 +13,6 @@ import java.net.URL; import org.junit.Test; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; @@ -24,6 +23,7 @@ import com.sap.sailing.domain.leaderboard.impl.ThresholdBasedResultDiscardingRul import com.sap.sailing.domain.test.OnlineTracTracBasedTest; import com.sap.sailing.domain.tractracadapter.ReceiverType; import com.sap.sailing.xmlexport.LeaderboardData; +import com.sap.sse.common.impl.DegreeBearingImpl; public class XMLExportTest extends OnlineTracTracBasedTest { diff --git a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/ExportAction.java b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/ExportAction.java index ae16ad756d0..ee6ef1cbb3d 100644 --- a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/ExportAction.java +++ b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/ExportAction.java @@ -18,12 +18,9 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.Nationality; import com.sap.sailing.domain.base.RaceColumn; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.RegattaLeaderboard; @@ -32,6 +29,9 @@ import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.server.RacingEventService; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Triple; diff --git a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/FoilingData.java b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/FoilingData.java index 6ef310ee28a..b2bfc40cd88 100644 --- a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/FoilingData.java +++ b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/FoilingData.java @@ -14,7 +14,6 @@ import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.WindSource; @@ -31,6 +30,7 @@ import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.server.RacingEventService; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; diff --git a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java index de0543b9f4d..b5c5076cd14 100644 --- a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java +++ b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/LeaderboardData.java @@ -28,13 +28,10 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.SpeedWithConfidence; import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; @@ -55,7 +52,10 @@ import com.sap.sailing.domain.tracking.WindPositionMode; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.server.RacingEventService; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; diff --git a/java/com.sap.sse.common/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sse.common/.settings/org.eclipse.core.resources.prefs index 03708948a92..86678f0e49a 100755 --- a/java/com.sap.sse.common/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sse.common/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1 +encoding//src/com/sap/sse/common/AbstractBearing.java=UTF-8 encoding//src/com/sap/sse/common/impl/CountryCodeFactoryImpl.java=UTF-8 diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractBearing.java b/java/com.sap.sse.common/src/com/sap/sse/common/AbstractBearing.java similarity index 96% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractBearing.java rename to java/com.sap.sse.common/src/com/sap/sse/common/AbstractBearing.java index 9504198c194..cf50b0f5960 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractBearing.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/AbstractBearing.java @@ -1,6 +1,6 @@ -package com.sap.sailing.domain.common; +package com.sap.sse.common; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; public abstract class AbstractBearing implements Bearing { private static final long serialVersionUID = 1968420344627864784L; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Bearing.java b/java/com.sap.sse.common/src/com/sap/sse/common/Bearing.java similarity index 96% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Bearing.java rename to java/com.sap.sse.common/src/com/sap/sse/common/Bearing.java index 6e0e74e0245..d826cbd6c99 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Bearing.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/Bearing.java @@ -1,8 +1,8 @@ -package com.sap.sailing.domain.common; +package com.sap.sse.common; import java.io.Serializable; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +import com.sap.sse.common.impl.DegreeBearingImpl; public interface Bearing extends Serializable, Comparable { Bearing NORTH = new DegreeBearingImpl(0); diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Distance.java b/java/com.sap.sse.common/src/com/sap/sse/common/Distance.java similarity index 97% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Distance.java rename to java/com.sap.sse.common/src/com/sap/sse/common/Distance.java index 3c9d612f537..8f94c7ee589 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Distance.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/Distance.java @@ -1,9 +1,7 @@ -package com.sap.sailing.domain.common; +package com.sap.sse.common; import java.io.Serializable; -import com.sap.sse.common.Duration; - /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java b/java/com.sap.sse.common/src/com/sap/sse/common/Speed.java similarity index 96% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java rename to java/com.sap.sse.common/src/com/sap/sse/common/Speed.java index ccd88605ea7..66463b3bde9 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/Speed.java @@ -1,9 +1,7 @@ -package com.sap.sailing.domain.common; +package com.sap.sse.common; import java.io.Serializable; -import com.sap.sse.common.Duration; -import com.sap.sse.common.TimePoint; import com.sap.sse.datamining.annotations.Statistic; /** diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java b/java/com.sap.sse.common/src/com/sap/sse/common/impl/DegreeBearingImpl.java similarity index 78% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java rename to java/com.sap.sse.common/src/com/sap/sse/common/impl/DegreeBearingImpl.java index 5ea889222d9..713babde128 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/impl/DegreeBearingImpl.java @@ -1,7 +1,7 @@ -package com.sap.sailing.domain.common.impl; +package com.sap.sse.common.impl; -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; public class DegreeBearingImpl extends AbstractBearing implements Bearing { diff --git a/java/com.sap.sse.datamining.ui/.classpath b/java/com.sap.sse.datamining.ui/.classpath index eca7bdba8f0..ab3cb64a076 100644 --- a/java/com.sap.sse.datamining.ui/.classpath +++ b/java/com.sap.sse.datamining.ui/.classpath @@ -3,5 +3,6 @@ + diff --git a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF index 093b039b7be..879082d4d92 100644 --- a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF @@ -6,3 +6,12 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy +Export-Package: com.sap.sse.datamining.ui, + com.sap.sse.datamining.ui.execution, + com.sap.sse.datamining.ui.presentation, + com.sap.sse.datamining.ui.presentation.dataproviders, + com.sap.sse.datamining.ui.selection +Require-Bundle: com.sap.sse.gwt;bundle-version="1.0.0", + com.sap.sse.datamining.shared;bundle-version="1.0.0", + com.sap.sse.common, + org.moxieapps.gwt.highcharts;bundle-version="1.6.0" diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AggregatorDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionChangedListener.java similarity index 83% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AggregatorDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionChangedListener.java index dc85ee1e55e..76140c7cf89 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AggregatorDefinitionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionChangedListener.java @@ -1,9 +1,9 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; public interface AggregatorDefinitionChangedListener { public void aggregatorDefinitionChanged(AggregationProcessorDefinitionDTO newAggregatorDefinition); - + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AggregatorDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionProvider.java similarity index 76% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AggregatorDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionProvider.java index b778c93ff9e..8889b384c17 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AggregatorDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionProvider.java @@ -1,12 +1,13 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; -public interface AggregatorDefinitionProvider extends DataMiningComponentProvider { +public interface AggregatorDefinitionProvider + extends DataMiningComponentProvider { public AggregationProcessorDefinitionDTO getAggregatorDefinition(); - + public void addAggregatorDefinitionChangedListener(AggregatorDefinitionChangedListener listener); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AnchorDataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java similarity index 94% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AnchorDataMiningSettingsControl.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java index b017b2c6297..3eb12dcfcff 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AnchorDataMiningSettingsControl.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import java.util.Collection; import java.util.HashMap; @@ -12,7 +12,6 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.settings.Settings; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; @@ -23,19 +22,20 @@ import com.sap.sse.gwt.client.shared.components.SettingsDialog; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class AnchorDataMiningSettingsControl extends AbstractComponent implements DataMiningSettingsControl { +public class AnchorDataMiningSettingsControl extends AbstractComponent + implements DataMiningSettingsControl { public static final ComponentResources resources = GWT.create(ComponentResources.class); - + private final StringMessages stringMessages; private final Collection> components; private final Anchor anchor; - + public AnchorDataMiningSettingsControl(Component parent, ComponentContext context, final StringMessages stringMessages) { super(parent, context); this.stringMessages = stringMessages; components = new LinkedHashSet<>(); - + anchor = new Anchor(AbstractImagePrototype.create(resources.darkSettingsIcon()).getSafeHtml()); anchor.addStyleName("settingsAnchor"); anchor.setTitle(stringMessages.dataMiningSettings()); @@ -88,7 +88,7 @@ public class AnchorDataMiningSettingsControl extends AbstractComponent getSettingsDialogComponent(CompositeSettings settings) { return new CompositeTabbedSettingsDialogComponent(components); } @@ -100,7 +100,7 @@ public class AnchorDataMiningSettingsControl extends AbstractComponent settings = new HashMap<>(); for (Component component : components) { @@ -108,7 +108,7 @@ public class AnchorDataMiningSettingsControl extends AbstractComponent void updateSettings(Entry componentIdAndSettings) { // we assume that the component to which the ID resolves matches with the settings type provided @SuppressWarnings("unchecked") @@ -118,7 +118,7 @@ public class AnchorDataMiningSettingsControl extends AbstractComponent findComponentById(String componentId) { for (Component component : components) { if (component.getId().equals(componentId)) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningComponentProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningComponentProvider.java similarity index 81% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningComponentProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningComponentProvider.java index 7231b3eec35..a091ef53a07 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningComponentProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningComponentProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; @@ -10,15 +10,15 @@ public interface DataMiningComponentProvider exte * Tells the provider, that {@link #reloadComponents()} will be called in the future. */ public void awaitReloadComponents(); - + /** - * @return true, if the provider is reloading its components - * or is waiting for the {@link #reloadComponents()} call. + * @return true, if the provider is reloading its components or is waiting for the + * {@link #reloadComponents()} call. */ public boolean isAwatingReload(); - + public void reloadComponents(); - + public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); - + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningResources.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningResources.java similarity index 83% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningResources.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningResources.java index 99b1ac852c4..6fc0cce3ab5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningResources.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningResources.java @@ -1,9 +1,9 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; -public interface DataMiningResources extends ClientBundle { +public interface DataMiningResources extends ClientBundle { // TODO extract resource files @Source("com/sap/sailing/gwt/ui/client/images/close.png") ImageResource closeIcon(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningService.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningService.java similarity index 80% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningService.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningService.java index 7ce63efaa92..32b761628b5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningService.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningService.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import java.io.Serializable; import java.util.ArrayList; @@ -24,21 +24,30 @@ public interface DataMiningService extends RemoteService { Date getComponentsChangedTimepoint(); HashSet getAllStatistics(String localeInfoName); - HashSet getStatisticsFor(DataRetrieverChainDefinitionDTO retrieverChainDefinition, String localeInfoName); - HashSet getAggregatorDefinitionsFor(FunctionDTO extractionFunction, String localeInfoName); + HashSet getStatisticsFor(DataRetrieverChainDefinitionDTO retrieverChainDefinition, + String localeInfoName); + + HashSet getAggregatorDefinitionsFor(FunctionDTO extractionFunction, + String localeInfoName); + + HashSet getDimensionsFor(DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, + String localeInfoName); - HashSet getDimensionsFor(DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, String localeInfoName); ReducedDimensionsDTO getReducedDimensionsMappedByLevelFor( DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, String localeInfoName); ArrayList getDataRetrieverChainDefinitions(String localeName); - ArrayList getDataRetrieverChainDefinitionsFor(FunctionDTO statisticToCalculate, String localeInfoName); - QueryResultDTO> getDimensionValuesFor(DataMiningSession session, DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, DataRetrieverLevelDTO retrieverLevel, + ArrayList getDataRetrieverChainDefinitionsFor(FunctionDTO statisticToCalculate, + String localeInfoName); + + QueryResultDTO> getDimensionValuesFor(DataMiningSession session, + DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, DataRetrieverLevelDTO retrieverLevel, HashSet dimensionDTOs, HashMap retrieverSettings, - HashMap>> filterSelectionDTO, String localeInfoName); - + HashMap>> filterSelectionDTO, + String localeInfoName); + QueryResultDTO runQuery(DataMiningSession session, StatisticQueryDefinitionDTO queryDefinition); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningServiceAsync.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningServiceAsync.java similarity index 84% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningServiceAsync.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningServiceAsync.java index e186ac4f18b..148c4517f24 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningServiceAsync.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningServiceAsync.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import java.io.Serializable; import java.util.ArrayList; @@ -25,21 +25,27 @@ public interface DataMiningServiceAsync { public void getComponentsChangedTimepoint(AsyncCallback asyncCallback); void getAllStatistics(String localeInfoName, AsyncCallback> callback); + void getStatisticsFor(DataRetrieverChainDefinitionDTO currentRetrieverChainDefinition, String localeName, AsyncCallback> asyncCallback); void getAggregatorDefinitionsFor(FunctionDTO extractionFunction, String localeInfoName, AsyncCallback> asyncCallback); - void getDimensionsFor(DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, String localeInfoName, AsyncCallback> callback); + void getDimensionsFor(DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, String localeInfoName, + AsyncCallback> callback); + void getReducedDimensionsMappedByLevelFor(DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, String localeInfoName, AsyncCallback callback); - - void getDataRetrieverChainDefinitions(String localeInfoName, AsyncCallback> asyncCallback); + + void getDataRetrieverChainDefinitions(String localeInfoName, + AsyncCallback> asyncCallback); + void getDataRetrieverChainDefinitionsFor(FunctionDTO statisticToCalculate, String localeInfoName, AsyncCallback> callback); - void getDimensionValuesFor(DataMiningSession session, DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, DataRetrieverLevelDTO retrieverLevel, + void getDimensionValuesFor(DataMiningSession session, + DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO, DataRetrieverLevelDTO retrieverLevel, HashSet dimensionDTOs, HashMap retrieverSettings, HashMap>> filterSelectionDTO, String localeInfoName, AsyncCallback>> callback); @@ -52,12 +58,11 @@ public interface DataMiningServiceAsync { void runPredefinedQuery(DataMiningSession session, PredefinedQueryIdentifier identifier, String localeInfoName, AsyncCallback> callback); - + /** - * This method does nothing, but is needed to ensure, that some classes for the data mining - * (like {@link GenericGroupKey}) is added to the GWT serialization policy.
- * This is necessary, because the type is somehow hidden from GWT. For Further information - * look at bug 1503.
+ * This method does nothing, but is needed to ensure, that some classes for the data mining (like + * {@link GenericGroupKey}) is added to the GWT serialization policy.
+ * This is necessary, because the type is somehow hidden from GWT. For Further information look at bug 1503.
*/ void pseudoMethodSoThatSomeClassesAreAddedToTheGWTSerializationPolicy(AsyncCallback callback); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsControl.java similarity index 88% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsControl.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsControl.java index 83bae4c7cd0..757d2402fc6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsControl.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsControl.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.CompositeSettings; @@ -6,6 +6,7 @@ import com.sap.sse.gwt.client.shared.components.CompositeSettings; public interface DataMiningSettingsControl extends Component { void addSettingsComponent(Component component); + void removeSettingsComponent(Component component); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfo.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfo.java similarity index 63% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfo.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfo.java index d6f4c6ecedd..48c5df57b84 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfo.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfo.java @@ -1,15 +1,15 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; -import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; public interface DataMiningSettingsInfo { - + String getId(); - - SettingsDialogComponent createSettingsDialogComponent(SettingsType settings); - + + SettingsDialogComponent createSettingsDialogComponent( + SettingsType settings); + String getLocalizedName(StringMessages stringMessages); } diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfoManager.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfoManager.java new file mode 100644 index 00000000000..ffe44865a7d --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfoManager.java @@ -0,0 +1,7 @@ +package com.sap.sse.datamining.ui; + +public interface DataMiningSettingsInfoManager { + + DataMiningSettingsInfo getSettingsInfo(Class settingsType); + +} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataRetrieverChainDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionChangedListener.java similarity index 84% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataRetrieverChainDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionChangedListener.java index 2a4a334be36..9d855f220f9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataRetrieverChainDefinitionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionChangedListener.java @@ -1,9 +1,9 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; public interface DataRetrieverChainDefinitionChangedListener { - + public void dataRetrieverChainDefinitionChanged(DataRetrieverChainDefinitionDTO dataRetrieverChainDefinitionDTO); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionProvider.java similarity index 80% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataRetrieverChainDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionProvider.java index 33764e1c69d..326b81024eb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataRetrieverChainDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import java.util.HashMap; @@ -8,15 +8,14 @@ import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.gwt.client.shared.components.CompositeSettings; public interface DataRetrieverChainDefinitionProvider extends DataMiningComponentProvider { - + public DataRetrieverChainDefinitionDTO getDataRetrieverChainDefinition(); public void addDataRetrieverChainDefinitionChangedListener(DataRetrieverChainDefinitionChangedListener listener); - + /** - * @return The settings of the {@link #getDataRetrieverChainDefinition() current retriever definition} or an - * empty Map, if the retriever definition doesn't have any settings; + * @return The settings of the {@link #getDataRetrieverChainDefinition() current retriever definition} or an empty + * Map, if the retriever definition doesn't have any settings; */ public HashMap getRetrieverSettings(); - } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ExtractionFunctionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionChangedListener.java similarity index 80% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ExtractionFunctionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionChangedListener.java index 77f96c63e67..e5eb37e8d19 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ExtractionFunctionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionChangedListener.java @@ -1,9 +1,9 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; public interface ExtractionFunctionChangedListener { - + public void extractionFunctionChanged(FunctionDTO extractionFunction); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ExtractionFunctionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionProvider.java similarity index 74% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ExtractionFunctionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionProvider.java index f87074f37eb..293e704a291 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ExtractionFunctionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionProvider.java @@ -1,12 +1,13 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; -public interface ExtractionFunctionProvider extends DataMiningComponentProvider { +public interface ExtractionFunctionProvider + extends DataMiningComponentProvider { public FunctionDTO getExtractionFunction(); - + public void addExtractionFunctionChangedListener(ExtractionFunctionChangedListener listener); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionChangedListener.java similarity index 65% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionChangedListener.java index c85b2bea9ee..80fac3abea8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionChangedListener.java @@ -1,7 +1,7 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; public interface FilterSelectionChangedListener { - + public void selectionChanged(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionPresenter.java similarity index 82% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionPresenter.java index 60387a41001..d7ec19e21fa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.common.settings.AbstractSettings; import com.sap.sse.gwt.client.shared.components.Component; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionProvider.java similarity index 76% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionProvider.java index 8edd312744e..5ec363e1fed 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import java.io.Serializable; import java.util.HashMap; @@ -8,7 +8,8 @@ import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; -public interface FilterSelectionProvider extends DataMiningComponentProvider, DataRetrieverChainDefinitionChangedListener { +public interface FilterSelectionProvider + extends DataMiningComponentProvider, DataRetrieverChainDefinitionChangedListener { public void addSelectionChangedListener(FilterSelectionChangedListener listener); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingChangedListener.java similarity index 63% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingChangedListener.java index add491a2248..f1eb05a69d3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingChangedListener.java @@ -1,7 +1,7 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; public interface GroupingChangedListener { - + public void groupingChanged(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingProvider.java similarity index 72% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingProvider.java index 6056fcc73fc..cfb74547d4d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import java.util.Collection; @@ -24,10 +24,10 @@ public interface GroupingProvider Iterable getAvailableDimensions(); /** - * Sets the i-th dimension to group by to the function specified by {@code dimensionToGroupBy}. - * If {@code i} matches the last grouping dimension drop-down, its value is set and another dimension - * drop-down is created if there are dimensions left to select for grouping. Otherwise, the selected - * drop-down's value is set to the function identified by {@code dimensionToGroupBy}. + * Sets the i-th dimension to group by to the function specified by {@code dimensionToGroupBy}. If {@code i} matches + * the last grouping dimension drop-down, its value is set and another dimension drop-down is created if there are + * dimensions left to select for grouping. Otherwise, the selected drop-down's value is set to the function + * identified by {@code dimensionToGroupBy}. */ void setDimensionToGroupBy(int i, FunctionDTO dimensionToGroupBy); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ManagedDataMiningQueriesCounter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ManagedDataMiningQueriesCounter.java similarity index 75% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ManagedDataMiningQueriesCounter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ManagedDataMiningQueriesCounter.java index 4b5527c4a92..0d4474a227f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ManagedDataMiningQueriesCounter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ManagedDataMiningQueriesCounter.java @@ -1,9 +1,11 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; public interface ManagedDataMiningQueriesCounter { public int get(); + public void increase(); + public void decrease(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionChangedListener.java similarity index 82% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionChangedListener.java index 5319193fd85..6dcebfcb6ff 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryDefinitionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionProvider.java similarity index 83% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionProvider.java index be7b64b40db..9c57fd31f24 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionProvider.java @@ -1,14 +1,17 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; -public interface QueryDefinitionProvider extends DataMiningComponentProvider { +public interface QueryDefinitionProvider + extends DataMiningComponentProvider { public Iterable validateQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); + public StatisticQueryDefinitionDTO getQueryDefinition(); public void addQueryDefinitionChangedListener(QueryDefinitionChangedListener listener); + public void removeQueryDefinitionChangedListener(QueryDefinitionChangedListener listener); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryRunner.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryRunner.java similarity index 71% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryRunner.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryRunner.java index 03b755674ee..b30b7258fda 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryRunner.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryRunner.java @@ -1,13 +1,13 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; -import com.sap.sailing.gwt.ui.datamining.settings.QueryRunnerSettings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; +import com.sap.sse.datamining.ui.settings.QueryRunnerSettings; import com.sap.sse.gwt.client.shared.components.Component; public interface QueryRunner extends QueryDefinitionChangedListener, Component { - + void run(StatisticQueryDefinitionDTO queryDefinition); - + void runQuery(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenter.java similarity index 91% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenter.java index db342168586..414b7405dce 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; @@ -7,10 +7,11 @@ import com.sap.sse.gwt.client.shared.components.Component; public interface ResultsPresenter extends Component { public QueryResultDTO getCurrentResult(); - + public void showResult(QueryResultDTO result); public void showError(String error); + public void showError(String mainError, Iterable detailedErrors); public void showBusyIndicator(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ResultsPresenterWithControls.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenterWithControls.java similarity index 50% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ResultsPresenterWithControls.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenterWithControls.java index af447090134..f6e2a0c4c42 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/ResultsPresenterWithControls.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenterWithControls.java @@ -1,7 +1,8 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.common.settings.Settings; -public interface ResultsPresenterWithControls extends ResultsPresenter, WithControls { +public interface ResultsPresenterWithControls + extends ResultsPresenter, WithControls { } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticChangedListener.java similarity index 80% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticChangedListener.java index b4a23aaf0c9..cb52fa5465f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; public interface StatisticChangedListener extends DataRetrieverChainDefinitionChangedListener, ExtractionFunctionChangedListener, AggregatorDefinitionChangedListener { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticProvider.java similarity index 57% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticProvider.java index ee4fe0f9ace..c299e23a58d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticProvider.java @@ -1,9 +1,9 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.sap.sse.gwt.client.shared.components.CompositeSettings; -public interface StatisticProvider extends DataRetrieverChainDefinitionProvider, ExtractionFunctionProvider, AggregatorDefinitionProvider { - - public void addStatisticChangedListener(StatisticChangedListener listener); +public interface StatisticProvider extends DataRetrieverChainDefinitionProvider, + ExtractionFunctionProvider, AggregatorDefinitionProvider { + public void addStatisticChangedListener(StatisticChangedListener listener); } diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java new file mode 100644 index 00000000000..d13b5ea4436 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java @@ -0,0 +1,101 @@ +package com.sap.sse.datamining.ui; + +import com.google.gwt.core.client.GWT; + +public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { + + public static final StringMessages INSTANCE = GWT.create(StringMessages.class); + + String dataMiningSettings(); + String runPredefinedQuery(); + String viewQueryDefinition(); + String selectPredefinedQuery(); + String errorRunningDataMiningQuery(); + String predefinedQueryRunner(); + String run(); + String useClassGetNameTooltip(); + String useClassGetName(); + String useStringLiterals(); + String useStringLiteralsTooltip(); + String copyToClipboard(); + String details(); + String code(); + String queryDefinitionViewer(); + String runAsSubstantive(); + String queryNotValidBecause(); + String queryRunner(); + String floatNumber(); + String integer(); + String runAQuery(); + String runningQuery(); + String noDataFound(); + String numberOfDataPoints(); + String boatSpeed(); + String knotsUnit(); + String windSpeed(); + String TWA(); + String degreesShort(); + String choosePresentation(); + String plainText(); + String groupName(); + String valueAscending(); + String valueDescending(); + String groupAverageAscending(); + String groupAverageDescending(); + String groupMedianAscending(); + String groupMedianDescending(); + String shownDecimals(); + String queryResultsChartSubtitle(int retrievedDataAmount, double calculationTime); + String elements(long count); + String dataMiningErrorMargins(); + String dataMiningResult(); + String resultsChart(); + String cantDisplayDataOfType(String resultType); + String sortBy(); + String results(); + String developerOptions(); + String runAutomatically(); + String runAutomaticallyTooltip(); + String filterBy(); + String currentFilterSelection(); + String plainResultsPresenter(); + String multiResultsPresenter(); + String columnChart(); + String columnChartWithErrorBars(); + String errorFetchingComponentsChangedTimepoint(String message); + String dataMiningComponentsHaveBeenUpdated(); + String dataMiningComponentsNeedReloadDialogMessage(); + String reload(); + String noDimensionToGroupBySelectedError(); + String noDataRetrieverChainDefinitonSelectedError(); + String noStatisticSelectedError(); + String calculateThe(); + String statisticProvider(); + String groupBy(); + String groupingProvider(); + String clearSelection(); + String basedOn(); + String chooseDifferentDimensionTitle(); + String chooseDifferentDimensionMessage(); + String pleaseSelectADimension(); + String queryDefinitionProvider(); + String analyze(); + String dataMiningRetrieval(); + String error(); + String tabbedResultsPresenter(); + String empty(); + String angleInDegree(); + String angleInRadian(); + String centralAngleInRadian(); + String centralAngleInDegree(); + String kilometers(); + String meters(); + String nauticalMiles(); + String seaMiles(); + String geographicalMiles(); + String days(); + String hours(); + String minutes(); + String seconds(); + String milliseconds(); +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/WithControls.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/WithControls.java similarity index 79% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/WithControls.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/WithControls.java index 4fdad93c213..a1727646fcc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/WithControls.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/WithControls.java @@ -1,9 +1,9 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sse.datamining.ui; import com.google.gwt.user.client.ui.Widget; public interface WithControls { - + public void addControl(Widget controlWidget); public void removeControl(Widget controlWidget); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/PredefinedQueryRunner.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/PredefinedQueryRunner.java similarity index 86% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/PredefinedQueryRunner.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/PredefinedQueryRunner.java index 2cf724e2ff0..7526fd2d0df 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/PredefinedQueryRunner.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/PredefinedQueryRunner.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.developer; +package com.sap.sse.datamining.ui.developer; import java.io.Serializable; import java.util.ArrayList; @@ -16,18 +16,18 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.shared.controls.AbstractObjectRenderer; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.ResultsPresenter; import com.sap.sse.common.Util; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.ResultsPresenter; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.controls.busyindicator.SimpleBusyIndicator; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.ComponentWithoutSettings; +import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public class PredefinedQueryRunner extends ComponentWithoutSettings { @@ -37,7 +37,7 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final ResultsPresenter resultsPresenter; - + private final Button showDialogButton; private final DialogBox dialogBox; private final SimpleBusyIndicator busyIndicator; @@ -45,49 +45,48 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { private final Button runButton; public PredefinedQueryRunner(Component parent, ComponentContext context, DataMiningSession session, - StringMessages stringMessages, - DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, - ResultsPresenter resultsPresenter) { + StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + ResultsPresenter resultsPresenter) { super(parent, context); this.session = session; this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; this.resultsPresenter = resultsPresenter; - + showDialogButton = new Button(stringMessages.runPredefinedQuery(), new ClickHandler() { @Override public void onClick(ClickEvent event) { show(); } }); - + dialogBox = new DialogBox(false, true); dialogBox.setText(stringMessages.viewQueryDefinition()); dialogBox.setAnimationEnabled(true); - + Button closeButton = new Button(stringMessages.close(), new ClickHandler() { @Override public void onClick(ClickEvent event) { dialogBox.hide(); } }); - + runButton = new Button(stringMessages.run(), new ClickHandler() { @Override public void onClick(ClickEvent event) { runSelectedPredefinedQuery(); } }); - + HorizontalPanel contentPanel = new HorizontalPanel(); contentPanel.setSpacing(5); contentPanel.add(new Label(stringMessages.selectPredefinedQuery() + ":")); - + busyIndicator = new SimpleBusyIndicator(true, 0.7f); busyIndicator.setVisible(false); contentPanel.add(busyIndicator); - + selectionListBox = new ValueListBox<>(new AbstractObjectRenderer() { @Override protected String convertObjectToString(PredefinedQueryIdentifier nonNullObject) { @@ -95,7 +94,7 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { } }); contentPanel.add(selectionListBox); - + DockPanel dockPanel = new DockPanel(); dockPanel.setSpacing(4); HorizontalPanel dialogButtonsPanel = new HorizontalPanel(); @@ -120,6 +119,7 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { errorReporter.reportError("Error fetching the predefined query names: " + caught.getMessage()); busyIndicator.setVisible(false); } + @Override public void onSuccess(HashSet predefinedQueryIdentifiers) { if (!predefinedQueryIdentifiers.isEmpty()) { @@ -127,7 +127,7 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { List acceptableValues = new ArrayList<>(predefinedQueryIdentifiers); selectionListBox.setValue(valueToBeSelected); selectionListBox.setAcceptableValues(acceptableValues); - + runButton.setEnabled(true); selectionListBox.setVisible(true); } else { @@ -137,22 +137,23 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { } }); } - + protected void runSelectedPredefinedQuery() { PredefinedQueryIdentifier predefinedQueryIdentifier = selectionListBox.getValue(); resultsPresenter.showBusyIndicator(); dataMiningService.runPredefinedQuery(session, predefinedQueryIdentifier, LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error running the query: " + caught.getMessage()); - resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); - } - @Override + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError("Error running the query: " + caught.getMessage()); + resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); + } + + @Override public void onSuccess(QueryResultDTO result) { - resultsPresenter.showResult(result); - } - }); + resultsPresenter.showResult(result); + } + }); dialogBox.hide(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/QueryDefinitionParser.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionParser.java similarity index 99% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/QueryDefinitionParser.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionParser.java index eafb295b169..d74531c445c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/QueryDefinitionParser.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionParser.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.developer; +package com.sap.sse.datamining.ui.developer; import java.io.Serializable; import java.util.ArrayList; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/QueryDefinitionViewer.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionViewer.java similarity index 95% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/QueryDefinitionViewer.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionViewer.java index 4a9fd3d562b..d9e973de784 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/developer/QueryDefinitionViewer.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionViewer.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.developer; +package com.sap.sse.datamining.ui.developer; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; @@ -13,10 +13,10 @@ import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.TabLayoutPanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.QueryDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.developer.QueryDefinitionParser.TypeToCodeStrategy; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; +import com.sap.sse.datamining.ui.QueryDefinitionChangedListener; +import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.developer.QueryDefinitionParser.TypeToCodeStrategy; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.ComponentWithoutSettings; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/ManagedDataMiningQueryCallback.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/ManagedDataMiningQueryCallback.java similarity index 82% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/ManagedDataMiningQueryCallback.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/ManagedDataMiningQueryCallback.java index adccaaef9c5..7237d67cd22 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/ManagedDataMiningQueryCallback.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/ManagedDataMiningQueryCallback.java @@ -1,17 +1,17 @@ -package com.sap.sailing.gwt.ui.datamining.execution; +package com.sap.sse.datamining.ui.execution; import java.io.Serializable; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.sap.sailing.gwt.ui.datamining.ManagedDataMiningQueriesCounter; import com.sap.sse.datamining.shared.data.QueryResultState; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.ManagedDataMiningQueriesCounter; public abstract class ManagedDataMiningQueryCallback implements AsyncCallback> { private final ManagedDataMiningQueriesCounter counter; - + public ManagedDataMiningQueryCallback(ManagedDataMiningQueriesCounter counter) { this.counter = counter; } @@ -29,8 +29,7 @@ public abstract class ManagedDataMiningQueryCallback result) { counter.decrease(); - if (result.getState() == QueryResultState.NORMAL || - counter.get() == 0) { + if (result.getState() == QueryResultState.NORMAL || counter.get() == 0) { handleSuccess(result); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/SimpleManagedDataMiningQueriesCounter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleManagedDataMiningQueriesCounter.java similarity index 75% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/SimpleManagedDataMiningQueriesCounter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleManagedDataMiningQueriesCounter.java index db408b45677..50732fdb717 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/SimpleManagedDataMiningQueriesCounter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleManagedDataMiningQueriesCounter.java @@ -1,9 +1,9 @@ -package com.sap.sailing.gwt.ui.datamining.execution; +package com.sap.sse.datamining.ui.execution; -import com.sap.sailing.gwt.ui.datamining.ManagedDataMiningQueriesCounter; +import com.sap.sse.datamining.ui.ManagedDataMiningQueriesCounter; public class SimpleManagedDataMiningQueriesCounter implements ManagedDataMiningQueriesCounter { - + private int sentQueriesCounter; @Override @@ -17,7 +17,7 @@ public class SimpleManagedDataMiningQueriesCounter implements ManagedDataMiningQ sentQueriesCounter--; } } - + @Override public void increase() { sentQueriesCounter++; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/SimpleQueryRunner.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java similarity index 76% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/SimpleQueryRunner.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java index 2a6620a7e65..fcf5b23ed33 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/execution/SimpleQueryRunner.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.execution; +package com.sap.sse.datamining.ui.execution; import java.io.Serializable; @@ -7,18 +7,18 @@ import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.DataMiningService; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.ManagedDataMiningQueriesCounter; -import com.sap.sailing.gwt.ui.datamining.QueryDefinitionProvider; -import com.sap.sailing.gwt.ui.datamining.QueryRunner; -import com.sap.sailing.gwt.ui.datamining.ResultsPresenter; -import com.sap.sailing.gwt.ui.datamining.settings.QueryRunnerSettings; -import com.sap.sailing.gwt.ui.datamining.settings.QueryRunnerSettingsDialogComponent; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.DataMiningService; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.ManagedDataMiningQueriesCounter; +import com.sap.sse.datamining.ui.QueryDefinitionProvider; +import com.sap.sse.datamining.ui.QueryRunner; +import com.sap.sse.datamining.ui.ResultsPresenter; +import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.settings.QueryRunnerSettings; +import com.sap.sse.datamining.ui.settings.QueryRunnerSettingsDialogComponent; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; @@ -39,13 +39,11 @@ public class SimpleQueryRunner extends AbstractComponent im private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final ManagedDataMiningQueriesCounter counter; - + /** - * Timer to prevent the execution of unnecessary queries, when they're run - * automatically (see {@link QueryRunnerSettings}). This can be caused by - * a change of the used data type, that then causes a change of the - * dimension to group by and the data retriever chain. Or caused by quick - * changes of the filter selection. + * Timer to prevent the execution of unnecessary queries, when they're run automatically (see + * {@link QueryRunnerSettings}). This can be caused by a change of the used data type, that then causes a change of + * the dimension to group by and the data retriever chain. Or caused by quick changes of the filter selection. * * @see #queryBufferTimeInMillis */ @@ -56,20 +54,19 @@ public class SimpleQueryRunner extends AbstractComponent im private final Button runButton; public SimpleQueryRunner(Component parent, ComponentContext context, DataMiningSession session, - StringMessages stringMessages, DataMiningServiceAsync dataMiningService, - ErrorReporter errorReporter, QueryDefinitionProvider queryDefinitionProvider, - ResultsPresenter resultsPresenter) { + StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + QueryDefinitionProvider queryDefinitionProvider, ResultsPresenter resultsPresenter) { super(parent, context); this.session = session; this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; counter = new SimpleManagedDataMiningQueriesCounter(); - + this.settings = new QueryRunnerSettings(); this.queryDefinitionProvider = queryDefinitionProvider; this.resultsPresenter = resultsPresenter; - + runButton = new Button(this.stringMessages.runAsSubstantive()); runButton.addClickHandler(new ClickHandler() { @Override @@ -102,16 +99,17 @@ public class SimpleQueryRunner extends AbstractComponent im resultsPresenter.showBusyIndicator(); dataMiningService.runQuery(session, queryDefinition, new ManagedDataMiningQueryCallback(counter) { - @Override - protected void handleFailure(Throwable caught) { - errorReporter.reportError("Error running the query: " + caught.getMessage()); - resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); - } - @Override - protected void handleSuccess(QueryResultDTO result) { - resultsPresenter.showResult(result); - } - }); + @Override + protected void handleFailure(Throwable caught) { + errorReporter.reportError("Error running the query: " + caught.getMessage()); + resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); + } + + @Override + protected void handleSuccess(QueryResultDTO result) { + resultsPresenter.showResult(result); + } + }); } else { resultsPresenter.showError(stringMessages.queryNotValidBecause(), errorMessages); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractNumericResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java similarity index 86% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractNumericResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java index 07a36bf90ca..2cf44a572b8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractNumericResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation; +package com.sap.sse.datamining.ui.presentation; import java.io.Serializable; import java.util.ArrayList; @@ -13,20 +13,20 @@ import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.user.client.ui.ValueListBox; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.shared.controls.AbstractObjectRenderer; -import com.sap.sailing.gwt.ui.datamining.presentation.dataproviders.AbstractNumericDataProvider; -import com.sap.sailing.gwt.ui.datamining.presentation.dataproviders.AverageWithStatsDataProvider; -import com.sap.sailing.gwt.ui.datamining.presentation.dataproviders.BearingDataProvider; -import com.sap.sailing.gwt.ui.datamining.presentation.dataproviders.DataProvidersPrecedenceList; -import com.sap.sailing.gwt.ui.datamining.presentation.dataproviders.DistanceDataProvider; -import com.sap.sailing.gwt.ui.datamining.presentation.dataproviders.DurationDataProvider; -import com.sap.sailing.gwt.ui.datamining.presentation.dataproviders.NumberDataProvider; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.presentation.dataproviders.AbstractNumericDataProvider; +import com.sap.sse.datamining.ui.presentation.dataproviders.AverageWithStatsDataProvider; +import com.sap.sse.datamining.ui.presentation.dataproviders.BearingDataProvider; +import com.sap.sse.datamining.ui.presentation.dataproviders.DataProvidersPrecedenceList; +import com.sap.sse.datamining.ui.presentation.dataproviders.DistanceDataProvider; +import com.sap.sse.datamining.ui.presentation.dataproviders.DurationDataProvider; +import com.sap.sse.datamining.ui.presentation.dataproviders.NumberDataProvider; import com.sap.sse.gwt.client.shared.components.Component; +import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public abstract class AbstractNumericResultsPresenter extends AbstractResultsPresenter { @@ -38,11 +38,13 @@ public abstract class AbstractNumericResultsPresenter parent, ComponentContext context, StringMessages stringMessages) { super(parent, context, stringMessages); + final List> basicProviders = Arrays.asList( new NumberDataProvider(), new DistanceDataProvider(), new DurationDataProvider(), new BearingDataProvider()); + final List> allProviders = new ArrayList<>(basicProviders); allProviders.add(new AverageWithStatsDataProvider(new DataProvidersPrecedenceList(basicProviders))); dataProviders = new DataProvidersPrecedenceList(allProviders); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java index 285c3c0cdb8..693aa50d24f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation; +package com.sap.sse.datamining.ui.presentation; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; @@ -10,35 +10,36 @@ import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.ResultsPresenterWithControls; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.ResultsPresenterWithControls; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public abstract class AbstractResultsPresenter extends AbstractComponent -implements ResultsPresenterWithControls { - - private enum ResultsPresenterState { BUSY, ERROR, RESULT } - + implements ResultsPresenterWithControls { + + private enum ResultsPresenterState { + BUSY, ERROR, RESULT + } + protected final StringMessages stringMessages; private ResultsPresenterState state; - + private final DockLayoutPanel mainPanel; private final HorizontalPanel controlsPanel; protected final DeckLayoutPanel presentationPanel; - + private final HTML errorLabel; private final HTML labeledBusyIndicator; - + private QueryResultDTO currentResult; private boolean isCurrentResultSimple; - - public AbstractResultsPresenter(Component parent, ComponentContext context, - StringMessages stringMessages) { + + public AbstractResultsPresenter(Component parent, ComponentContext context, StringMessages stringMessages) { super(parent, context); this.stringMessages = stringMessages; mainPanel = new DockLayoutPanel(Unit.PX); @@ -55,7 +56,7 @@ implements ResultsPresenterWithControls { // Call a servlet to download the previously pushed result as json file } }); -// addControl(exportButton); + // addControl(exportButton); presentationPanel = new DeckLayoutPanel(); mainPanel.add(presentationPanel); errorLabel = new HTML(); @@ -64,17 +65,17 @@ implements ResultsPresenterWithControls { labeledBusyIndicator.setStyleName("chart-busyMessage"); showError(getStringMessages().runAQuery()); } - + @Override public void addControl(Widget controlWidget) { controlsPanel.add(controlWidget); } - + @Override public void removeControl(Widget controlWidget) { controlsPanel.remove(controlWidget); } - + @Override public void showResult(QueryResultDTO result) { if (result != null && !result.isEmpty()) { @@ -108,7 +109,7 @@ implements ResultsPresenterWithControls { updateCurrentResultInfo(); presentationPanel.setWidget(errorLabel); } - + @Override public void showError(String mainError, Iterable detailedErrors) { StringBuilder errorBuilder = new StringBuilder(mainError + ":
    "); @@ -118,7 +119,7 @@ implements ResultsPresenterWithControls { errorBuilder.append("
"); showError(errorBuilder.toString()); } - + @Override public void showBusyIndicator() { if (state != ResultsPresenterState.BUSY) { @@ -128,7 +129,7 @@ implements ResultsPresenterWithControls { currentResult = null; updateCurrentResultInfo(); } - + private void updateCurrentResultInfo() { boolean isSimple = false; if (currentResult != null) { @@ -151,7 +152,7 @@ implements ResultsPresenterWithControls { protected StringMessages getStringMessages() { return stringMessages; } - + @Override public QueryResultDTO getCurrentResult() { return currentResult; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java similarity index 61% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java index 412cb2d99de..00ab54a3d97 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation; +package com.sap.sse.datamining.ui.presentation; import java.util.HashMap; import java.util.Map; @@ -14,32 +14,31 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.shared.controls.ScrolledTabLayoutPanel; -import com.sap.sailing.gwt.ui.datamining.DataMiningResources; -import com.sap.sailing.gwt.ui.datamining.ResultsPresenter; -import com.sap.sailing.gwt.ui.datamining.presentation.ResultsChart.DrillDownCallback; -import com.sap.sailing.gwt.ui.polarmining.PolarBackendResultsPresenter; -import com.sap.sailing.gwt.ui.polarmining.PolarResultsPresenter; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.DataMiningResources; +import com.sap.sse.datamining.ui.ResultsPresenter; +import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.presentation.ResultsChart.DrillDownCallback; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; +import com.sap.sse.gwt.client.shared.controls.ScrolledTabLayoutPanel; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class TabbedResultsPresenter extends AbstractComponent implements ResultsPresenter { +public abstract class AbstractTabbedResultsPresenter extends AbstractComponent + implements ResultsPresenter { - private static final DataMiningResources resources = GWT.create(DataMiningResources.class); + protected static final DataMiningResources resources = GWT.create(DataMiningResources.class); - private final StringMessages stringMessages; + protected final StringMessages stringMessages; - private final ScrolledTabLayoutPanel tabPanel; - private final Map> presentersMappedByHeader; - private final DrillDownCallback drillDownCallback; + protected final ScrolledTabLayoutPanel tabPanel; + protected final Map> presentersMappedByHeader; + protected final DrillDownCallback drillDownCallback; - public TabbedResultsPresenter(Component parent, ComponentContext context, DrillDownCallback drillDownCallback, - StringMessages stringMessages) { + public AbstractTabbedResultsPresenter(Component parent, ComponentContext context, + DrillDownCallback drillDownCallback, StringMessages stringMessages) { super(parent, context); this.stringMessages = stringMessages; this.drillDownCallback = drillDownCallback; @@ -62,44 +61,13 @@ public class TabbedResultsPresenter extends AbstractComponent implemen public void onBeforeSelection(BeforeSelectionEvent event) { if (event.getItem() == tabPanel.getWidgetCount() - 1) { event.cancel(); - addTabAndFocus(new MultiResultsPresenter(TabbedResultsPresenter.this, getComponentContext(), + addTabAndFocus(new MultiResultsPresenter(AbstractTabbedResultsPresenter.this, getComponentContext(), drillDownCallback, stringMessages)); } } }); } - @Override - public void showResult(QueryResultDTO result) { - if (result != null) { - if (result.getResultType().equals("com.sap.sailing.polars.datamining.shared.PolarAggregation")) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus( - new PolarResultsPresenter(TabbedResultsPresenter.this, getComponentContext(), stringMessages)); - removeTab(oldHeader); - } else if (result.getResultType().equals("com.sap.sailing.polars.datamining.shared.PolarBackendData")) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus(new PolarBackendResultsPresenter(TabbedResultsPresenter.this, getComponentContext(), - stringMessages)); - removeTab(oldHeader); - } else if (result.getResultType() - .equals("com.sap.sailing.datamining.shared.ManeuverSpeedDetailsAggregation")) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus(new ManeuverSpeedDetailsResultsPresenter(TabbedResultsPresenter.this, - getComponentContext(), stringMessages)); - removeTab(oldHeader); - } else { - if (!(getSelectedPresenter() instanceof MultiResultsPresenter)) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus(new MultiResultsPresenter(this, getComponentContext(), drillDownCallback, stringMessages)); - removeTab(oldHeader); - } - } - getSelectedHeader().setText(result.getResultSignifier()); - } - getSelectedPresenter().showResult(result); - } - @Override public void showError(String error) { getSelectedHeader().setText(stringMessages.error()); @@ -123,15 +91,15 @@ public class TabbedResultsPresenter extends AbstractComponent implemen return getSelectedPresenter().getCurrentResult(); } - private CloseableTabHeader getSelectedHeader() { + protected CloseableTabHeader getSelectedHeader() { return (CloseableTabHeader) tabPanel.getTabWidget(tabPanel.getSelectedIndex()); } - private ResultsPresenter getSelectedPresenter() { + protected ResultsPresenter getSelectedPresenter() { return presentersMappedByHeader.get(getSelectedHeader()); } - private void addTabAndFocus(ResultsPresenter tabPresenter) { + protected void addTabAndFocus(ResultsPresenter tabPresenter) { CloseableTabHeader tabHeader = new CloseableTabHeader(); presentersMappedByHeader.put(tabHeader, tabPresenter); @@ -141,7 +109,7 @@ public class TabbedResultsPresenter extends AbstractComponent implemen tabPanel.scrollToTab(presenterIndex); } - private void removeTab(CloseableTabHeader header) { + protected void removeTab(CloseableTabHeader header) { header.removeFromParent(); presentersMappedByHeader.remove(header); } @@ -191,7 +159,7 @@ public class TabbedResultsPresenter extends AbstractComponent implemen return "tabbedResultsPresenters"; } - private class CloseableTabHeader extends HorizontalPanel { + protected class CloseableTabHeader extends HorizontalPanel { private final HTML label; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/MultiResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/MultiResultsPresenter.java similarity index 95% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/MultiResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/MultiResultsPresenter.java index 6bdb7ed7054..c2f9312ca37 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/MultiResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/MultiResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation; +package com.sap.sse.datamining.ui.presentation; import java.util.ArrayList; import java.util.List; @@ -12,15 +12,15 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.shared.controls.AbstractObjectRenderer; -import com.sap.sailing.gwt.ui.datamining.ResultsPresenter; -import com.sap.sailing.gwt.ui.datamining.presentation.ResultsChart.DrillDownCallback; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.ResultsPresenter; +import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.presentation.ResultsChart.DrillDownCallback; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; +import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public class MultiResultsPresenter extends AbstractComponent implements ResultsPresenter { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/PlainFilterSelectionPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainFilterSelectionPresenter.java similarity index 84% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/PlainFilterSelectionPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainFilterSelectionPresenter.java index e879d280b30..2140b68ed54 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/PlainFilterSelectionPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainFilterSelectionPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation; +package com.sap.sse.datamining.ui.presentation; import java.io.Serializable; import java.util.ArrayList; @@ -16,33 +16,32 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionProvider; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionChangedListener; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionPresenter; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionProvider; import com.sap.sse.common.settings.AbstractSettings; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.FilterSelectionPresenter; +import com.sap.sse.datamining.ui.FilterSelectionProvider; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class PlainFilterSelectionPresenter extends AbstractComponent implements FilterSelectionPresenter, FilterSelectionChangedListener, - DataRetrieverChainDefinitionChangedListener { +public class PlainFilterSelectionPresenter extends AbstractComponent implements + FilterSelectionPresenter, FilterSelectionChangedListener, DataRetrieverChainDefinitionChangedListener { private final FilterSelectionProvider filterSelectionProvider; private DataRetrieverChainDefinitionDTO retrieverChain; - + private final HorizontalPanel mainPanel; private final VerticalPanel presentationPanel; - + public PlainFilterSelectionPresenter(Component parent, ComponentContext context, - StringMessages stringMessages, - DataRetrieverChainDefinitionProvider retrieverChainProvider, + StringMessages stringMessages, DataRetrieverChainDefinitionProvider retrieverChainProvider, FilterSelectionProvider filterSelectionProvider) { super(parent, context); this.filterSelectionProvider = filterSelectionProvider; @@ -53,12 +52,12 @@ public class PlainFilterSelectionPresenter extends AbstractComponent>> selection = filterSelectionProvider.getSelection(); + + Map>> selection = filterSelectionProvider + .getSelection(); List sortedLevels = new ArrayList<>(selection.keySet()); Collections.sort(sortedLevels); boolean first = true; for (DataRetrieverLevelDTO retrieverLevel : sortedLevels) { Map> levelSelection = selection.get(retrieverLevel); - RetrieverLevelFilterSelectionPresenter levelSelectionPresenter = new RetrieverLevelFilterSelectionPresenter(retrieverLevel, levelSelection); + RetrieverLevelFilterSelectionPresenter levelSelectionPresenter = new RetrieverLevelFilterSelectionPresenter( + retrieverLevel, levelSelection); if (!first) { levelSelectionPresenter.getEntryWidget().getElement().getStyle().setMarginTop(5, Unit.PX); } @@ -85,27 +86,28 @@ public class PlainFilterSelectionPresenter extends AbstractComponent> levelSelection) { - + Label levelLabel = new Label(retrieverLevel.getRetrievedDataType().getDisplayName()); levelLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD); levelLabel.setWidth("100px"); - + VerticalPanel presentationPanel = new VerticalPanel(); List sortedDimensions = new ArrayList<>(levelSelection.keySet()); Collections.sort(sortedDimensions); for (FunctionDTO dimension : sortedDimensions) { Collection dimensionSelection = levelSelection.get(dimension); - DimensionFilterSelectionPresenter dimensionSelectionPresenter = new DimensionFilterSelectionPresenter(dimension, dimensionSelection); + DimensionFilterSelectionPresenter dimensionSelectionPresenter = new DimensionFilterSelectionPresenter( + dimension, dimensionSelection); presentationPanel.add(dimensionSelectionPresenter.getEntryWidget()); } - + mainPanel = new HorizontalPanel(); mainPanel.add(levelLabel); mainPanel.add(presentationPanel); @@ -114,11 +116,11 @@ public class PlainFilterSelectionPresenter extends AbstractComponent { @@ -52,12 +52,13 @@ public class ResultsChart extends AbstractNumericResultsPresenter { public static interface DrillDownCallback { void drillDown(GroupKey groupKey); } - + private final Comparator standardKeyComparator = new Comparator() { @Override public int compare(GroupKey key1, GroupKey key2) { return key1.compareTo(key2); } + @Override public String toString() { return getStringMessages().groupName(); @@ -70,6 +71,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { double doubleValue2 = currentResultValues.get(key2).doubleValue(); return Double.compare(doubleValue1, doubleValue2); } + @Override public String toString() { return getStringMessages().valueAscending(); @@ -80,6 +82,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { public int compare(GroupKey key1, GroupKey key2) { return -1 * ascendingByValueKeyComparator.compare(key1, key2); } + @Override public String toString() { return getStringMessages().valueDescending(); @@ -92,6 +95,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { GroupKey mainKey2 = GroupKey.Util.getMainKey(key2); return Double.compare(averagePerMainKey.get(mainKey1), averagePerMainKey.get(mainKey2)); } + public String toString() { return getStringMessages().groupAverageAscending(); }; @@ -101,6 +105,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { public int compare(GroupKey key1, GroupKey key2) { return -1 * ascendingByGroupAverageComparator.compare(key1, key2); } + public String toString() { return getStringMessages().groupAverageDescending(); }; @@ -112,6 +117,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { GroupKey mainKey2 = GroupKey.Util.getMainKey(key2); return Double.compare(medianPerMainKey.get(mainKey1), medianPerMainKey.get(mainKey2)); } + public String toString() { return getStringMessages().groupMedianAscending(); }; @@ -121,11 +127,12 @@ public class ResultsChart extends AbstractNumericResultsPresenter { public int compare(GroupKey key1, GroupKey key2) { return -1 * ascendingByGroupMedianComparator.compare(key1, key2); } + public String toString() { return getStringMessages().groupMedianDescending(); }; }; - + private final HorizontalPanel sortByPanel; private final ValueListBox> keyComparatorListBox; private final ValueListBox decimalsListBox; @@ -133,18 +140,17 @@ public class ResultsChart extends AbstractNumericResultsPresenter { private final SimpleLayoutPanel chartPanel; private final Chart chart; private final DrillDownCallback drillDownCallback; - + /** * The series showing the numerical results */ private final Map seriesMappedByGroupKey; - + /** - * The optional series visualizing error bars, if available based on the data type; - * see + * The optional series visualizing error bars, if available based on the data type; see */ private final Map errorSeriesMappedByGroupKey; - + private final GroupKey simpleResultSeriesKey; private final Map mainKeyToXValueMap; private final Map xValueToMainKeyMap; @@ -179,7 +185,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { sortByPanel.add(keyComparatorListBox); sortByPanel.setVisible(false); addControl(sortByPanel); - + HorizontalPanel decimalsPanel = new HorizontalPanel(); decimalsPanel.setSpacing(5); decimalsPanel.add(new Label(getStringMessages().shownDecimals() + ":")); @@ -196,7 +202,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } }); addControl(decimalsPanel); - + chartPanel = new SimpleLayoutPanel() { @Override public void onResize() { @@ -206,7 +212,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { }; chart = createChart(); chartPanel.setWidget(chart); - + seriesMappedByGroupKey = new HashMap<>(); errorSeriesMappedByGroupKey = new HashMap<>(); simpleResultSeriesKey = new GenericGroupKey<>(stringMessages.results()); @@ -215,14 +221,15 @@ public class ResultsChart extends AbstractNumericResultsPresenter { averagePerMainKey = new HashMap<>(); medianPerMainKey = new HashMap<>(); } - + @Override protected Widget getPresentationWidget() { return chartPanel; } @Override - protected void internalShowNumericResults(Map resultValues, Map> errorMargins) { + protected void internalShowNumericResults(Map resultValues, + Map> errorMargins) { this.currentResultValues = resultValues; this.currentResultErrorMargins = errorMargins; decimalsListBox.setValue(getCurrentResult().getValueDecimals(), false); @@ -286,15 +293,16 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } Point point = new Point(mainKeyToXValueMap.get(mainKey), value); point.setName(mainKey.asString()); - seriesMappedByGroupKey.get(groupKeyToSeriesKey(resultEntry.getKey())) - .addPoint(point, false, false, false); + seriesMappedByGroupKey.get(groupKeyToSeriesKey(resultEntry.getKey())).addPoint(point, false, false, false); if (showErrorBars) { - final Triple errorMargins = currentResultErrorMargins==null?null:currentResultErrorMargins.get(mainKey); + final Triple errorMargins = currentResultErrorMargins == null ? null + : currentResultErrorMargins.get(mainKey); if (errorMargins != null) { - Point errorMarginsPoint = new Point(mainKeyToXValueMap.get(mainKey), errorMargins.getA(), errorMargins.getB()); - errorMarginsPoint.setName(mainKey.asString()+", "+stringMessages.elements(errorMargins.getC())); + Point errorMarginsPoint = new Point(mainKeyToXValueMap.get(mainKey), errorMargins.getA(), + errorMargins.getB()); + errorMarginsPoint.setName(mainKey.asString() + ", " + stringMessages.elements(errorMargins.getC())); errorSeriesMappedByGroupKey.get(groupKeyToSeriesKey(resultEntry.getKey())) - .addPoint(errorMarginsPoint, false, false, false); + .addPoint(errorMarginsPoint, false, false, false); } } } @@ -369,8 +377,8 @@ public class ResultsChart extends AbstractNumericResultsPresenter { if (!seriesMappedByGroupKey.containsKey(seriesKey)) { seriesMappedByGroupKey.put(seriesKey, chart.createSeries().setName(seriesKey.asString())); if (showErrorBars) { - errorSeriesMappedByGroupKey.put(seriesKey, chart.createSeries().setType(Type.ERRORBAR).setName(seriesKey.asString()+ - " "+getStringMessages().dataMiningErrorMargins())); + errorSeriesMappedByGroupKey.put(seriesKey, chart.createSeries().setType(Type.ERRORBAR) + .setName(seriesKey.asString() + " " + getStringMessages().dataMiningErrorMargins())); } } } @@ -383,7 +391,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } } } - + private GroupKey groupKeyToSeriesKey(GroupKey groupKey) { if (groupKey.hasSubKeys()) { List subKeys = GroupKey.Util.getSubKeys(groupKey); @@ -392,7 +400,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { return simpleResultSeriesKey; } } - + private class SeriesClickHandler implements SeriesClickEventHandler { @Override public boolean onClick(SeriesClickEvent seriesClickEvent) { @@ -404,14 +412,8 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } private Chart createChart() { - Chart chart = new Chart() - .setType(Series.Type.COLUMN) - .setMarginLeft(100) - .setMarginRight(45) - .setWidth100() - .setHeight100() - .setBorderColor(new Color("#F0AB00")) - .setPlotBorderWidth(0) + Chart chart = new Chart().setType(Series.Type.COLUMN).setMarginLeft(100).setMarginRight(45).setWidth100() + .setHeight100().setBorderColor(new Color("#F0AB00")).setPlotBorderWidth(0) .setCredits(new Credits().setEnabled(false)) .setChartTitle(new ChartTitle().setText(getStringMessages().dataMiningResult())); chart.setExporting(new Exporting().setEnabled(false)); @@ -431,8 +433,8 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } /** - * Attempts a drill-down for the {@code groupKey}. If a drill-down callback has been - * provided, it will be invoked; otherwise, this is a no-op. + * Attempts a drill-down for the {@code groupKey}. If a drill-down callback has been provided, it will be invoked; + * otherwise, this is a no-op. * * @return whether or not a drill-down was issued */ diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AbstractNumericDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProvider.java similarity index 86% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AbstractNumericDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProvider.java index 6a3efa85c83..ced9dd88b63 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AbstractNumericDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation.dataproviders; +package com.sap.sse.datamining.ui.presentation.dataproviders; import java.io.Serializable; import java.util.Collection; @@ -6,18 +6,17 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.Util.Triple; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.StringMessages; /** - * Maps a value of type {@code T} to a numeric value for display in a chart. The mapping - * is parameterized by a "data key" which can, e.g., be used to select different units in - * which to display the value.

+ * Maps a value of type {@code T} to a numeric value for display in a chart. The mapping is parameterized by a "data + * key" which can, e.g., be used to select different units in which to display the value. + *

* - * Subclasses should construct the mapping in their constructor and pass it on to this class's - * constructor. + * Subclasses should construct the mapping in their constructor and pass it on to this class's constructor. * * @author Lennart Hensler * @author Axel Uhl (d043530) @@ -39,13 +38,14 @@ public abstract class AbstractNumericDataProvider { public abstract Collection getDataKeys(QueryResultDTO result); public abstract boolean isValidDataKey(QueryResultDTO result, String dataKey); - + public abstract String getDefaultDataKeyFor(QueryResultDTO result); - - public abstract String getLocalizedNameForDataKey(QueryResultDTO result, StringMessages stringMessages, String dataKey); - + + public abstract String getLocalizedNameForDataKey(QueryResultDTO result, StringMessages stringMessages, + String dataKey); + protected abstract Function getMapping(QueryResultDTO result, String dataKey); - + /** * Provides the actual result data to be visualized primarily. The {@code result} entries are mapped to * {@link Number}s, based on the {@code dataKey} which is used to select the mapping out of those provided to this @@ -53,7 +53,8 @@ public abstract class AbstractNumericDataProvider { */ public Map getData(QueryResultDTO result, String dataKey) { if (!acceptsResultsOfType(result.getResultType())) { - throw new IllegalArgumentException("This data provider doesn't work for results of the type '" + result.getResultType() + "'"); + throw new IllegalArgumentException( + "This data provider doesn't work for results of the type '" + result.getResultType() + "'"); } Function mapping = getMapping(result, dataKey); if (mapping == null) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java similarity index 95% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java index ec4dc72e79c..73ad5c1aefd 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation.dataproviders; +package com.sap.sse.datamining.ui.presentation.dataproviders; import java.io.Serializable; import java.util.Collection; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AverageWithStatsDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AverageWithStatsDataProvider.java similarity index 84% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AverageWithStatsDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AverageWithStatsDataProvider.java index 0fdddaa5f78..151ebb39d7a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/AverageWithStatsDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AverageWithStatsDataProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation.dataproviders; +package com.sap.sse.datamining.ui.presentation.dataproviders; import java.io.Serializable; import java.util.Collection; @@ -8,11 +8,11 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.Function; -import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.Util.Triple; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.data.AverageWithStats; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.StringMessages; /** * An {@link AverageWithStats} object can be mapped to the {@link AverageWithStats#getAverage() average} value. @@ -22,28 +22,28 @@ import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; * tip. *

* - * Since {@link AverageWithStats} itself is a generic type, another {@link AbstractNumericDataProvider} is needed - * to map the values to be displayed (other than count which is already guaranteed to be of numeric type) to a - * numeric type. + * Since {@link AverageWithStats} itself is a generic type, another {@link AbstractNumericDataProvider} is needed to map + * the values to be displayed (other than count which is already guaranteed to be of numeric type) to a numeric type. * * @author Axel Uhl (d043530) * */ -public class AverageWithStatsDataProvider extends AbstractNumericDataProvider> { +public class AverageWithStatsDataProvider + extends AbstractNumericDataProvider> { final static Class _c = AverageWithStats.class; @SuppressWarnings("unchecked") final static Class> _cc = (Class>) _c; private final DataProvidersPrecedenceList innerProviders; - + public AverageWithStatsDataProvider(final DataProvidersPrecedenceList innerProviders) { - super(_cc ); + super(_cc); this.innerProviders = innerProviders; } - + /** * Optionally, a {@link QueryResultDTO query result} may provide {@link QueryResultDTO#getErrorMargins() error - * margin data} which can, if available, be visualized, e.g., by error bars. This method collects this error - * margin data and maps it through the {@link #mappings mapping} selected by the {@code dataKey}. + * margin data} which can, if available, be visualized, e.g., by error bars. This method collects this error margin + * data and maps it through the {@link #mappings mapping} selected by the {@code dataKey}. * * @param result * the result from which to extract error margins @@ -56,12 +56,14 @@ public class AverageWithStatsDataProvider extends AbstractNumericDataProvider> getErrorData(QueryResultDTO result, String dataKey) { if (!acceptsResultsOfType(result.getResultType())) { - throw new IllegalArgumentException("This data provider doesn't work for results of the type '" + result.getResultType() + "'"); + throw new IllegalArgumentException( + "This data provider doesn't work for results of the type '" + result.getResultType() + "'"); } return getErrorDataInternal(result, dataKey); } - private Map> getErrorDataInternal(QueryResultDTO result, String dataKey) { + private Map> getErrorDataInternal(QueryResultDTO result, + String dataKey) { @SuppressWarnings("unchecked") Function mapping = (Function) getInnerMapping(result, dataKey); if (mapping == null) { @@ -72,8 +74,8 @@ public class AverageWithStatsDataProvider extends AbstractNumericDataProvider aws = (AverageWithStats) e.getValue(); if (aws.getMin() != null && aws.getMax() != null) { - data.put(e.getKey(), new Triple<>(mapping.apply(aws.getMin()), - mapping.apply(aws.getMax()), aws.getCount())); + data.put(e.getKey(), + new Triple<>(mapping.apply(aws.getMin()), mapping.apply(aws.getMax()), aws.getCount())); } } return data.isEmpty() ? null : data; @@ -97,14 +99,15 @@ public class AverageWithStatsDataProvider extends AbstractNumericDataProvider provider = getProviderFromGenericResult(result); return provider == null ? "" : provider.getLocalizedNameForDataKey(result, stringMessages, dataKey); } - + /** * Picks the first result object of type {@link AverageWithStats} that can be found in {@code result}'s * {@link QueryResultDTO#getResults()} and passes it to the {@link #innerProviders}'s - * {@link DataProvidersPrecedenceList#selectCurrentDataProvider(QueryResultDTO)} method to determine the - * most appropriate inner provider to use for the result. + * {@link DataProvidersPrecedenceList#selectCurrentDataProvider(QueryResultDTO)} method to determine the most + * appropriate inner provider to use for the result. */ - private AbstractNumericDataProvider getProvider(QueryResultDTO> result) { + private AbstractNumericDataProvider getProvider( + QueryResultDTO> result) { AbstractNumericDataProvider provider = null; final Map> results = result.getResults(); for (final Entry> e : results.entrySet()) { @@ -115,7 +118,7 @@ public class AverageWithStatsDataProvider extends AbstractNumericDataProvider getDataKeys(QueryResultDTO result) { final AbstractNumericDataProvider provider = getProviderFromGenericResult(result); @@ -133,7 +136,8 @@ public class AverageWithStatsDataProvider extends AbstractNumericDataProvider, Number> getMapping(QueryResultDTO result, String dataKey) { + protected Function, Number> getMapping(QueryResultDTO result, + String dataKey) { final AbstractNumericDataProvider provider = getProviderFromGenericResult(result); return new Function, Number>() { @Override @@ -142,7 +146,8 @@ public class AverageWithStatsDataProvider extends AbstractNumericDataProvider Number doApply(Function mapping, V average) { + private Number doApply(Function mapping, + V average) { @SuppressWarnings("unchecked") final U castAverage = (U) average; return mapping.apply(castAverage); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/BearingDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/BearingDataProvider.java similarity index 77% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/BearingDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/BearingDataProvider.java index 6731e4a5672..29a62c5c4c4 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/BearingDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/BearingDataProvider.java @@ -1,25 +1,25 @@ -package com.sap.sailing.gwt.ui.datamining.presentation.dataproviders; +package com.sap.sse.datamining.ui.presentation.dataproviders; import java.util.LinkedHashMap; import java.util.function.Function; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.common.Bearing; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.StringMessages; public class BearingDataProvider extends AbstractNumericDataProviderWithStaticMappings { - + private static final String DEGREES = "Degrees"; private static final String RADIANS = "Radians"; public BearingDataProvider() { super(Bearing.class, getMappings()); } - + private static LinkedHashMap> getMappings() { LinkedHashMap> mappings = new LinkedHashMap<>(); - mappings.put(DEGREES, bearing->bearing.getDegrees()); - mappings.put(RADIANS, bearing->bearing.getRadians()); + mappings.put(DEGREES, bearing -> bearing.getDegrees()); + mappings.put(RADIANS, bearing -> bearing.getRadians()); return mappings; } @@ -31,7 +31,7 @@ public class BearingDataProvider extends AbstractNumericDataProviderWithStaticMa @Override public String getLocalizedNameForDataKey(QueryResultDTO result, StringMessages stringMessages, String dataKey) { switch (dataKey) { - case DEGREES: + case DEGREES: return stringMessages.angleInDegree(); case RADIANS: return stringMessages.angleInRadian(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DataProvidersPrecedenceList.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DataProvidersPrecedenceList.java similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DataProvidersPrecedenceList.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DataProvidersPrecedenceList.java index 63613f64b92..ddaf6170049 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DataProvidersPrecedenceList.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DataProvidersPrecedenceList.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.presentation.dataproviders; +package com.sap.sse.datamining.ui.presentation.dataproviders; import java.io.Serializable; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DistanceDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DistanceDataProvider.java similarity index 73% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DistanceDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DistanceDataProvider.java index 59d777238bb..dfd4edf5e97 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DistanceDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DistanceDataProvider.java @@ -1,14 +1,14 @@ -package com.sap.sailing.gwt.ui.datamining.presentation.dataproviders; +package com.sap.sse.datamining.ui.presentation.dataproviders; import java.util.LinkedHashMap; import java.util.function.Function; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.common.Distance; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.StringMessages; public class DistanceDataProvider extends AbstractNumericDataProviderWithStaticMappings { - + private static final String CENTRAL_ANGLE_RADIAN = "CentralAngleRadian"; private static final String CENTRAL_ANGLE_DEGREE = "CentralAngleDegree"; private static final String KILOMETERS = "Kilometers"; @@ -20,16 +20,16 @@ public class DistanceDataProvider extends AbstractNumericDataProviderWithStaticM public DistanceDataProvider() { super(Distance.class, getMappings()); } - + private static LinkedHashMap> getMappings() { LinkedHashMap> mappings = new LinkedHashMap<>(); - mappings.put(GEOGRAPHICAL_MILES, distance->distance.getGeographicalMiles()); - mappings.put(SEA_MILES, distance->distance.getSeaMiles()); - mappings.put(NAUTICAL_MILES, distance->distance.getNauticalMiles()); - mappings.put(METERS, distance->distance.getMeters()); - mappings.put(KILOMETERS, distance->distance.getKilometers()); - mappings.put(CENTRAL_ANGLE_DEGREE, distance->distance.getCentralAngleDeg()); - mappings.put(CENTRAL_ANGLE_RADIAN, distance->distance.getCentralAngleRad()); + mappings.put(GEOGRAPHICAL_MILES, distance -> distance.getGeographicalMiles()); + mappings.put(SEA_MILES, distance -> distance.getSeaMiles()); + mappings.put(NAUTICAL_MILES, distance -> distance.getNauticalMiles()); + mappings.put(METERS, distance -> distance.getMeters()); + mappings.put(KILOMETERS, distance -> distance.getKilometers()); + mappings.put(CENTRAL_ANGLE_DEGREE, distance -> distance.getCentralAngleDeg()); + mappings.put(CENTRAL_ANGLE_RADIAN, distance -> distance.getCentralAngleRad()); return mappings; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DurationDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DurationDataProvider.java similarity index 93% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DurationDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DurationDataProvider.java index 65711056126..601b40c1c6b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/DurationDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DurationDataProvider.java @@ -1,11 +1,11 @@ -package com.sap.sailing.gwt.ui.datamining.presentation.dataproviders; +package com.sap.sse.datamining.ui.presentation.dataproviders; import java.util.LinkedHashMap; import java.util.function.Function; -import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.Duration; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.StringMessages; public class DurationDataProvider extends AbstractNumericDataProviderWithStaticMappings { private static final String DAYS = "Days"; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/NumberDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/NumberDataProvider.java similarity index 55% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/NumberDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/NumberDataProvider.java index a0ee2218e89..8922f5841d3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/dataproviders/NumberDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/NumberDataProvider.java @@ -1,10 +1,10 @@ -package com.sap.sailing.gwt.ui.datamining.presentation.dataproviders; +package com.sap.sse.datamining.ui.presentation.dataproviders; import java.util.LinkedHashMap; import java.util.function.Function; -import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.StringMessages; public class NumberDataProvider extends AbstractNumericDataProviderWithStaticMappings { private final static String FLOAT = "Float"; @@ -13,29 +13,23 @@ public class NumberDataProvider extends AbstractNumericDataProviderWithStaticMap public NumberDataProvider() { super(Number.class, getMappings()); } - + private static LinkedHashMap> getMappings() { LinkedHashMap> mappings = new LinkedHashMap<>(); - mappings.put(FLOAT, number->number.doubleValue()); - mappings.put(INTEGER, number->number.intValue()); + mappings.put(FLOAT, number -> number.doubleValue()); + mappings.put(INTEGER, number -> number.intValue()); return mappings; } @Override public boolean acceptsResultsOfType(String type) { - return type.equals(Number.class.getName()) || - type.equals(Double.class.getName()) || - type.equals(Float.class.getName()) || - type.equals(Long.class.getName()) || - type.equals(Integer.class.getName()) || - type.equals(Short.class.getName()) || - type.equals(Byte.class.getName()) || - type.equals(double.class.getName()) || - type.equals(float.class.getName()) || - type.equals(long.class.getName()) || - type.equals(int.class.getName()) || - type.equals(short.class.getName()) || - type.equals(byte.class.getName()); + return type.equals(Number.class.getName()) || type.equals(Double.class.getName()) + || type.equals(Float.class.getName()) || type.equals(Long.class.getName()) + || type.equals(Integer.class.getName()) || type.equals(Short.class.getName()) + || type.equals(Byte.class.getName()) || type.equals(double.class.getName()) + || type.equals(float.class.getName()) || type.equals(long.class.getName()) + || type.equals(int.class.getName()) || type.equals(short.class.getName()) + || type.equals(byte.class.getName()); } @Override @@ -47,11 +41,10 @@ public class NumberDataProvider extends AbstractNumericDataProviderWithStaticMap public String getLocalizedNameForDataKey(QueryResultDTO result, StringMessages stringMessages, String dataKey) { switch (dataKey) { case FLOAT: - return stringMessages.floatNumber(); + return stringMessages.floatNumber(); // TODO extract into com.sap.sse.gwt.client.StringMessages case INTEGER: return stringMessages.integer(); } throw new IllegalArgumentException("The given data key '" + dataKey + "' isn't valid"); } - } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/AbstractQueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java similarity index 96% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/AbstractQueryDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java index 6c0050f4296..0a1ae9c0ba1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/AbstractQueryDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection; +package com.sap.sse.datamining.ui.selection; import java.util.ArrayList; import java.util.Collection; @@ -16,13 +16,13 @@ import com.google.gwt.user.client.ui.DialogBox; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.VerticalPanel; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.QueryDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.QueryDefinitionProvider; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.QueryDefinitionChangedListener; +import com.sap.sse.datamining.ui.QueryDefinitionProvider; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java similarity index 71% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java index 0d4f96bb270..2d396750bfe 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection; +package com.sap.sse.datamining.ui.selection; import java.util.ArrayList; import java.util.Collection; @@ -16,60 +16,59 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.shared.controls.AbstractObjectRenderer; -import com.sap.sailing.gwt.ui.datamining.AggregatorDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.AggregatorDefinitionProvider; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionProvider; -import com.sap.sailing.gwt.ui.datamining.ExtractionFunctionChangedListener; -import com.sap.sailing.gwt.ui.datamining.ExtractionFunctionProvider; import com.sap.sse.common.Util; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.AggregatorDefinitionChangedListener; +import com.sap.sse.datamining.ui.AggregatorDefinitionProvider; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.ExtractionFunctionChangedListener; +import com.sap.sse.datamining.ui.ExtractionFunctionProvider; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; +import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractComponent - implements ExtractionFunctionProvider, - AggregatorDefinitionProvider, - DataRetrieverChainDefinitionChangedListener { - +public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractComponent + implements ExtractionFunctionProvider, AggregatorDefinitionProvider, + DataRetrieverChainDefinitionChangedListener { + private static final String STATISTIC_PROVIDER_ELEMENT_STYLE = "statisticProviderElement"; - + private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final Collection extractionFunctionListeners; private final Collection aggregatorDefinitionListeners; - + private boolean isAwaitingReload; private DataRetrieverChainDefinitionDTO currentRetrieverChainDefinition; - + private final FlowPanel mainPanel; private final ValueListBox extractionFunctionListBox; private final ValueListBox aggregatorDefinitionListBox; - public ExtractionFunctionAndAggregatorDefinitionProvider(Component parent, ComponentContext context, StringMessages stringMessages, - DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, - DataRetrieverChainDefinitionProvider retrieverChainProvider) { + public ExtractionFunctionAndAggregatorDefinitionProvider(Component parent, ComponentContext context, + StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataRetrieverChainDefinitionProvider retrieverChainProvider) { super(parent, context); this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; extractionFunctionListeners = new HashSet<>(); aggregatorDefinitionListeners = new HashSet<>(); - + isAwaitingReload = false; currentRetrieverChainDefinition = null; - + HorizontalPanel selectionPanel = new HorizontalPanel(); extractionFunctionListBox = createExtractionFunctionListBox(); extractionFunctionListBox.addStyleName(STATISTIC_PROVIDER_ELEMENT_STYLE); @@ -77,7 +76,7 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC aggregatorDefinitionListBox = createAggregatorListBox(); aggregatorDefinitionListBox.addStyleName(STATISTIC_PROVIDER_ELEMENT_STYLE); selectionPanel.add(aggregatorDefinitionListBox); - + mainPanel = new FlowPanel(); Label label = new Label(this.stringMessages.calculateThe()); label.addStyleName(STATISTIC_PROVIDER_ELEMENT_STYLE); @@ -88,12 +87,13 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC } private ValueListBox createExtractionFunctionListBox() { - ValueListBox extractionFunctionListBox = new ValueListBox<>(new AbstractObjectRenderer() { - @Override - protected String convertObjectToString(FunctionDTO function) { - return function.getDisplayName(); - } - }); + ValueListBox extractionFunctionListBox = new ValueListBox<>( + new AbstractObjectRenderer() { + @Override + protected String convertObjectToString(FunctionDTO function) { + return function.getDisplayName(); + } + }); extractionFunctionListBox.addValueChangeHandler(new ValueChangeHandler() { @Override public void onValueChange(ValueChangeEvent event) { @@ -103,14 +103,15 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC }); return extractionFunctionListBox; } - + private ValueListBox createAggregatorListBox() { - ValueListBox aggregatorListBox = new ValueListBox(new AbstractObjectRenderer() { - @Override - protected String convertObjectToString(AggregationProcessorDefinitionDTO nonNullObject) { - return nonNullObject.getDisplayName(); - } - }); + ValueListBox aggregatorListBox = new ValueListBox( + new AbstractObjectRenderer() { + @Override + protected String convertObjectToString(AggregationProcessorDefinitionDTO nonNullObject) { + return nonNullObject.getDisplayName(); + } + }); aggregatorListBox.addValueChangeHandler(new ValueChangeHandler() { @Override public void onValueChange(ValueChangeEvent event) { @@ -119,23 +120,23 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC }); return aggregatorListBox; } - + @Override public void awaitReloadComponents() { isAwaitingReload = true; } - + @Override public boolean isAwatingReload() { return isAwaitingReload; } - + @Override public void reloadComponents() { isAwaitingReload = false; updateExtractionFunctions(); } - + @Override public void dataRetrieverChainDefinitionChanged(DataRetrieverChainDefinitionDTO newRetrieverChainDefinition) { if (!Objects.equals(currentRetrieverChainDefinition, newRetrieverChainDefinition)) { @@ -150,44 +151,51 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC if (currentRetrieverChainDefinition == null) { updateListBox(extractionFunctionListBox, Collections.emptyList()); } else { - dataMiningService.getStatisticsFor(currentRetrieverChainDefinition, LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback>() { - @Override - public void onSuccess(HashSet functions) { - List sortedFunctions = new ArrayList<>(functions); - Collections.sort(sortedFunctions); - updateListBox(extractionFunctionListBox, sortedFunctions); - } - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the available statistics from the server: " + caught.getMessage()); - } - }); + dataMiningService.getStatisticsFor(currentRetrieverChainDefinition, + LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback>() { + @Override + public void onSuccess(HashSet functions) { + List sortedFunctions = new ArrayList<>(functions); + Collections.sort(sortedFunctions); + updateListBox(extractionFunctionListBox, sortedFunctions); + } + + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError( + "Error fetching the available statistics from the server: " + caught.getMessage()); + } + }); } } - + private void updateAggregatorDefinitions() { if (getExtractionFunction() == null) { updateListBox(aggregatorDefinitionListBox, Collections.emptyList()); } else { - dataMiningService.getAggregatorDefinitionsFor(getExtractionFunction(), LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback>() { - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the available aggregators from the server: " + caught.getMessage()); - } - @Override - public void onSuccess(HashSet definitions) { - List sortedDefinitions = new ArrayList<>(definitions); - Collections.sort(sortedDefinitions); - updateListBox(aggregatorDefinitionListBox, sortedDefinitions); - } - }); + dataMiningService.getAggregatorDefinitionsFor(getExtractionFunction(), + LocaleInfo.getCurrentLocale().getLocaleName(), + new AsyncCallback>() { + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError( + "Error fetching the available aggregators from the server: " + caught.getMessage()); + } + + @Override + public void onSuccess(HashSet definitions) { + List sortedDefinitions = new ArrayList<>(definitions); + Collections.sort(sortedDefinitions); + updateListBox(aggregatorDefinitionListBox, sortedDefinitions); + } + }); } } - + private void updateListBox(ValueListBox listBox, Collection acceptableValues) { T currentValue = listBox.getValue(); T valueToBeSelected = acceptableValues.contains(currentValue) ? currentValue : Util.first(acceptableValues); - + listBox.setValue(valueToBeSelected, true); listBox.setAcceptableValues(acceptableValues); } @@ -211,7 +219,7 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC listener.aggregatorDefinitionChanged(aggregatorDefinition); } } - + @Override public void addExtractionFunctionChangedListener(ExtractionFunctionChangedListener listener) { extractionFunctionListeners.add(listener); @@ -266,7 +274,7 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC public void updateSettings(SerializableSettings newSettings) { // no-op } - + @Override public String getDependentCssClassName() { return "simpleStatisticsProvider"; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/MultiDimensionalGroupingProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java similarity index 96% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/MultiDimensionalGroupingProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java index f1b248139e3..b2db1f26c4c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/MultiDimensionalGroupingProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection; +package com.sap.sse.datamining.ui.selection; import java.util.ArrayList; import java.util.Collection; @@ -17,21 +17,21 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.shared.controls.AbstractObjectRenderer; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionProvider; -import com.sap.sailing.gwt.ui.datamining.GroupingChangedListener; -import com.sap.sailing.gwt.ui.datamining.GroupingProvider; import com.sap.sse.common.Util; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.GroupingChangedListener; +import com.sap.sse.datamining.ui.GroupingProvider; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; +import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public class MultiDimensionalGroupingProvider extends AbstractComponent diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/QueryDefinitionProviderWithControls.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/QueryDefinitionProviderWithControls.java similarity index 77% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/QueryDefinitionProviderWithControls.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/QueryDefinitionProviderWithControls.java index acd7a60d573..bf81102db84 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/QueryDefinitionProviderWithControls.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/QueryDefinitionProviderWithControls.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection; +package com.sap.sse.datamining.ui.selection; import java.io.Serializable; import java.util.ArrayList; @@ -18,27 +18,6 @@ import com.google.gwt.user.client.ui.SplitLayoutPanel; import com.google.gwt.user.client.ui.ToggleButton; import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.AggregatorDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.AggregatorDefinitionProvider; -import com.sap.sailing.gwt.ui.datamining.DataMiningComponentProvider; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.DataMiningSettingsControl; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionProvider; -import com.sap.sailing.gwt.ui.datamining.ExtractionFunctionChangedListener; -import com.sap.sailing.gwt.ui.datamining.ExtractionFunctionProvider; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionChangedListener; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionProvider; -import com.sap.sailing.gwt.ui.datamining.GroupingChangedListener; -import com.sap.sailing.gwt.ui.datamining.GroupingProvider; -import com.sap.sailing.gwt.ui.datamining.ResultsPresenter; -import com.sap.sailing.gwt.ui.datamining.WithControls; -import com.sap.sailing.gwt.ui.datamining.developer.PredefinedQueryRunner; -import com.sap.sailing.gwt.ui.datamining.developer.QueryDefinitionViewer; -import com.sap.sailing.gwt.ui.datamining.selection.filter.ListRetrieverChainFilterSelectionProvider; -import com.sap.sailing.gwt.ui.datamining.settings.AdvancedDataMiningSettings; -import com.sap.sailing.gwt.ui.datamining.settings.AdvancedDataMiningSettingsDialogComponent; import com.sap.sse.common.Util; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.DataMiningSession; @@ -50,6 +29,28 @@ import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO; +import com.sap.sse.datamining.ui.AggregatorDefinitionChangedListener; +import com.sap.sse.datamining.ui.AggregatorDefinitionProvider; +import com.sap.sse.datamining.ui.DataMiningComponentProvider; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.ExtractionFunctionChangedListener; +import com.sap.sse.datamining.ui.ExtractionFunctionProvider; +import com.sap.sse.datamining.ui.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.FilterSelectionProvider; +import com.sap.sse.datamining.ui.GroupingChangedListener; +import com.sap.sse.datamining.ui.GroupingProvider; +import com.sap.sse.datamining.ui.ResultsPresenter; +import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.WithControls; +import com.sap.sse.datamining.ui.developer.PredefinedQueryRunner; +import com.sap.sse.datamining.ui.developer.QueryDefinitionViewer; +import com.sap.sse.datamining.ui.selection.filter.ListRetrieverChainFilterSelectionProvider; +import com.sap.sse.datamining.ui.settings.AdvancedDataMiningSettings; +import com.sap.sse.datamining.ui.settings.AdvancedDataMiningSettingsDialogComponent; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.dialog.DataEntryDialog; import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback; @@ -62,7 +63,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition private static final double headerPanelHeight = 45; private static final double footerPanelHeight = 50; - + private final DockLayoutPanel mainPanel; private final FlowPanel controlsPanel; private final ToggleButton queryDefinitionViewerToggleButton; @@ -70,10 +71,10 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition private final PredefinedQueryRunner predefinedQueryRunner; private final DataMiningSettingsControl settingsControl; private final AdvancedDataMiningSettings settings; - + private final ProviderListener providerListener; private final Collection> providers; - + private final DataRetrieverChainDefinitionProvider retrieverChainProvider; private final ExtractionFunctionProvider extractionFunctionProvider; private final AggregatorDefinitionProvider aggregationDefinitionProvider; @@ -82,31 +83,33 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition private final FilterSelectionProvider filterSelectionProvider; public QueryDefinitionProviderWithControls(Component parent, ComponentContext context, - DataMiningSession session, StringMessages stringMessages, - DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, DataMiningSettingsControl settingsControl, - ResultsPresenter resultsPresenter) { + DataMiningSession session, StringMessages stringMessages, DataMiningServiceAsync dataMiningService, + ErrorReporter errorReporter, DataMiningSettingsControl settingsControl, + DataMiningSettingsInfoManager settingsManager, ResultsPresenter resultsPresenter) { super(parent, context, stringMessages, dataMiningService, errorReporter); providerListener = new ProviderListener(); // Creating the header panel, that contains the retriever chain provider and the controls controlsPanel = new FlowPanel(); controlsPanel.addStyleName("definitionProviderControls"); - + this.settingsControl = settingsControl; addControl(this.settingsControl.getEntryWidget()); settings = new AdvancedDataMiningSettings(); this.settingsControl.addSettingsComponent(this); - - queryDefinitionViewerToggleButton = new ToggleButton(getStringMessages().viewQueryDefinition(), new ClickHandler() { - @Override - public void onClick(ClickEvent event) { - filterSplitPanel.setWidgetHidden(queryDefinitionViewer.getEntryWidget(), !queryDefinitionViewerToggleButton.getValue()); - } - }); + + queryDefinitionViewerToggleButton = new ToggleButton(getStringMessages().viewQueryDefinition(), + new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + filterSplitPanel.setWidgetHidden(queryDefinitionViewer.getEntryWidget(), + !queryDefinitionViewerToggleButton.getValue()); + } + }); queryDefinitionViewer = new QueryDefinitionViewer(parent, context, getStringMessages()); addQueryDefinitionChangedListener(queryDefinitionViewer); predefinedQueryRunner = new PredefinedQueryRunner(parent, context, session, getStringMessages(), dataMiningService, errorReporter, resultsPresenter); - + Button clearSelectionButton = new Button(this.getStringMessages().clearSelection()); clearSelectionButton.addClickHandler(new ClickHandler() { @Override @@ -115,7 +118,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition } }); addControl(clearSelectionButton); - + Button reloadButton = new Button(getStringMessages().reload()); reloadButton.addClickHandler(new ClickHandler() { @Override @@ -129,16 +132,17 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition addControl(queryDefinitionViewerToggleButton); addControl(predefinedQueryRunner.getEntryWidget()); } - - SuggestBoxStatisticProvider statisticProvider = new SuggestBoxStatisticProvider(parent, context, getStringMessages(), - getDataMiningService(), getErrorReporter(), settingsControl); + + SuggestBoxStatisticProvider statisticProvider = new SuggestBoxStatisticProvider(parent, context, + getStringMessages(), getDataMiningService(), getErrorReporter(), settingsControl, settingsManager); + retrieverChainProvider = statisticProvider; retrieverChainProvider.addDataRetrieverChainDefinitionChangedListener(providerListener); - + SplitLayoutPanel headerPanel = new SplitLayoutPanel(15); headerPanel.addWest(statisticProvider.getEntryWidget(), 800); headerPanel.add(controlsPanel); - + extractionFunctionProvider = statisticProvider; extractionFunctionProvider.addExtractionFunctionChangedListener(providerListener); aggregationDefinitionProvider = statisticProvider; @@ -147,7 +151,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition groupingProvider = new MultiDimensionalGroupingProvider(parent, context, getStringMessages(), getDataMiningService(), getErrorReporter(), retrieverChainProvider); groupingProvider.addGroupingChangedListener(providerListener); - + filterSplitPanel = new SplitLayoutPanel(15); filterSplitPanel.addSouth(groupingProvider.getEntryWidget(), footerPanelHeight); filterSplitPanel.addEast(queryDefinitionViewer.getEntryWidget(), 600); @@ -156,11 +160,11 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition stringMessages, dataMiningService, errorReporter, retrieverChainProvider); filterSelectionProvider.addSelectionChangedListener(providerListener); filterSplitPanel.add(filterSelectionProvider.getEntryWidget()); - + mainPanel = new DockLayoutPanel(Unit.PX); mainPanel.addNorth(headerPanel, headerPanelHeight); mainPanel.add(filterSplitPanel); - + // Storing the different component providers in a list providers = new ArrayList<>(); providers.add(retrieverChainProvider); @@ -168,11 +172,11 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition providers.add(aggregationDefinitionProvider); providers.add(groupingProvider); providers.add(filterSelectionProvider); - + // Set await reload flag to initialize the components, when the retriever chains have been loaded providers.forEach(provider -> provider.awaitReloadComponents()); } - + /** * The first {@link FunctionDTO dimension} of which the {@code groupKey} is assumed to be an instance will be * removed from the {@link #groupingProvider}. A filter criterion for that dimension will be added to the @@ -194,7 +198,8 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition final Collection dimensionsToGroupBy = groupingProvider.getDimensionsToGroupBy(); if (!dimensionsToGroupBy.isEmpty()) { final FunctionDTO firstDimension = dimensionsToGroupBy.iterator().next(); - filterSelectionProvider.setHighestRetrieverLevelWithFilterDimension(firstDimension, (Serializable) groupKeyForSingleDimension.getValue()); + filterSelectionProvider.setHighestRetrieverLevelWithFilterDimension(firstDimension, + (Serializable) groupKeyForSingleDimension.getValue()); if (dimensionsToGroupBy.size() == 1) { letUserSelectADifferentFirstDimension(onSuccessCallback); } else { @@ -206,30 +211,28 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition private class FirstDimensionSelectionDialog extends DataEntryDialog { private ValueListBox dimensionChooser; - + public FirstDimensionSelectionDialog(DialogCallback callback) { - super( - getStringMessages().chooseDifferentDimensionTitle(), - getStringMessages().chooseDifferentDimensionMessage(), getStringMessages().ok(), - getStringMessages().cancel(), - new DataEntryDialog.Validator() { - @Override - public String getErrorMessage(FunctionDTO valueToValidate) { - if (valueToValidate == null) { - return getStringMessages().pleaseSelectADimension(); - } else { - return null; + super(getStringMessages().chooseDifferentDimensionTitle(), + getStringMessages().chooseDifferentDimensionMessage(), getStringMessages().ok(), + getStringMessages().cancel(), new DataEntryDialog.Validator() { + @Override + public String getErrorMessage(FunctionDTO valueToValidate) { + if (valueToValidate == null) { + return getStringMessages().pleaseSelectADimension(); + } else { + return null; + } } - } - }, callback); + }, callback); dimensionChooser = groupingProvider.createDimensionToGroupByBoxWithoutEventHandler(); Collection acceptableValues = new ArrayList<>(); Util.addAll(groupingProvider.getAvailableDimensions(), acceptableValues); acceptableValues.add(null); dimensionChooser.setAcceptableValues(acceptableValues); - dimensionChooser.addValueChangeHandler(e->validateAndUpdate()); + dimensionChooser.addValueChangeHandler(e -> validateAndUpdate()); } - + @Override protected Widget getAdditionalWidget() { return dimensionChooser; @@ -240,19 +243,20 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition return dimensionChooser.getValue(); } } - - private void letUserSelectADifferentFirstDimension(final Runnable onSuccessCallback) { - final FirstDimensionSelectionDialog dialog = new FirstDimensionSelectionDialog(new DialogCallback() { - @Override - public void ok(FunctionDTO dimensionToGroupBy) { - groupingProvider.setDimensionToGroupBy(0, dimensionToGroupBy); - onSuccessCallback.run(); - } - @Override - public void cancel() { - } - }); + private void letUserSelectADifferentFirstDimension(final Runnable onSuccessCallback) { + final FirstDimensionSelectionDialog dialog = new FirstDimensionSelectionDialog( + new DialogCallback() { + @Override + public void ok(FunctionDTO dimensionToGroupBy) { + groupingProvider.setDimensionToGroupBy(0, dimensionToGroupBy); + onSuccessCallback.run(); + } + + @Override + public void cancel() { + } + }); dialog.show(); } @@ -260,7 +264,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition public void awaitReloadComponents() { // Nothing to do here } - + @Override public boolean isAwatingReload() { for (DataMiningComponentProvider provider : providers) { @@ -270,7 +274,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition } return false; } - + @Override public void reloadComponents() { retrieverChainProvider.awaitReloadComponents(); @@ -280,24 +284,28 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition filterSelectionProvider.awaitReloadComponents(); retrieverChainProvider.reloadComponents(); } - + @Override public StatisticQueryDefinitionDTO getQueryDefinition() { - ModifiableStatisticQueryDefinitionDTO queryDTO = new ModifiableStatisticQueryDefinitionDTO(LocaleInfo.getCurrentLocale().getLocaleName(), extractionFunctionProvider.getExtractionFunction(), - aggregationDefinitionProvider.getAggregatorDefinition(), retrieverChainProvider.getDataRetrieverChainDefinition()); - + ModifiableStatisticQueryDefinitionDTO queryDTO = new ModifiableStatisticQueryDefinitionDTO( + LocaleInfo.getCurrentLocale().getLocaleName(), extractionFunctionProvider.getExtractionFunction(), + aggregationDefinitionProvider.getAggregatorDefinition(), + retrieverChainProvider.getDataRetrieverChainDefinition()); + for (FunctionDTO dimension : groupingProvider.getDimensionsToGroupBy()) { queryDTO.appendDimensionToGroupBy(dimension); } - - for (Entry retrieverSettingsEntry : retrieverChainProvider.getRetrieverSettings().entrySet()) { + + for (Entry retrieverSettingsEntry : retrieverChainProvider + .getRetrieverSettings().entrySet()) { queryDTO.setRetrieverSettings(retrieverSettingsEntry.getKey(), retrieverSettingsEntry.getValue()); } - - for (Entry>> filterSelectionEntry : filterSelectionProvider.getSelection().entrySet()) { + + for (Entry>> filterSelectionEntry : filterSelectionProvider + .getSelection().entrySet()) { queryDTO.setFilterSelectionFor(filterSelectionEntry.getKey(), filterSelectionEntry.getValue()); } - + return queryDTO; } @@ -318,7 +326,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition controlWidget.addStyleName("definitionProviderControlsElements"); controlsPanel.add(controlWidget); } - + @Override public void removeControl(Widget controlWidget) { controlsPanel.remove(controlWidget); @@ -355,7 +363,8 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition } @Override - public SettingsDialogComponent getSettingsDialogComponent(AdvancedDataMiningSettings settings) { + public SettingsDialogComponent getSettingsDialogComponent( + AdvancedDataMiningSettings settings) { return new AdvancedDataMiningSettingsDialogComponent(settings, getStringMessages()); } @@ -365,7 +374,8 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition settings.setDeveloperOptions(newSettings.isDeveloperOptions()); if (settings.isDeveloperOptions()) { addControl(queryDefinitionViewerToggleButton); - filterSplitPanel.setWidgetHidden(queryDefinitionViewer.getEntryWidget(), !queryDefinitionViewerToggleButton.getValue()); + filterSplitPanel.setWidgetHidden(queryDefinitionViewer.getEntryWidget(), + !queryDefinitionViewerToggleButton.getValue()); addControl(predefinedQueryRunner.getEntryWidget()); } else { removeControl(queryDefinitionViewerToggleButton); @@ -384,16 +394,18 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition public String getId() { return "QueryDefinitionProviderWithControls"; } - - private class ProviderListener implements DataRetrieverChainDefinitionChangedListener, ExtractionFunctionChangedListener, - AggregatorDefinitionChangedListener, GroupingChangedListener, FilterSelectionChangedListener { + + private class ProviderListener + implements DataRetrieverChainDefinitionChangedListener, ExtractionFunctionChangedListener, + AggregatorDefinitionChangedListener, GroupingChangedListener, FilterSelectionChangedListener { @Override - public void dataRetrieverChainDefinitionChanged(DataRetrieverChainDefinitionDTO newDataRetrieverChainDefinition) { + public void dataRetrieverChainDefinitionChanged( + DataRetrieverChainDefinitionDTO newDataRetrieverChainDefinition) { if (isAwatingReload()) { groupingProvider.dataRetrieverChainDefinitionChanged(newDataRetrieverChainDefinition); groupingProvider.reloadComponents(); - + filterSelectionProvider.dataRetrieverChainDefinitionChanged(newDataRetrieverChainDefinition); filterSelectionProvider.reloadComponents(); } else { @@ -428,7 +440,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition notifyQueryDefinitionChanged(); } } - + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/RetrieverLevelSettingsComponent.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java similarity index 96% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/RetrieverLevelSettingsComponent.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java index 50f4e7bad53..1d49a0542e1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/RetrieverLevelSettingsComponent.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection; +package com.sap.sse.datamining.ui.selection; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.SerializableSettings; @@ -20,7 +20,7 @@ public abstract class RetrieverLevelSettingsComponent extends AbstractComponent< this.localizedName = localizedName; this.componentId = componentId; } - + public DataRetrieverLevelDTO getRetrieverLevel() { return retrieverLevel; } @@ -59,7 +59,7 @@ public abstract class RetrieverLevelSettingsComponent extends AbstractComponent< public SerializableSettings getSettings() { return retrieverLevel.getDefaultSettings(); } - + @Override public String getId() { return componentId; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleDataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java similarity index 80% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleDataRetrieverChainDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java index 8aca7d0a541..ce02931e2f5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleDataRetrieverChainDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection; +package com.sap.sse.datamining.ui.selection; import java.util.ArrayList; import java.util.Collections; @@ -18,18 +18,18 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.DataMiningSettingsControl; -import com.sap.sailing.gwt.ui.datamining.DataMiningSettingsInfo; -import com.sap.sailing.gwt.ui.datamining.DataMiningSettingsInfoManager; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionProvider; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.DataMiningSettingsInfo; +import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; @@ -38,27 +38,27 @@ import com.sap.sse.gwt.client.shared.components.CompositeTabbedSettingsDialogCom import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponent implements DataRetrieverChainDefinitionProvider { - +public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponent + implements DataRetrieverChainDefinitionProvider { + private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final Set listeners; private boolean isAwaitingReload; - + private final HorizontalPanel mainPanel; private final ValueListBox retrieverChainsListBox; - + private final DataMiningSettingsInfoManager settingsManager; private final DataMiningSettingsControl settingsControl; private final Map> settingsMap; private final List> retrieverLevelSettingsComponents; - + public SimpleDataRetrieverChainDefinitionProvider(Component parent, ComponentContext context, - final StringMessages stringMessages, - DataMiningServiceAsync dataMiningService, - ErrorReporter errorReporter, DataMiningSettingsControl settingsControl) { + final StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningSettingsControl settingsControl, DataMiningSettingsInfoManager settingsManager) { super(parent, context); this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; @@ -66,29 +66,30 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen this.retrieverLevelSettingsComponents = new ArrayList<>(); listeners = new HashSet<>(); isAwaitingReload = false; - settingsManager = new DataMiningSettingsInfoManager(); + this.settingsManager = settingsManager; this.settingsControl = settingsControl; this.settingsControl.addSettingsComponent(this); settingsMap = new HashMap<>(); - + mainPanel = new HorizontalPanel(); mainPanel.setSpacing(5); mainPanel.add(new Label(this.stringMessages.analyze())); - + retrieverChainsListBox = createRetrieverChainsListBox(); mainPanel.add(retrieverChainsListBox); - + updateRetrieverChains(); } private ValueListBox createRetrieverChainsListBox() { - ValueListBox retrieverChainsListBox = new ValueListBox<>(new AbstractRenderer() { - @Override - public String render(DataRetrieverChainDefinitionDTO retrieverChain) { - return retrieverChain == null ? "" : retrieverChain.getName(); - } - - }); + ValueListBox retrieverChainsListBox = new ValueListBox<>( + new AbstractRenderer() { + @Override + public String render(DataRetrieverChainDefinitionDTO retrieverChain) { + return retrieverChain == null ? "" : retrieverChain.getName(); + } + + }); retrieverChainsListBox.addValueChangeHandler(new ValueChangeHandler() { @Override public void onValueChange(ValueChangeEvent event) { @@ -102,17 +103,17 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen public void awaitReloadComponents() { isAwaitingReload = true; } - + @Override public boolean isAwatingReload() { return isAwaitingReload; } - + @Override public void reloadComponents() { updateRetrieverChains(); } - + private void updateRetrieverChains() { dataMiningService.getDataRetrieverChainDefinitions(LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback>() { @@ -122,28 +123,31 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen if (!dataRetrieverChainDefinitions.isEmpty()) { fillSettingsMap(dataRetrieverChainDefinitions); Collections.sort(dataRetrieverChainDefinitions); - + DataRetrieverChainDefinitionDTO currentRetrieverChain = getDataRetrieverChainDefinition(); - DataRetrieverChainDefinitionDTO retrieverChainToBeSelected = dataRetrieverChainDefinitions.contains(currentRetrieverChain) ? - currentRetrieverChain : - dataRetrieverChainDefinitions.get(0); - + DataRetrieverChainDefinitionDTO retrieverChainToBeSelected = dataRetrieverChainDefinitions + .contains(currentRetrieverChain) ? currentRetrieverChain + : dataRetrieverChainDefinitions.get(0); + retrieverChainsListBox.setValue(retrieverChainToBeSelected); retrieverChainsListBox.setAcceptableValues(dataRetrieverChainDefinitions); - + if (isAwaitingReload || !retrieverChainToBeSelected.equals(currentRetrieverChain)) { isAwaitingReload = false; notifyListeners(); } } else { retrieverChainsListBox.setValue(null); - retrieverChainsListBox.setAcceptableValues(new ArrayList()); + retrieverChainsListBox + .setAcceptableValues(new ArrayList()); notifyListeners(); } } + @Override public void onFailure(Throwable caught) { - errorReporter.reportError("Error retrieving the available DataRetrieverChainDefinitions: " + caught.getMessage()); + errorReporter.reportError( + "Error retrieving the available DataRetrieverChainDefinitions: " + caught.getMessage()); } }); } @@ -165,7 +169,7 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen public void addDataRetrieverChainDefinitionChangedListener(DataRetrieverChainDefinitionChangedListener listener) { listeners.add(listener); } - + private void notifyListeners() { DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition = getDataRetrieverChainDefinition(); for (DataRetrieverChainDefinitionChangedListener listener : listeners) { @@ -202,7 +206,7 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen public String getDependentCssClassName() { return "simpleDataRetrieverChainDefinition"; } - + @Override public HashMap getRetrieverSettings() { if (settingsMap.containsKey(getDataRetrieverChainDefinition())) { @@ -226,17 +230,21 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen private List> createSettingsComponentsFor(final DataRetrieverChainDefinitionDTO retrieverChain) { List> settingsComponents = new ArrayList<>(); - for (Entry retrieverLevelSettings : settingsMap.get(retrieverChain).entrySet()) { + for (Entry retrieverLevelSettings : settingsMap.get(retrieverChain) + .entrySet()) { final DataRetrieverLevelDTO retrieverLevel = retrieverLevelSettings.getKey(); final Class settingsType = retrieverLevelSettings.getValue().getClass(); DataMiningSettingsInfo settingsInfo = settingsManager.getSettingsInfo(settingsType); settingsComponents.add(new RetrieverLevelSettingsComponent(SimpleDataRetrieverChainDefinitionProvider.this, - getComponentContext(), - retrieverLevel, settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { + getComponentContext(), retrieverLevel, settingsInfo.getId(), + settingsInfo.getLocalizedName(stringMessages)) { @Override - public SettingsDialogComponent getSettingsDialogComponent(SerializableSettings settings) { - return settingsManager.getSettingsInfo(settingsType).createSettingsDialogComponent(settingsMap.get(retrieverChain).get(retrieverLevel)); + public SettingsDialogComponent getSettingsDialogComponent( + SerializableSettings settings) { + return settingsManager.getSettingsInfo(settingsType) + .createSettingsDialogComponent(settingsMap.get(retrieverChain).get(retrieverLevel)); } + @Override public void updateSettings(SerializableSettings newSettings) { settingsMap.get(retrieverChain).put(retrieverLevel, newSettings); @@ -248,9 +256,11 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen @Override public void updateSettings(CompositeSettings newSettings) { - Map chainSettings = settingsMap.get(getDataRetrieverChainDefinition()); + Map chainSettings = settingsMap + .get(getDataRetrieverChainDefinition()); for (Entry settingsPerComponent : newSettings.getSettingsPerComponentId().entrySet()) { - RetrieverLevelSettingsComponent component = (RetrieverLevelSettingsComponent) findComponentById(settingsPerComponent.getKey()); + RetrieverLevelSettingsComponent component = (RetrieverLevelSettingsComponent) findComponentById( + settingsPerComponent.getKey()); SerializableSettings settings = (SerializableSettings) settingsPerComponent.getValue(); chainSettings.put(component.getRetrieverLevel(), settings); } @@ -265,29 +275,31 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen } return null; } - - @Override + + @Override public CompositeSettings getSettings() { Map settings = new HashMap<>(); - for (Entry retrieverLevelSettings : settingsMap.get(getDataRetrieverChainDefinition()).entrySet()) { + for (Entry retrieverLevelSettings : settingsMap + .get(getDataRetrieverChainDefinition()).entrySet()) { final DataRetrieverLevelDTO retrieverLevel = retrieverLevelSettings.getKey(); final Class settingsType = retrieverLevelSettings.getValue().getClass(); DataMiningSettingsInfo settingsInfo = settingsManager.getSettingsInfo(settingsType); RetrieverLevelSettingsComponent c = new RetrieverLevelSettingsComponent( SimpleDataRetrieverChainDefinitionProvider.this, getComponentContext(), retrieverLevel, - settingsInfo.getId(), - settingsInfo.getLocalizedName(stringMessages)) { + settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { @Override - public SettingsDialogComponent getSettingsDialogComponent(SerializableSettings settings) { + public SettingsDialogComponent getSettingsDialogComponent( + SerializableSettings settings) { return null; } + @Override public void updateSettings(SerializableSettings newSettings) { } }; settings.put(c.getId(), c.hasSettings() ? c.getSettings() : null); } - + return new CompositeSettings(settings); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SuggestBoxStatisticProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java similarity index 77% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SuggestBoxStatisticProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java index 37cff11861e..922f4cb2bb4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SuggestBoxStatisticProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection; +package com.sap.sse.datamining.ui.selection; import java.util.ArrayList; import java.util.Collection; @@ -22,19 +22,6 @@ import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.SuggestBox.DefaultSuggestionDisplay; import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.common.client.suggestion.AbstractListSuggestOracle; -import com.sap.sailing.gwt.common.client.suggestion.CustomSuggestBox; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.shared.controls.AbstractObjectRenderer; -import com.sap.sailing.gwt.ui.datamining.AggregatorDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.DataMiningSettingsControl; -import com.sap.sailing.gwt.ui.datamining.DataMiningSettingsInfo; -import com.sap.sailing.gwt.ui.datamining.DataMiningSettingsInfoManager; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionChangedListener; -import com.sap.sailing.gwt.ui.datamining.ExtractionFunctionChangedListener; -import com.sap.sailing.gwt.ui.datamining.StatisticChangedListener; -import com.sap.sailing.gwt.ui.datamining.StatisticProvider; import com.sap.sse.common.Util; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.common.settings.Settings; @@ -43,24 +30,36 @@ import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.AggregatorDefinitionChangedListener; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.DataMiningSettingsInfo; +import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.ExtractionFunctionChangedListener; +import com.sap.sse.datamining.ui.StatisticChangedListener; +import com.sap.sse.datamining.ui.StatisticProvider; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.CompositeSettings; import com.sap.sse.gwt.client.shared.components.CompositeTabbedSettingsDialogComponent; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; +import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; +import com.sap.sse.gwt.client.suggestion.AbstractListSuggestOracle; +import com.sap.sse.gwt.client.suggestion.CustomSuggestBox; /** - * A {@link StatisticProvider} that contains all statistics registered in the server. - * Each statistic is paired with the corresponding {@link DataRetrieverChainDefinitionDTO}. - * This provides a more comfortable access to the available statistics, without the need to - * specify the domain to analyze. + * A {@link StatisticProvider} that contains all statistics registered in the server. Each statistic is paired with the + * corresponding {@link DataRetrieverChainDefinitionDTO}. This provides a more comfortable access to the available + * statistics, without the need to specify the domain to analyze. * * @author Lennart Hensler */ public class SuggestBoxStatisticProvider extends AbstractComponent implements StatisticProvider { - + private static final String STATISTIC_PROVIDER_ELEMENT_STYLE = "statisticProviderElement"; private final StringMessages stringMessages; @@ -71,20 +70,20 @@ public class SuggestBoxStatisticProvider extends AbstractComponent aggregatorDefinitionListeners; private boolean isAwaitingReload; private int awaitingRetrieverChainStatistics; - + private final DataMiningSettingsInfoManager settingsManager; private final DataMiningSettingsControl settingsControl; private final Map> settingsMap; private final List> retrieverLevelSettingsComponents; - + private final FlowPanel mainPanel; private final List availableExtractionFunctions; private final ExtractionFunctionSuggestBox extractionFunctionSuggestBox; private final ValueListBox aggregatorListBox; public SuggestBoxStatisticProvider(Component parent, ComponentContext componentContext, - StringMessages stringMessages, DataMiningServiceAsync dataMiningService, - ErrorReporter errorReporter, DataMiningSettingsControl settingsControl) { + StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningSettingsControl settingsControl, DataMiningSettingsInfoManager settingsManager) { super(parent, componentContext); this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; @@ -93,18 +92,17 @@ public class SuggestBoxStatisticProvider extends AbstractComponent(); aggregatorDefinitionListeners = new HashSet<>(); isAwaitingReload = false; - - settingsManager = new DataMiningSettingsInfoManager(); + this.settingsManager = settingsManager; this.settingsControl = settingsControl; this.settingsControl.addSettingsComponent(this); settingsMap = new HashMap<>(); retrieverLevelSettingsComponents = new ArrayList<>(); - + mainPanel = new FlowPanel(); Label label = new Label(this.stringMessages.calculateThe()); label.addStyleName(STATISTIC_PROVIDER_ELEMENT_STYLE); mainPanel.add(label); - + availableExtractionFunctions = new ArrayList<>(); extractionFunctionSuggestBox = new ExtractionFunctionSuggestBox() { @Override @@ -122,21 +120,22 @@ public class SuggestBoxStatisticProvider extends AbstractComponent createAggregatorListBox() { - ValueListBox aggregatorListBox = new ValueListBox(new AbstractObjectRenderer() { - @Override - protected String convertObjectToString(AggregationProcessorDefinitionDTO nonNullObject) { - return nonNullObject.getDisplayName(); - } - }); + ValueListBox aggregatorListBox = new ValueListBox( + new AbstractObjectRenderer() { + @Override + protected String convertObjectToString(AggregationProcessorDefinitionDTO nonNullObject) { + return nonNullObject.getDisplayName(); + } + }); aggregatorListBox.addValueChangeHandler(new ValueChangeHandler() { @Override public void onValueChange(ValueChangeEvent event) { @@ -150,68 +149,74 @@ public class SuggestBoxStatisticProvider extends AbstractComponent>() { - @Override - public void onSuccess(ArrayList dataRetrieverChainDefinitions) { - settingsMap.clear(); - awaitingRetrieverChainStatistics = dataRetrieverChainDefinitions.size(); - availableExtractionFunctions.clear(); - if (awaitingRetrieverChainStatistics == 0) { - extractionFunctionSuggestBox.setSelectableValues(Collections.emptyList()); - } else { - for (DataRetrieverChainDefinitionDTO retrieverChain : dataRetrieverChainDefinitions) { - if (retrieverChain.hasSettings()) { - settingsMap.put(retrieverChain, retrieverChain.getDefaultSettings()); + new AsyncCallback>() { + @Override + public void onSuccess(ArrayList dataRetrieverChainDefinitions) { + settingsMap.clear(); + awaitingRetrieverChainStatistics = dataRetrieverChainDefinitions.size(); + availableExtractionFunctions.clear(); + if (awaitingRetrieverChainStatistics == 0) { + extractionFunctionSuggestBox.setSelectableValues(Collections.emptyList()); + } else { + for (DataRetrieverChainDefinitionDTO retrieverChain : dataRetrieverChainDefinitions) { + if (retrieverChain.hasSettings()) { + settingsMap.put(retrieverChain, retrieverChain.getDefaultSettings()); + } + dataMiningService.getStatisticsFor(retrieverChain, localeName, + new AsyncCallback>() { + @Override + public void onSuccess(HashSet statistics) { + collectStatistics(retrieverChain, statistics); + } + + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError( + "Error fetching the statistics for the retriever chain '" + + retrieverChain + "': " + caught.getMessage()); + collectStatistics(retrieverChain, Collections.emptySet()); + } + }); } - dataMiningService.getStatisticsFor(retrieverChain, localeName, new AsyncCallback>() { - @Override - public void onSuccess(HashSet statistics) { - collectStatistics(retrieverChain, statistics); - } - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the statistics for the retriever chain '" + - retrieverChain + "': " + caught.getMessage()); - collectStatistics(retrieverChain, Collections.emptySet()); - } - }); } } - } - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the retriever chain definitions: " + caught.getMessage()); - } - } - ); + + @Override + public void onFailure(Throwable caught) { + errorReporter + .reportError("Error fetching the retriever chain definitions: " + caught.getMessage()); + } + }); } - - private void collectStatistics(DataRetrieverChainDefinitionDTO retrieverChain, Iterable extractionFunctions) { + + private void collectStatistics(DataRetrieverChainDefinitionDTO retrieverChain, + Iterable extractionFunctions) { for (FunctionDTO extractionFunction : extractionFunctions) { availableExtractionFunctions.add(new ExtractionFunctionWithContext(retrieverChain, extractionFunction)); } - + awaitingRetrieverChainStatistics--; if (awaitingRetrieverChainStatistics == 0) { Collections.sort(availableExtractionFunctions); Map displayDuplicates = new HashMap<>(); for (ExtractionFunctionWithContext statistic : availableExtractionFunctions) { - ExtractionFunctionWithContext duplicate = displayDuplicates.get(statistic.getExtractionFunction().getDisplayName()); + ExtractionFunctionWithContext duplicate = displayDuplicates + .get(statistic.getExtractionFunction().getDisplayName()); if (duplicate == null) { displayDuplicates.put(statistic.getExtractionFunction().getDisplayName(), statistic); } else { @@ -220,41 +225,43 @@ public class SuggestBoxStatisticProvider extends AbstractComponent>() { - @Override - public void onSuccess(HashSet aggregators) { - List aggregatorsList = new ArrayList<>(aggregators); - Collections.sort(aggregatorsList); - updateListBox(aggregatorListBox, aggregatorsList); - } - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the aggregators for the extraction function'" + - extractionFunction + "': " + caught.getMessage()); - } - } - ); + dataMiningService.getAggregatorDefinitionsFor(extractionFunction, + LocaleInfo.getCurrentLocale().getLocaleName(), + new AsyncCallback>() { + @Override + public void onSuccess(HashSet aggregators) { + List aggregatorsList = new ArrayList<>(aggregators); + Collections.sort(aggregatorsList); + updateListBox(aggregatorListBox, aggregatorsList); + } + + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError("Error fetching the aggregators for the extraction function'" + + extractionFunction + "': " + caught.getMessage()); + } + }); } } - + private void updateListBox(ValueListBox listBox, Collection acceptableValues) { T currentValue = listBox.getValue(); T valueToBeSelected = acceptableValues.contains(currentValue) ? currentValue : Util.first(acceptableValues); - + listBox.setValue(valueToBeSelected, true); listBox.setAcceptableValues(acceptableValues); } @@ -282,16 +289,20 @@ public class SuggestBoxStatisticProvider extends AbstractComponent> createSettingsComponentsFor(final DataRetrieverChainDefinitionDTO retrieverChain) { List> settingsComponents = new ArrayList<>(); - for (Entry retrieverLevelSettings : settingsMap.get(retrieverChain).entrySet()) { + for (Entry retrieverLevelSettings : settingsMap.get(retrieverChain) + .entrySet()) { final DataRetrieverLevelDTO retrieverLevel = retrieverLevelSettings.getKey(); final Class settingsType = retrieverLevelSettings.getValue().getClass(); DataMiningSettingsInfo settingsInfo = settingsManager.getSettingsInfo(settingsType); - settingsComponents.add(new RetrieverLevelSettingsComponent(this, getComponentContext(), - retrieverLevel, settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { + settingsComponents.add(new RetrieverLevelSettingsComponent(this, getComponentContext(), retrieverLevel, + settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { @Override - public SettingsDialogComponent getSettingsDialogComponent(SerializableSettings settings) { - return settingsManager.getSettingsInfo(settingsType).createSettingsDialogComponent(settingsMap.get(retrieverChain).get(retrieverLevel)); + public SettingsDialogComponent getSettingsDialogComponent( + SerializableSettings settings) { + return settingsManager.getSettingsInfo(settingsType) + .createSettingsDialogComponent(settingsMap.get(retrieverChain).get(retrieverLevel)); } + @Override public void updateSettings(SerializableSettings newSettings) { settingsMap.get(retrieverChain).put(retrieverLevel, newSettings); @@ -303,9 +314,11 @@ public class SuggestBoxStatisticProvider extends AbstractComponent chainSettings = settingsMap.get(getDataRetrieverChainDefinition()); + Map chainSettings = settingsMap + .get(getDataRetrieverChainDefinition()); for (Entry settingsPerComponent : newSettings.getSettingsPerComponentId().entrySet()) { - RetrieverLevelSettingsComponent component = (RetrieverLevelSettingsComponent) findComponentById(settingsPerComponent.getKey()); + RetrieverLevelSettingsComponent component = (RetrieverLevelSettingsComponent) findComponentById( + settingsPerComponent.getKey()); SerializableSettings settings = (SerializableSettings) settingsPerComponent.getValue(); chainSettings.put(component.getRetrieverLevel(), settings); } @@ -320,31 +333,33 @@ public class SuggestBoxStatisticProvider extends AbstractComponent settings = new HashMap<>(); - for (Entry retrieverLevelSettings : settingsMap.get(getDataRetrieverChainDefinition()).entrySet()) { + for (Entry retrieverLevelSettings : settingsMap + .get(getDataRetrieverChainDefinition()).entrySet()) { final DataRetrieverLevelDTO retrieverLevel = retrieverLevelSettings.getKey(); final Class settingsType = retrieverLevelSettings.getValue().getClass(); DataMiningSettingsInfo settingsInfo = settingsManager.getSettingsInfo(settingsType); - RetrieverLevelSettingsComponent c = new RetrieverLevelSettingsComponent( - this, getComponentContext(), retrieverLevel, - settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { + RetrieverLevelSettingsComponent c = new RetrieverLevelSettingsComponent(this, getComponentContext(), + retrieverLevel, settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { @Override - public SettingsDialogComponent getSettingsDialogComponent(SerializableSettings settings) { + public SettingsDialogComponent getSettingsDialogComponent( + SerializableSettings settings) { return null; } + @Override public void updateSettings(SerializableSettings newSettings) { } }; settings.put(c.getId(), c.hasSettings() ? c.getSettings() : null); } - + return new CompositeSettings(settings); } - + @Override public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { DataRetrieverChainDefinitionDTO retrieverChain = queryDefinition.getDataRetrieverChainDefinition(); @@ -364,31 +379,31 @@ public class SuggestBoxStatisticProvider extends AbstractComponent { - + private final DataRetrieverChainDefinitionDTO retrieverChain; private final FunctionDTO extractionFunction; private final Collection matchingStrings; private boolean verbose; - - public ExtractionFunctionWithContext(DataRetrieverChainDefinitionDTO retrieverChain, FunctionDTO extractionFunction) { + + public ExtractionFunctionWithContext(DataRetrieverChainDefinitionDTO retrieverChain, + FunctionDTO extractionFunction) { this.retrieverChain = retrieverChain; this.extractionFunction = extractionFunction; matchingStrings = new ArrayList<>(2); @@ -482,7 +498,7 @@ public class SuggestBoxStatisticProvider extends AbstractComponent getMatchingStrings() { return matchingStrings; } @@ -494,21 +510,23 @@ public class SuggestBoxStatisticProvider extends AbstractComponent { - + private final AbstractListSuggestOracle suggestOracle; private ExtractionFunctionWithContext extractionFunction; - + @SuppressWarnings("unchecked") public ExtractionFunctionSuggestBox() { super(new AbstractListSuggestOracle() { @@ -572,39 +590,39 @@ public class SuggestBoxStatisticProvider extends AbstractComponent) getSuggestOracle(); addSuggestionSelectionHandler(this::setExtractionFunction); } - + public void setSelectableValues(Collection selectableValues) { suggestOracle.setSelectableValues(selectableValues); } - + public void setExtractionFunction(ExtractionFunctionWithContext extractionFunction) { if (!Objects.equals(this.extractionFunction, extractionFunction)) { this.extractionFunction = extractionFunction; onValueChange(); } } - + public ExtractionFunctionWithContext getExtractionFunction() { return extractionFunction; } - + protected abstract void onValueChange(); - + } - + private static class ScrollableSuggestionDisplay extends DefaultSuggestionDisplay { - + public ScrollableSuggestionDisplay() { PopupPanel popupPanel = getPopupPanel(); popupPanel.addStyleName("statisticSuggestBoxPopup"); } - + @Override protected void moveSelectionUp() { super.moveSelectionUp(); scrollSelectedItemIntoView(); } - + @Override protected void moveSelectionDown() { super.moveSelectionDown(); @@ -614,12 +632,12 @@ public class SuggestBoxStatisticProvider extends AbstractComponent dimensionListBox; private final DimensionChangedHandler dimensionChangedHandler; private final ToggleButton toggleFilterButton; - + private final SimpleBusyIndicator busyIndicator; private final FilterableSelectionTable selectionTable; private Collection selectionToBeApplied; - - public DimensionFilterSelectionProvider(DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, DataMiningSession session, - RetrieverLevelFilterSelectionProvider retrieverLevelSelectionProvider) { + + public DimensionFilterSelectionProvider(DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningSession session, RetrieverLevelFilterSelectionProvider retrieverLevelSelectionProvider) { this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; this.session = session; this.retrieverLevelSelectionProvider = retrieverLevelSelectionProvider; counter = new SimpleManagedDataMiningQueriesCounter(); - + mainPanel = new FlowPanel(); - + controlsPanel = new HorizontalPanel(); controlsPanel.setSpacing(2); mainPanel.add(controlsPanel); - + dimensionListBox = new ValueListBox(new AbstractObjectRenderer() { @Override protected String convertObjectToString(FunctionDTO function) { @@ -97,25 +97,26 @@ class DimensionFilterSelectionProvider { }); toggleFilterButton.setVisible(false); controlsPanel.add(toggleFilterButton); - + busyIndicator = new SimpleBusyIndicator(true, 0.7f); busyIndicator.setVisible(false); mainPanel.add(busyIndicator); - + selectionTable = new FilterableSelectionTable<>(); selectionTable.addSelectionChangeHandler(new FilterSelectionChangedListener() { @Override public void selectionChanged() { - DimensionFilterSelectionProvider.this.retrieverLevelSelectionProvider.dimensionFilterSelectionChanged(DimensionFilterSelectionProvider.this); + DimensionFilterSelectionProvider.this.retrieverLevelSelectionProvider + .dimensionFilterSelectionChanged(DimensionFilterSelectionProvider.this); } }); selectionTable.setVisible(false); mainPanel.add(selectionTable.getWidget()); } - + private class DimensionChangedHandler implements ValueChangeHandler { boolean firstChange = true; - + @Override public void onValueChange(ValueChangeEvent event) { final FunctionDTO dimension = event.getValue(); @@ -141,30 +142,35 @@ class DimensionFilterSelectionProvider { retrieverLevelSelectionProvider.updateAvailableDimensions(); } } - + private void fetchAndSetAvailableData() { fetchAndDisplayAvailableData(false, true, null); } - - void fetchAndUpdateAvailableData(final Iterator retrieverLevelSelectionProviderIterator) { + + void fetchAndUpdateAvailableData( + final Iterator retrieverLevelSelectionProviderIterator) { fetchAndDisplayAvailableData(true, false, retrieverLevelSelectionProviderIterator); } - + /** * Fetches the dimension values from the server and displays it. The data is filtered by the current filter * selection (of all retriever levels). * - * @param isUpdate true, if the call should update the data and preserve the selection and - * false, if it should override the data and clear the selection. - * @param selectionChangedCallback An {@link AsyncCallback} to react, if the selection has been changed or not. + * @param isUpdate + * true, if the call should update the data and preserve the selection and + * false, if it should override the data and clear the selection. + * @param selectionChangedCallback + * An {@link AsyncCallback} to react, if the selection has been changed or not. */ private void fetchAndDisplayAvailableData(final boolean isUpdate, final boolean notifyListenersWhenSelectionChanged, final Iterator retrieverLevelSelectionProviderIterator) { final FunctionDTO dimension = getSelectedDimension(); HashSet dimensionDTOs = new HashSet<>(); dimensionDTOs.add(dimension); - HashMap retrieverSettingsDTO = retrieverLevelSelectionProvider.getRetrieverSettings(); - HashMap>> filterSelectionDTO = retrieverLevelSelectionProvider.getCompleteFilterSelection(); + HashMap retrieverSettingsDTO = retrieverLevelSelectionProvider + .getRetrieverSettings(); + HashMap>> filterSelectionDTO = retrieverLevelSelectionProvider + .getCompleteFilterSelection(); DataRetrieverLevelDTO retrieverLevel = retrieverLevelSelectionProvider.getRetrieverLevel(); if (filterSelectionDTO.containsKey(retrieverLevel)) { filterSelectionDTO.get(retrieverLevel).remove(dimension); @@ -173,12 +179,13 @@ class DimensionFilterSelectionProvider { counter.increase(); dataMiningService.getDimensionValuesFor(session, retrieverLevelSelectionProvider.getDataRetrieverChain(), retrieverLevel, dimensionDTOs, retrieverSettingsDTO, filterSelectionDTO, - LocaleInfo.getCurrentLocale().getLocaleName(), new ManagedDataMiningQueryCallback>(counter) { + LocaleInfo.getCurrentLocale().getLocaleName(), + new ManagedDataMiningQueryCallback>(counter) { @Override protected void handleSuccess(QueryResultDTO> result) { Map> results = result.getResults(); List content = new ArrayList(); - + if (!results.isEmpty()) { GroupKey contentKey = new GenericGroupKey(dimension); content.addAll(results.get(contentKey)); @@ -190,36 +197,39 @@ class DimensionFilterSelectionProvider { } }); } - + boolean selectionChanged; if (!isUpdate || content.isEmpty()) { selectionChanged = selectionTable.setContent(content, notifyListenersWhenSelectionChanged); } else { - selectionChanged = selectionTable.updateContent(content, notifyListenersWhenSelectionChanged); + selectionChanged = selectionTable.updateContent(content, + notifyListenersWhenSelectionChanged); } updateSelectionTable(notifyListenersWhenSelectionChanged); busyIndicator.setVisible(false); selectionTable.setVisible(true); toggleFilterButton.setVisible(true); - + if (retrieverLevelSelectionProviderIterator != null) { if (selectionChanged) { - //Update the complete retriever level, because the selection changed + // Update the complete retriever level, because the selection changed retrieverLevelSelectionProvider.updateAvailableData(getSelectedDimension()); } else { - //Continue with the update of the retriever level selection provider - retrieverLevelSelectionProvider.updateAvailableData(getSelectedDimension(), retrieverLevelSelectionProviderIterator); + // Continue with the update of the retriever level selection provider + retrieverLevelSelectionProvider.updateAvailableData(getSelectedDimension(), + retrieverLevelSelectionProviderIterator); } } } + @Override protected void handleFailure(Throwable caught) { - errorReporter.reportError("Error fetching the dimension values of " + dimension + ": " - + caught.getMessage()); + errorReporter.reportError( + "Error fetching the dimension values of " + dimension + ": " + caught.getMessage()); } }); } - + /** * If {@code #selectionToBeApplied} is not {@code null}, the table displaying the selection will have its selection * model updated based on the contents of {@link #selectionToBeApplied}, and {@link #selectionToBeApplied} will be @@ -247,7 +257,7 @@ class DimensionFilterSelectionProvider { public HashSet getSelection() { return selectionTable.getSelection(); } - + void clearSelection() { selectionTable.clearSelection(); } @@ -257,9 +267,9 @@ class DimensionFilterSelectionProvider { dimensionListBox.setValue(functionDTO, true); selectionToBeApplied = selection; } - + public Widget getEntryWidget() { return mainPanel; } - + } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterTable.css b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTable.css similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterTable.css rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTable.css diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterTableResources.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTableResources.java similarity index 83% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterTableResources.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTableResources.java index 3c9f1471af9..24b0092e355 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterTableResources.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTableResources.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection.filter; +package com.sap.sse.datamining.ui.selection.filter; import com.google.gwt.user.cellview.client.CellTable; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterableSelectionTable.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterableSelectionTable.java similarity index 94% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterableSelectionTable.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterableSelectionTable.java index 119fc57c9c3..ac27793c763 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/FilterableSelectionTable.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterableSelectionTable.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection.filter; +package com.sap.sse.datamining.ui.selection.filter; import java.io.Serializable; import java.util.ArrayList; @@ -22,14 +22,14 @@ import com.google.gwt.view.client.DefaultSelectionEventManager.SelectAction; import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.ProvidesKey; import com.google.gwt.view.client.SelectionChangeEvent; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.FilterSelectionChangedListener; import com.sap.sse.gwt.client.celltable.BaseCelltable; import com.sap.sse.gwt.client.panels.AbstractFilterablePanel; public class FilterableSelectionTable { private final Set listeners; - + private final Collection allData; private final FlowPanel mainPanel; @@ -37,18 +37,18 @@ public class FilterableSelectionTable { private final CellTable table; private final ControllableMultiSelectionModel selectionModel; private final ListDataProvider dataProvider; - + public FilterableSelectionTable() { listeners = new HashSet<>(); - + allData = new ArrayList(); - + FilterTableResources tableRes = GWT.create(FilterTableResources.class); table = new BaseCelltable<>(Integer.MAX_VALUE, tableRes); table.setWidth("100%"); table.setAutoHeaderRefreshDisabled(true); table.setAutoFooterRefreshDisabled(true); - + TextColumn contentColumn = new TextColumn() { @Override public String getValue(ContentType content) { @@ -56,7 +56,7 @@ public class FilterableSelectionTable { } }; contentColumn.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER); - + selectionModel = new ControllableMultiSelectionModel<>(); final Column checkColumn = new Column( new CheckboxCell(true, false)) { @@ -65,7 +65,7 @@ public class FilterableSelectionTable { return selectionModel.isSelected(object); } }; - + dataProvider = new ListDataProvider(new ProvidesKey() { @Override public Object getKey(ContentType item) { @@ -73,10 +73,10 @@ public class FilterableSelectionTable { } }); dataProvider.addDataDisplay(table); - + table.addColumn(checkColumn); table.addColumn(contentColumn); - + selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { @Override public void onSelectionChange(SelectionChangeEvent event) { @@ -110,7 +110,7 @@ public class FilterableSelectionTable { return columnIndex == table.getColumnIndex(checkColumn); } })); - + filterPanel = new AbstractFilterablePanel(allData, table, dataProvider) { @Override public Iterable getSearchableStrings(ContentType content) { @@ -123,12 +123,12 @@ public class FilterableSelectionTable { filterPanel.setWidth("95%"); filterPanel.getTextBox().setWidth("95%"); filterPanel.setVisible(false); - + mainPanel = new FlowPanel(); mainPanel.add(filterPanel); mainPanel.add(table); } - + private String getElementAsString(ContentType element) { return element.toString(); } @@ -136,9 +136,10 @@ public class FilterableSelectionTable { /** * Replaces the current content of the table with the new one and clears the current selection.
* Returns true and notifies the listeners, if the selection changed. + * * @param newContent */ - @SuppressWarnings("unchecked") //You can't use instanceof for generic type parameters + @SuppressWarnings("unchecked") // You can't use instanceof for generic type parameters public boolean setContent(Collection newContent, boolean notifyListenersWhenSelectionChanged) { Collection specificNewContent = null; try { @@ -157,14 +158,15 @@ public class FilterableSelectionTable { } return !previousSelection.isEmpty(); } - + /** * Replaces the current content of the table with the new one, while preserving the current selection.
* Returns true and notifies the listeners, if previously selected elements have been removed. + * * @param newContent * @return true, if previously selected elements have been removed. */ - @SuppressWarnings("unchecked") //You can't use instanceof for generic type parameters + @SuppressWarnings("unchecked") // You can't use instanceof for generic type parameters public boolean updateContent(Collection newContent, boolean notifyListenersWhenSelectionChanged) { Collection specificNewContent = null; try { @@ -186,12 +188,13 @@ public class FilterableSelectionTable { /** * Unselects the selected elements, that aren't in the data anymore. + * * @return true, if elements have been unselected; */ private boolean cleanSelection(boolean notifyListenersWhenSelectionChanged) { boolean selectionChanged = false; selectionModel.setBlockNotifications(true); - + for (ContentType selectedElement : getSelection()) { Object selectedElementKey = dataProvider.getKey(selectedElement); boolean contentContainsSelectedElement = false; @@ -226,7 +229,7 @@ public class FilterableSelectionTable { public void setSelection(Iterable elements, boolean notifyListenersWhenSelectionChanged) { try { - @SuppressWarnings("unchecked") //You can't use instanceof for generic type parameters + @SuppressWarnings("unchecked") // You can't use instanceof for generic type parameters Iterable specificContent = (Iterable) elements; selectionModel.setBlockNotifications(!notifyListenersWhenSelectionChanged); clearSelection(); @@ -236,21 +239,22 @@ public class FilterableSelectionTable { if (!notifyListenersWhenSelectionChanged) { selectionModel.setBlockNotifications(false); } - } catch (ClassCastException e) {/*Ignore the elements, because they don't match the ContentType*/} + } catch (ClassCastException e) { + /* Ignore the elements, because they don't match the ContentType */} } - + public void clearSelection() { selectionModel.clear(); } - + public void addSelectionChangeHandler(FilterSelectionChangedListener handler) { listeners.add(handler); } - + public boolean isFilteringEnabled() { return filterPanel.isVisible(); } - + public void setFilteringEnabled(boolean visible) { filterPanel.setVisible(visible); if (visible) { @@ -258,11 +262,11 @@ public class FilterableSelectionTable { filterPanel.getTextBox().selectAll(); } } - + public void setVisible(boolean visible) { mainPanel.setVisible(visible); } - + public Widget getWidget() { return mainPanel; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/ListRetrieverChainFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ListRetrieverChainFilterSelectionProvider.java similarity index 71% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/ListRetrieverChainFilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ListRetrieverChainFilterSelectionProvider.java index 86b5cc735ce..90e340c6749 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/ListRetrieverChainFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ListRetrieverChainFilterSelectionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection.filter; +package com.sap.sse.datamining.ui.selection.filter; import java.io.Serializable; import java.util.Collections; @@ -24,13 +24,6 @@ import com.google.gwt.user.client.ui.Widget; import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.SelectionChangeEvent; import com.google.gwt.view.client.SingleSelectionModel; -import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; -import com.sap.sailing.gwt.ui.datamining.DataRetrieverChainDefinitionProvider; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionChangedListener; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionPresenter; -import com.sap.sailing.gwt.ui.datamining.FilterSelectionProvider; -import com.sap.sailing.gwt.ui.datamining.presentation.PlainFilterSelectionPresenter; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; @@ -38,13 +31,21 @@ import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.ReducedDimensionsDTO; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.FilterSelectionPresenter; +import com.sap.sse.datamining.ui.FilterSelectionProvider; +import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.presentation.PlainFilterSelectionPresenter; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent implements FilterSelectionProvider { +public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent + implements FilterSelectionProvider { private final DataMiningSession session; private final StringMessages stringMessages; @@ -57,7 +58,7 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent private boolean blockDataUpdates; private DataRetrieverChainDefinitionDTO retrieverChain; private final Map selectionProvidersMappedByRetrievedDataType; - + private final DockLayoutPanel mainPanel; private final CellList retrieverLevelList; private final SingleSelectionModel retrieverLevelSelectionModel; @@ -65,19 +66,18 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent private final ScrollPanel selectionPanel; private final FilterSelectionPresenter selectionPresenter; private final ScrollPanel selectionPresenterScrollPanel; - + /** - * When the {@link #retrieverLevelList retriever levels} have been received, this field is initialized - * with the mapping of dimension functions to the reduced set shown in the per-level filters. This way, - * an original dimension can be {@link ReducedDimensionsDTO#getReducedDimension(FunctionDTO) mapped} to - * its corresponding dimension from the reduced set of dimensions that are shown in the per-level filters. + * When the {@link #retrieverLevelList retriever levels} have been received, this field is initialized with the + * mapping of dimension functions to the reduced set shown in the per-level filters. This way, an original dimension + * can be {@link ReducedDimensionsDTO#getReducedDimension(FunctionDTO) mapped} to its corresponding dimension from + * the reduced set of dimensions that are shown in the per-level filters. */ private ReducedDimensionsDTO reducedDimensions; public ListRetrieverChainFilterSelectionProvider(Component parent, ComponentContext context, - DataMiningSession session, StringMessages stringMessages, - DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, - DataRetrieverChainDefinitionProvider retrieverChainProvider) { + DataMiningSession session, StringMessages stringMessages, DataMiningServiceAsync dataMiningService, + ErrorReporter errorReporter, DataRetrieverChainDefinitionProvider retrieverChainProvider) { super(parent, context); this.session = session; this.stringMessages = stringMessages; @@ -86,64 +86,66 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent this.retrieverChainProvider = retrieverChainProvider; listeners = new HashSet<>(); retrieverChainProvider.addDataRetrieverChainDefinitionChangedListener(this); - + isAwaitingReload = false; blockDataUpdates = false; retrieverChain = null; selectionProvidersMappedByRetrievedDataType = new HashMap<>(); - + retrieverLevelList = new CellList<>(new RetrieverLevelCell()); retrieverLevelSelectionModel = new RetrieverLevelSelectionModel(); retrieverLevelList.setSelectionModel(retrieverLevelSelectionModel); retrieverLevelDataProvider = new ListDataProvider<>(); retrieverLevelDataProvider.addDataDisplay(retrieverLevelList); ScrollPanel retrieverLevelListScrollPanel = new ScrollPanel(retrieverLevelList); - + DockLayoutPanel selectionDockLayoutPanel = new DockLayoutPanel(Unit.PX); selectionDockLayoutPanel.addNorth(new Label(this.stringMessages.filterBy()), 18); selectionPanel = new ScrollPanel(); selectionDockLayoutPanel.add(selectionPanel); - + selectionPresenter = new PlainFilterSelectionPresenter(this, context, stringMessages, retrieverChainProvider, this); selectionPresenterScrollPanel = new ScrollPanel(selectionPresenter.getEntryWidget()); - + mainPanel = new DockLayoutPanel(Unit.PX); mainPanel.addSouth(selectionPresenterScrollPanel, 100); mainPanel.addWest(retrieverLevelListScrollPanel, 300); mainPanel.add(selectionDockLayoutPanel); mainPanel.setWidgetHidden(selectionPresenterScrollPanel, true); } - + @Override public void setHighestRetrieverLevelWithFilterDimension(FunctionDTO dimension, Serializable groupKey) { - FunctionDTO dimensionMappedToReducedDimensions = reducedDimensions == null ? dimension : reducedDimensions.getReducedDimension(dimension); + FunctionDTO dimensionMappedToReducedDimensions = reducedDimensions == null ? dimension + : reducedDimensions.getReducedDimension(dimension); for (final DataRetrieverLevelDTO retrieverLevel : retrieverChain.getRetrieverLevels()) { - final RetrieverLevelFilterSelectionProvider selectionProvider = selectionProvidersMappedByRetrievedDataType.get(retrieverLevel); + final RetrieverLevelFilterSelectionProvider selectionProvider = selectionProvidersMappedByRetrievedDataType + .get(retrieverLevel); if (selectionProvider.hasDimension(dimensionMappedToReducedDimensions)) { selectionProvider.addFilter(dimensionMappedToReducedDimensions, Collections.singleton(groupKey)); break; } } } - + @Override public void awaitReloadComponents() { isAwaitingReload = true; } - + @Override public boolean isAwatingReload() { return isAwaitingReload; } - + @Override public void reloadComponents() { updateRetrievalLevels(); isAwaitingReload = false; notifyListeners(); } - + @Override public void dataRetrieverChainDefinitionChanged(DataRetrieverChainDefinitionDTO newDataRetrieverChainDefinition) { if (!Objects.equals(retrieverChain, newDataRetrieverChainDefinition)) { @@ -160,34 +162,38 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent clearContent(); retrieverLevelDataProvider.getList().addAll(retrieverChain.getRetrieverLevels()); retrieverLevelList.setPageSize(retrieverLevelDataProvider.getList().size()); - dataMiningService.getReducedDimensionsMappedByLevelFor(retrieverChain, LocaleInfo.getCurrentLocale().getLocaleName(), - new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the dimensions of the retrieval chain from the server: " + caught.getMessage()); - } - @Override - public void onSuccess(ReducedDimensionsDTO dimensionsMappedByLevel) { - ListRetrieverChainFilterSelectionProvider.this.reducedDimensions = dimensionsMappedByLevel; - int firstFilterableRetrieverLevel = Integer.MAX_VALUE; - for (Entry> dimensionsEntry : dimensionsMappedByLevel.getReducedDimensions().entrySet()) { - if (!dimensionsEntry.getValue().isEmpty()) { - DataRetrieverLevelDTO retrieverLevel = dimensionsEntry.getKey(); - RetrieverLevelFilterSelectionProvider selectionProvider = - new RetrieverLevelFilterSelectionProvider( - ListRetrieverChainFilterSelectionProvider.this, getComponentContext(), - session, dataMiningService, errorReporter, - ListRetrieverChainFilterSelectionProvider.this, - retrieverChain,retrieverLevel); - selectionProvider.setAvailableDimensions(dimensionsEntry.getValue()); - selectionProvidersMappedByRetrievedDataType.put(retrieverLevel, selectionProvider); - firstFilterableRetrieverLevel = retrieverLevel.getLevel() < firstFilterableRetrieverLevel ? - retrieverLevel.getLevel() : firstFilterableRetrieverLevel; + dataMiningService.getReducedDimensionsMappedByLevelFor(retrieverChain, + LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback() { + @Override + public void onFailure(Throwable caught) { + errorReporter + .reportError("Error fetching the dimensions of the retrieval chain from the server: " + + caught.getMessage()); } - } - retrieverLevelSelectionModel.setSelected(retrieverChain.getRetrieverLevel(firstFilterableRetrieverLevel), true); - } - }); + + @Override + public void onSuccess(ReducedDimensionsDTO dimensionsMappedByLevel) { + ListRetrieverChainFilterSelectionProvider.this.reducedDimensions = dimensionsMappedByLevel; + int firstFilterableRetrieverLevel = Integer.MAX_VALUE; + for (Entry> dimensionsEntry : dimensionsMappedByLevel + .getReducedDimensions().entrySet()) { + if (!dimensionsEntry.getValue().isEmpty()) { + DataRetrieverLevelDTO retrieverLevel = dimensionsEntry.getKey(); + RetrieverLevelFilterSelectionProvider selectionProvider = new RetrieverLevelFilterSelectionProvider( + ListRetrieverChainFilterSelectionProvider.this, getComponentContext(), session, + dataMiningService, errorReporter, + ListRetrieverChainFilterSelectionProvider.this, retrieverChain, retrieverLevel); + selectionProvider.setAvailableDimensions(dimensionsEntry.getValue()); + selectionProvidersMappedByRetrievedDataType.put(retrieverLevel, selectionProvider); + firstFilterableRetrieverLevel = retrieverLevel + .getLevel() < firstFilterableRetrieverLevel ? retrieverLevel.getLevel() + : firstFilterableRetrieverLevel; + } + } + retrieverLevelSelectionModel + .setSelected(retrieverChain.getRetrieverLevel(firstFilterableRetrieverLevel), true); + } + }); } private void clearContent() { @@ -200,19 +206,22 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent blockDataUpdates = false; forwardSelectionChanged(); } - + HashMap getRetrieverSettings() { return retrieverChainProvider.getRetrieverSettings(); } - - void retrieverLevelFilterSelectionChanged(RetrieverLevelFilterSelectionProvider retrieverLevelFilterSelectionProvider, DimensionFilterSelectionProvider dimensionFilterSelectionProvider) { + + void retrieverLevelFilterSelectionChanged( + RetrieverLevelFilterSelectionProvider retrieverLevelFilterSelectionProvider, + DimensionFilterSelectionProvider dimensionFilterSelectionProvider) { if (!blockDataUpdates) { updateFilterSelectionProviders(retrieverLevelFilterSelectionProvider.getRetrieverLevel(), - dimensionFilterSelectionProvider.getSelectedDimension()); + dimensionFilterSelectionProvider.getSelectedDimension()); } } - - void updateFilterSelectionProviders(DataRetrieverLevelDTO beginningWithLevel, final FunctionDTO exceptForDimension) { + + void updateFilterSelectionProviders(DataRetrieverLevelDTO beginningWithLevel, + final FunctionDTO exceptForDimension) { DataRetrieverLevelDTO currentLevel = beginningWithLevel; DataRetrieverLevelDTO retrieverLevelToUpdate = null; while (currentLevel != null) { @@ -222,11 +231,12 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent } currentLevel = retrieverChain.getNextRetrieverLevel(currentLevel); } - + if (retrieverLevelToUpdate != null) { - selectionProvidersMappedByRetrievedDataType.get(retrieverLevelToUpdate).updateAvailableData(exceptForDimension); + selectionProvidersMappedByRetrievedDataType.get(retrieverLevelToUpdate) + .updateAvailableData(exceptForDimension); } else { - //The update of the whole retriever chain is completed. Notify the listeners. + // The update of the whole retriever chain is completed. Notify the listeners. forwardSelectionChanged(); } } @@ -239,8 +249,10 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent @Override public HashMap>> getSelection() { HashMap>> filterSelection = new HashMap<>(); - for (RetrieverLevelFilterSelectionProvider selectionProvider : selectionProvidersMappedByRetrievedDataType.values()) { - Map> levelFilterSelection = selectionProvider.getFilterSelection(); + for (RetrieverLevelFilterSelectionProvider selectionProvider : selectionProvidersMappedByRetrievedDataType + .values()) { + Map> levelFilterSelection = selectionProvider + .getFilterSelection(); if (!levelFilterSelection.isEmpty()) { filterSelection.put(selectionProvider.getRetrieverLevel(), new HashMap<>(levelFilterSelection)); } @@ -250,8 +262,10 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent @Override public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { - for (RetrieverLevelFilterSelectionProvider selectionProvider : selectionProvidersMappedByRetrievedDataType.values()) { - Map>> filterSelection = queryDefinition.getFilterSelection(); + for (RetrieverLevelFilterSelectionProvider selectionProvider : selectionProvidersMappedByRetrievedDataType + .values()) { + Map>> filterSelection = queryDefinition + .getFilterSelection(); DataRetrieverLevelDTO retrieverLevel = selectionProvider.getRetrieverLevel(); if (filterSelection.containsKey(retrieverLevel)) { selectionProvider.applySelection(filterSelection.get(retrieverLevel)); @@ -261,7 +275,8 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent @Override public void clearSelection() { - for (RetrieverLevelFilterSelectionProvider selectionProvider : selectionProvidersMappedByRetrievedDataType.values()) { + for (RetrieverLevelFilterSelectionProvider selectionProvider : selectionProvidersMappedByRetrievedDataType + .values()) { selectionProvider.clearSelection(); } } @@ -270,13 +285,13 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent public void addSelectionChangedListener(FilterSelectionChangedListener listener) { listeners.add(listener); } - + private void notifyListeners() { for (FilterSelectionChangedListener listener : listeners) { listener.selectionChanged(); } } - + private class RetrieverLevelCell extends AbstractCell { @Override public void render(Cell.Context context, DataRetrieverLevelDTO value, SafeHtmlBuilder sb) { @@ -286,34 +301,35 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent sb.appendHtmlConstant(""); sb.appendHtmlConstant(""); - + List dataList = retrieverLevelDataProvider.getList(); if (!dataList.get(dataList.size() - 1).equals(value)) { sb.appendHtmlConstant(""); } - + sb.appendHtmlConstant("
" + value.getRetrievedDataType().getDisplayName() + "
|
"); } } - + private class RetrieverLevelSelectionModel extends SingleSelectionModel { public RetrieverLevelSelectionModel() { super(); addSelectionChangeHandler(new SelectionChangeEvent.Handler() { @Override public void onSelectionChange(SelectionChangeEvent event) { - selectionPanel.setWidget(selectionProvidersMappedByRetrievedDataType.get(retrieverLevelSelectionModel.getSelectedObject()).getEntryWidget()); + selectionPanel.setWidget(selectionProvidersMappedByRetrievedDataType + .get(retrieverLevelSelectionModel.getSelectedObject()).getEntryWidget()); } }); } - + @Override public void setSelected(DataRetrieverLevelDTO item, boolean selected) { if (!selected || !selectionProvidersMappedByRetrievedDataType.containsKey(item)) { - //Prevents the selection of retriever levels, that don't have any dimensions and can't filter + // Prevents the selection of retriever levels, that don't have any dimensions and can't filter return; } - + super.setSelected(item, selected); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/RetrieverLevelFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/RetrieverLevelFilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java index 8bd87168700..1348b766fb8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/filter/RetrieverLevelFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.selection.filter; +package com.sap.sse.datamining.ui.selection.filter; import java.io.Serializable; import java.util.ArrayList; @@ -14,7 +14,6 @@ import java.util.Set; import com.google.gwt.dom.client.Style.Display; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.datamining.DataMiningServiceAsync; import com.sap.sse.common.Util; import com.sap.sse.common.settings.AbstractSettings; import com.sap.sse.common.settings.SerializableSettings; @@ -22,6 +21,7 @@ import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.DataMiningServiceAsync; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; @@ -32,31 +32,30 @@ public class RetrieverLevelFilterSelectionProvider extends AbstractComponent availableDimensions; - + private final HorizontalPanel mainPanel; private final Collection dimensionSelectionProviders; public RetrieverLevelFilterSelectionProvider(Component parent, ComponentContext context, - DataMiningSession session, - DataMiningServiceAsync dataMiningService, - ErrorReporter errorReporter, ListRetrieverChainFilterSelectionProvider retrieverChainSelectionProvider, DataRetrieverChainDefinitionDTO retrieverChain, - DataRetrieverLevelDTO retrieverLevel) { + DataMiningSession session, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + ListRetrieverChainFilterSelectionProvider retrieverChainSelectionProvider, + DataRetrieverChainDefinitionDTO retrieverChain, DataRetrieverLevelDTO retrieverLevel) { super(parent, context); this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; - + this.session = session; this.retrieverChainSelectionProvider = retrieverChainSelectionProvider; this.retrieverChain = retrieverChain; this.retrieverLevel = retrieverLevel; availableDimensions = new ArrayList<>(); - + mainPanel = new HorizontalPanel(); dimensionSelectionProviders = new ArrayList<>(); } @@ -74,20 +73,21 @@ public class RetrieverLevelFilterSelectionProvider extends AbstractComponent 1; } - + void removeDimensionFilter(DimensionFilterSelectionProvider dimensionFilter) { dimensionFilter.clearSelection(); // Notifies the listeners, if values were selected dimensionSelectionProviders.remove(dimensionFilter); mainPanel.remove(dimensionFilter.getEntryWidget()); } - + void updateAvailableDimensions() { Collection remainingDimensionsBase = new ArrayList(availableDimensions); remainingDimensionsBase.removeAll(getSelectedDimensions()); @@ -118,11 +118,11 @@ public class RetrieverLevelFilterSelectionProvider extends AbstractComponent getSelectedDimensions() { Collection selectedDimensions = new ArrayList<>(); for (DimensionFilterSelectionProvider dimensionFilter : dimensionSelectionProviders) { @@ -133,7 +133,7 @@ public class RetrieverLevelFilterSelectionProvider extends AbstractComponent * Aborts the update, if it caused a selection change. @@ -141,8 +141,9 @@ public class RetrieverLevelFilterSelectionProvider extends AbstractComponent selectionProviderIterator) { + + void updateAvailableData(final FunctionDTO exceptForDimension, + final Iterator selectionProviderIterator) { if (selectionProviderIterator.hasNext()) { DimensionFilterSelectionProvider selectionProvider = selectionProviderIterator.next(); FunctionDTO selectedDimension = selectionProvider.getSelectedDimension(); @@ -153,7 +154,8 @@ public class RetrieverLevelFilterSelectionProvider extends AbstractComponent { - + private AdvancedDataMiningSettings initialSettings; private StringMessages stringMessages; - + private CheckBox developerOptionsCheckBox; - public AdvancedDataMiningSettingsDialogComponent(AdvancedDataMiningSettings initialSettings, StringMessages stringMessages) { + public AdvancedDataMiningSettingsDialogComponent(AdvancedDataMiningSettings initialSettings, + StringMessages stringMessages) { this.initialSettings = initialSettings; this.stringMessages = stringMessages; } @@ -24,11 +25,11 @@ public class AdvancedDataMiningSettingsDialogComponent implements SettingsDialog @Override public Widget getAdditionalWidget(DataEntryDialog dialog) { FlowPanel additionalWidget = new FlowPanel(); - + developerOptionsCheckBox = dialog.createCheckbox(stringMessages.developerOptions()); developerOptionsCheckBox.setValue(initialSettings.isDeveloperOptions()); additionalWidget.add(developerOptionsCheckBox); - + return additionalWidget; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/settings/QueryRunnerSettings.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettings.java similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/settings/QueryRunnerSettings.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettings.java index 37917b39f82..ffd58dbf016 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/settings/QueryRunnerSettings.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettings.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining.settings; +package com.sap.sse.datamining.ui.settings; import com.sap.sse.common.settings.AbstractSettings; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/settings/QueryRunnerSettingsDialogComponent.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettingsDialogComponent.java similarity index 92% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/settings/QueryRunnerSettingsDialogComponent.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettingsDialogComponent.java index 322e1d21821..8232604154d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/settings/QueryRunnerSettingsDialogComponent.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettingsDialogComponent.java @@ -1,19 +1,19 @@ -package com.sap.sailing.gwt.ui.datamining.settings; +package com.sap.sse.datamining.ui.settings; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FocusWidget; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.dialog.DataEntryDialog; import com.sap.sse.gwt.client.dialog.DataEntryDialog.Validator; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; public class QueryRunnerSettingsDialogComponent implements SettingsDialogComponent { - + private QueryRunnerSettings initialSettings; private StringMessages stringMessages; - + private CheckBox runAutomaticallyBox; public QueryRunnerSettingsDialogComponent(QueryRunnerSettings initialSettings, StringMessages stringMessages) { @@ -24,12 +24,12 @@ public class QueryRunnerSettingsDialogComponent implements SettingsDialogCompone @Override public Widget getAdditionalWidget(DataEntryDialog dialog) { FlowPanel additionalWidget = new FlowPanel(); - + runAutomaticallyBox = dialog.createCheckbox(stringMessages.runAutomatically()); runAutomaticallyBox.setTitle(stringMessages.runAutomaticallyTooltip()); runAutomaticallyBox.setValue(initialSettings.isRunAutomatically()); additionalWidget.add(runAutomaticallyBox); - + return additionalWidget; } diff --git a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF index 000aca5e169..6e8d7576d06 100644 --- a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF @@ -47,8 +47,10 @@ Export-Package: com.google.gwt.user.client.rpc.core.java.util, com.sap.sse.gwt.client.replication, com.sap.sse.gwt.client.sapheader, com.sap.sse.gwt.client.shared.components, + com.sap.sse.gwt.client.shared.controls, com.sap.sse.gwt.client.shared.perspective, com.sap.sse.gwt.client.shared.settings, + com.sap.sse.gwt.client.suggestion, com.sap.sse.gwt.client.useragent, com.sap.sse.gwt.common, com.sap.sse.gwt.dispatch.client, diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/AbstractObjectRenderer.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/AbstractObjectRenderer.java similarity index 87% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/AbstractObjectRenderer.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/AbstractObjectRenderer.java index f4a358b417b..7afbb87030a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/AbstractObjectRenderer.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/AbstractObjectRenderer.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.client.shared.controls; +package com.sap.sse.gwt.client.shared.controls; import com.google.gwt.text.shared.AbstractRenderer; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/ScrolledTabLayoutPanel.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/ScrolledTabLayoutPanel.java similarity index 99% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/ScrolledTabLayoutPanel.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/ScrolledTabLayoutPanel.java index 2139f418ac6..048f0457b61 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/ScrolledTabLayoutPanel.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/ScrolledTabLayoutPanel.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.client.shared.controls; +package com.sap.sse.gwt.client.shared.controls; import com.google.gwt.animation.client.Animation; import com.google.gwt.core.client.Scheduler; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/SimpleObjectRenderer.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/SimpleObjectRenderer.java similarity index 82% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/SimpleObjectRenderer.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/SimpleObjectRenderer.java index eeb6410c655..c15c9cb4617 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/SimpleObjectRenderer.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/controls/SimpleObjectRenderer.java @@ -1,5 +1,4 @@ -package com.sap.sailing.gwt.ui.client.shared.controls; - +package com.sap.sse.gwt.client.shared.controls; /** * Simple renderer, that uses the objects toString method to render. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/AbstractListSuggestOracle.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractListSuggestOracle.java similarity index 96% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/AbstractListSuggestOracle.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractListSuggestOracle.java index acd6292ab35..67aa7170cab 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/AbstractListSuggestOracle.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractListSuggestOracle.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.common.client.suggestion; +package com.sap.sse.gwt.client.suggestion; import java.util.ArrayList; import java.util.Collection; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/AbstractSuggestOracle.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractSuggestOracle.java similarity index 98% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/AbstractSuggestOracle.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractSuggestOracle.java index 82ef9087c12..1b9b9499a8f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/AbstractSuggestOracle.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractSuggestOracle.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.common.client.suggestion; +package com.sap.sse.gwt.client.suggestion; import java.util.ArrayList; import java.util.Collections; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/CustomSuggestBox.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/CustomSuggestBox.java similarity index 97% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/CustomSuggestBox.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/CustomSuggestBox.java index be02210fdfe..483cacff6f8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/CustomSuggestBox.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/CustomSuggestBox.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.common.client.suggestion; +package com.sap.sse.gwt.client.suggestion; import java.util.Collection; diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java index f40c62fae3e..9b6745e6c50 100755 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java @@ -45,12 +45,12 @@ import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity; import com.sap.sailing.android.tracking.app.utils.AppPreferences; import com.sap.sailing.android.tracking.app.utils.DatabaseHelper; import com.sap.sailing.android.tracking.app.valueobjects.EventInfo; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterPerSecondSpeedImpl; import com.sap.sailing.domain.common.tracking.impl.FlatSmartphoneUuidAndGPSFixMovingJsonSerializer; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; public class TrackingService extends Service implements LocationListener { diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java index 18012941751..dc992618dc2 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java @@ -38,8 +38,8 @@ import com.sap.sailing.android.tracking.app.utils.AppPreferences; import com.sap.sailing.android.tracking.app.utils.DatabaseHelper; import com.sap.sailing.android.tracking.app.utils.ServiceHelper; import com.sap.sailing.android.tracking.app.valueobjects.EventInfo; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Speed; import com.viewpagerindicator.CirclePageIndicator; public class TrackingActivity extends BaseActivity implements GPSQualityListener, APIConnectivityListener { diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/CompassFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/CompassFragment.java index 158ed9c5b5d..f055e87b5d4 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/CompassFragment.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/CompassFragment.java @@ -8,7 +8,7 @@ import android.widget.TextView; import com.sap.sailing.android.tracking.app.R; import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity; -import com.sap.sailing.domain.common.Bearing; +import com.sap.sse.common.Bearing; public class CompassFragment extends BaseFragment { diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/SpeedFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/SpeedFragment.java index 87bbd49a70d..5b001c1b607 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/SpeedFragment.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/SpeedFragment.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.sap.sailing.android.tracking.app.R; import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity; -import com.sap.sailing.domain.common.Speed; +import com.sap.sse.common.Speed; public class SpeedFragment extends BaseFragment { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/AbstractCourseDesign.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/AbstractCourseDesign.java index bc06a85204a..720cc073af8 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/AbstractCourseDesign.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/AbstractCourseDesign.java @@ -3,8 +3,8 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign; import java.util.HashSet; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; public abstract class AbstractCourseDesign implements CourseDesign{ private Position startBoatPosition; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/AbstractCourseDesignFactory.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/AbstractCourseDesignFactory.java index 26333aa3ae7..4db2823ddeb 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/AbstractCourseDesignFactory.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/AbstractCourseDesignFactory.java @@ -3,12 +3,12 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign; import java.text.DecimalFormat; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.NauticalMileDistance; import com.sap.sailing.racecommittee.app.utils.GeoUtils; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.impl.DegreeBearingImpl; public abstract class AbstractCourseDesignFactory implements CourseDesignFactory { protected CourseDesign product; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/BoatClassType.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/BoatClassType.java index 986406b86cc..2939d0bf2db 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/BoatClassType.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/BoatClassType.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Distance; @SuppressWarnings("serial") public enum BoatClassType { boatClass470erMen("470er Men", new HashMap() { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesign.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesign.java index faa48fbdef7..9bd1c21e9ca 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesign.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesign.java @@ -2,8 +2,8 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; public interface CourseDesign { Position getStartBoatPosition(); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignComputer.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignComputer.java index ee6284b58c1..fd225f53872 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignComputer.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignComputer.java @@ -2,8 +2,8 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign; import android.util.Log; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; public class CourseDesignComputer { private static final String TAG = CourseDesignComputer.class.getName(); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignFactory.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignFactory.java index ba7da3e9687..9000f6e1ddb 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignFactory.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/CourseDesignFactory.java @@ -1,7 +1,7 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; +import com.sap.sse.common.Bearing; public interface CourseDesignFactory { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/Located.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/Located.java index b9068088685..e1eb092fbb1 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/Located.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/Located.java @@ -1,9 +1,9 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Positioned; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; public interface Located extends Positioned { Bearing getBearingFrom(Position other); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/PositionedMarkImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/PositionedMarkImpl.java index 48239af21e5..44396eaab3e 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/PositionedMarkImpl.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/PositionedMarkImpl.java @@ -1,12 +1,12 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign; import com.sap.sailing.domain.base.impl.MarkImpl; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MarkType; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.impl.DegreeBearingImpl; public class PositionedMarkImpl extends MarkImpl implements PositionedMark { private static final long serialVersionUID = -7903960088124343841L; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/TrapezoidCourseDesignFactoryImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/TrapezoidCourseDesignFactoryImpl.java index 9bd0d71e233..f99f01150c3 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/TrapezoidCourseDesignFactoryImpl.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/TrapezoidCourseDesignFactoryImpl.java @@ -5,13 +5,13 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.MarkType; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.NauticalMileDistance; import com.sap.sailing.racecommittee.app.utils.GeoUtils; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.impl.DegreeBearingImpl; public class TrapezoidCourseDesignFactoryImpl extends AbstractCourseDesignFactory { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/WindWardLeeWardCourseDesignFactoryImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/WindWardLeeWardCourseDesignFactoryImpl.java index d6e34fe4bcd..745cddce63c 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/WindWardLeeWardCourseDesignFactoryImpl.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/coursedesign/WindWardLeeWardCourseDesignFactoryImpl.java @@ -5,12 +5,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.NauticalMileDistance; import com.sap.sailing.racecommittee.app.utils.GeoUtils; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; +import com.sap.sse.common.impl.DegreeBearingImpl; public class WindWardLeeWardCourseDesignFactoryImpl extends AbstractCourseDesignFactory { private final int LUV_BUOY1_ANGLE_TO_WIND = 0; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/WindFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/WindFragment.java index fbf6f7289d7..76a83e62c21 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/WindFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/WindFragment.java @@ -22,11 +22,9 @@ import com.sap.sailing.domain.base.racegroup.CurrentRaceComparator; import com.sap.sailing.domain.base.racegroup.CurrentRaceFilter; import com.sap.sailing.domain.base.racegroup.RaceGroupSeriesFleet; import com.sap.sailing.domain.base.racegroup.impl.CurrentRaceFilterImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; @@ -45,8 +43,10 @@ import com.sap.sailing.racecommittee.app.utils.RangeInputFilter; import com.sap.sailing.racecommittee.app.utils.ThemeHelper; import com.sap.sailing.racecommittee.app.utils.TimeUtils; import com.sap.sailing.racecommittee.app.utils.WindHelper; +import com.sap.sse.common.Bearing; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import android.annotation.SuppressLint; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/GeoUtils.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/GeoUtils.java index ff868e25f08..9b941a956f4 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/GeoUtils.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/GeoUtils.java @@ -2,11 +2,11 @@ package com.sap.sailing.racecommittee.app.utils; import android.content.Context; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.racecommittee.app.R; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; public class GeoUtils { public static Position getPositionForGivenPointDistanceAndBearing(Position givenPoint, Distance distance, From a209447d7dc021683c6b65e59ef40670916eeeac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Thu, 12 Apr 2018 10:36:39 +0200 Subject: [PATCH 04/63] completely refactored; divided into two independent modules --- .../AbstractSailingResultsPresenter.java | 25 +++++ .../ui/datamining/DataMiningEntryPoint.java | 57 +++++----- .../DataMiningSettingsInfoManagerImpl.java | 12 ++- .../ManeuverSpeedDetailsResultsPresenter.java | 5 +- .../TabbedSailingResultsPresenter.java | 9 +- .../PolarBackendResultsPresenter.java | 14 +-- .../ui/polarmining/PolarResultsPresenter.java | 12 ++- .../ui/AbstractDataMiningComponent.java | 32 ++++++ .../ui/AnchorDataMiningSettingsControl.java | 14 +-- .../datamining/ui/DataMiningSettingsInfo.java | 2 +- .../ui/execution/SimpleQueryRunner.java | 20 ++-- .../AbstractNumericResultsPresenter.java | 52 ++++----- .../AbstractResultsPresenter.java | 21 ++-- .../AbstractTabbedResultsPresenter.java | 25 ++--- .../presentation/MultiResultsPresenter.java | 65 ++++++----- .../presentation/PlainResultsPresenter.java | 67 ++++++------ .../ui/presentation/ResultsChart.java | 40 +++---- .../AbstractQueryDefinitionProvider.java | 78 +++++++------- ...nctionAndAggregatorDefinitionProvider.java | 13 +-- .../MultiDimensionalGroupingProvider.java | 101 +++++++++--------- .../QueryDefinitionProviderWithControls.java | 39 ++++--- .../RetrieverLevelSettingsComponent.java | 4 +- ...eDataRetrieverChainDefinitionProvider.java | 17 ++- .../SuggestBoxStatisticProvider.java | 23 ++-- ...RetrieverChainFilterSelectionProvider.java | 15 ++- ...RetrieverLevelFilterSelectionProvider.java | 4 +- 26 files changed, 409 insertions(+), 357 deletions(-) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AbstractDataMiningComponent.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java new file mode 100644 index 00000000000..b33f64e307b --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java @@ -0,0 +1,25 @@ +package com.sap.sailing.gwt.ui.datamining; + +import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.common.settings.Settings; +import com.sap.sse.datamining.ui.presentation.AbstractResultsPresenter; +import com.sap.sse.gwt.client.shared.components.Component; +import com.sap.sse.gwt.client.shared.settings.ComponentContext; + +/** + * Base class for all {@link AbstractResultsPresenter} implementations within the sailing domain specific module. + * Provides the {@link #stringMessages} for these components. + * + * @author Maximilian Gro (D064866) + * + */ +public abstract class AbstractSailingResultsPresenter + extends AbstractResultsPresenter { + protected final StringMessages stringMessages; + + public AbstractSailingResultsPresenter(Component parent, ComponentContext context, + StringMessages stringMessages) { + super(parent, context); + this.stringMessages = stringMessages; + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java index be857d40ddf..a75a1c970e6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java @@ -15,15 +15,16 @@ import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication; import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication; import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint; import com.sap.sailing.gwt.ui.client.RemoteServiceMappingConstants; +import com.sap.sailing.gwt.ui.datamining.presentation.TabbedSailingResultsPresenter; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.UUIDDataMiningSession; import com.sap.sse.datamining.ui.AnchorDataMiningSettingsControl; import com.sap.sse.datamining.ui.DataMiningService; import com.sap.sse.datamining.ui.DataMiningServiceAsync; import com.sap.sse.datamining.ui.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; import com.sap.sse.datamining.ui.ResultsPresenter; import com.sap.sse.datamining.ui.execution.SimpleQueryRunner; -import com.sap.sse.datamining.ui.presentation.AbstractTabbedResultsPresenter; import com.sap.sse.datamining.ui.selection.QueryDefinitionProviderWithControls; import com.sap.sse.gwt.client.EntryPointHelper; import com.sap.sse.gwt.client.shared.components.ComponentResources; @@ -37,60 +38,66 @@ import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAut public class DataMiningEntryPoint extends AbstractSailingEntryPoint { public static final ComponentResources resources = GWT.create(ComponentResources.class); - + private final DataMiningServiceAsync dataMiningService = GWT.create(DataMiningService.class); - + private DataMiningSession session; private QueryDefinitionProviderWithControls queryDefinitionProviderWithControls; - + @Override protected void doOnModuleLoad() { Highcharts.ensureInjectedWithMore(); super.doOnModuleLoad(); session = new UUIDDataMiningSession(UUID.randomUUID()); - EntryPointHelper.registerASyncService((ServiceDefTarget) dataMiningService, RemoteServiceMappingConstants.dataMiningServiceRemotePath); + EntryPointHelper.registerASyncService((ServiceDefTarget) dataMiningService, + RemoteServiceMappingConstants.dataMiningServiceRemotePath); createDataminingPanel(); } - + private void createDataminingPanel() { SAPHeaderWithAuthentication header = new SAPSailingHeaderWithAuthentication(getStringMessages().dataMining()); - GenericAuthentication genericSailingAuthentication = new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView()); - AuthorizedContentDecorator authorizedContentDecorator = new GenericAuthorizedContentDecorator(genericSailingAuthentication); - authorizedContentDecorator.setPermissionToCheck(Permission.DATA_MINING, SailingPermissionsForRoleProvider.INSTANCE); + GenericAuthentication genericSailingAuthentication = new FixedSailingAuthentication(getUserService(), + header.getAuthenticationMenuView()); + AuthorizedContentDecorator authorizedContentDecorator = new GenericAuthorizedContentDecorator( + genericSailingAuthentication); + authorizedContentDecorator.setPermissionToCheck(Permission.DATA_MINING, + SailingPermissionsForRoleProvider.INSTANCE); authorizedContentDecorator.setContentWidgetFactory(new WidgetFactory() { private SimpleQueryRunner queryRunner; + private final DataMiningSettingsInfoManager settingsManager = new DataMiningSettingsInfoManagerImpl( + getStringMessages()); @Override public Widget get() { - DataMiningSettingsControl settingsControl = new AnchorDataMiningSettingsControl(null, null, - getStringMessages()); - ResultsPresenter resultsPresenter = new AbstractTabbedResultsPresenter(/* parent */ null, /* context */ null, - /* delegate drillDownCallback */ groupKey -> { - queryDefinitionProviderWithControls.drillDown(groupKey, /* onSuccessCallback */ ()->queryRunner.runQuery()); + DataMiningSettingsControl settingsControl = new AnchorDataMiningSettingsControl(null, null); + ResultsPresenter resultsPresenter = new TabbedSailingResultsPresenter(/* parent */ null, + /* context */ null, /* delegate drillDownCallback */ groupKey -> { + queryDefinitionProviderWithControls.drillDown(groupKey, + /* onSuccessCallback */ () -> queryRunner.runQuery()); }, getStringMessages()); DockLayoutPanel selectionDockPanel = new DockLayoutPanel(Unit.PX); - queryDefinitionProviderWithControls = - new QueryDefinitionProviderWithControls(null, null, session, getStringMessages(), - dataMiningService, DataMiningEntryPoint.this, settingsControl, resultsPresenter); + queryDefinitionProviderWithControls = new QueryDefinitionProviderWithControls(null, null, session, + dataMiningService, DataMiningEntryPoint.this, settingsControl, settingsManager, + resultsPresenter); queryDefinitionProviderWithControls.getEntryWidget().addStyleName("dataMiningPanel"); selectionDockPanel.add(queryDefinitionProviderWithControls.getEntryWidget()); - queryRunner = new SimpleQueryRunner(null, null, session, getStringMessages(), - dataMiningService, - DataMiningEntryPoint.this, queryDefinitionProviderWithControls, resultsPresenter); + queryRunner = new SimpleQueryRunner(null, null, session, dataMiningService, DataMiningEntryPoint.this, + queryDefinitionProviderWithControls, resultsPresenter); queryDefinitionProviderWithControls.addControl(queryRunner.getEntryWidget()); - /* Running queries automatically when they've been changed is currently unnecessary, if not even counterproductive. - * This removes the query runner settings to prevent that the user can enable the automatic execution of queries. - * Re-enable this, when this functionality is desired again. + /* + * Running queries automatically when they've been changed is currently unnecessary, if not even + * counterproductive. This removes the query runner settings to prevent that the user can enable the + * automatic execution of queries. Re-enable this, when this functionality is desired again. */ -// settingsControl.addSettingsComponent(queryRunner); + // settingsControl.addSettingsComponent(queryRunner); SplitLayoutPanel splitPanel = new SplitLayoutPanel(15); splitPanel.addSouth(resultsPresenter.getEntryWidget(), 350); splitPanel.add(selectionDockPanel); return splitPanel; } }); - + RootLayoutPanel rootPanel = RootLayoutPanel.get(); DockLayoutPanel panel = new DockLayoutPanel(Unit.PX); panel.addNorth(header, 75); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java index 2951715578c..3c9417825ad 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java @@ -23,8 +23,10 @@ import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; public class DataMiningSettingsInfoManagerImpl implements DataMiningSettingsInfoManager { private final Map, DataMiningSettingsInfo> infosMappedBySettingsType; + private final StringMessages stringMessages; - public DataMiningSettingsInfoManagerImpl() { + public DataMiningSettingsInfoManagerImpl(StringMessages stringMessages) { + this.stringMessages = stringMessages; infosMappedBySettingsType = new HashMap<>(); // GWT doesn't support Class.isAssignableFrom and Class.getInterfaces. @@ -65,7 +67,7 @@ public class DataMiningSettingsInfoManagerImpl implements DataMiningSettingsInfo } @Override - public String getLocalizedName(StringMessages stringMessages) { + public String getLocalizedName() { return stringMessages.polars(); } @@ -87,7 +89,7 @@ public class DataMiningSettingsInfoManagerImpl implements DataMiningSettingsInfo } @Override - public String getLocalizedName(StringMessages stringMessages) { + public String getLocalizedName() { return stringMessages.maneuver(); } @@ -109,7 +111,7 @@ public class DataMiningSettingsInfoManagerImpl implements DataMiningSettingsInfo } @Override - public String getLocalizedName(StringMessages stringMessages) { + public String getLocalizedName() { return stringMessages.maneuverSpeedDetails(); } @@ -130,7 +132,7 @@ public class DataMiningSettingsInfoManagerImpl implements DataMiningSettingsInfo } @Override - public String getLocalizedName(StringMessages stringMessages) { + public String getLocalizedName() { return stringMessages.foilingSegments(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java index 6925b4189eb..eb5d77f298f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java @@ -20,6 +20,7 @@ import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsAggregation; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.charts.ChartToCsvExporter; +import com.sap.sailing.gwt.ui.datamining.AbstractSailingResultsPresenter; import com.sap.sse.common.settings.Settings; import com.sap.sse.common.util.NaturalComparator; import com.sap.sse.datamining.shared.GroupKey; @@ -36,7 +37,7 @@ import com.sap.sse.gwt.client.shared.settings.ComponentContext; * @author D069712 (Vladislav Chumak) * */ -public class ManeuverSpeedDetailsResultsPresenter extends AbstractResultsPresenter { +public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResultsPresenter { private final DockLayoutPanel dockLayoutPanel; @@ -216,7 +217,7 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractResultsPresent @Override public String getLocalizedShortName() { - return getStringMessages().maneuverSpeedDetailsResultsPresenter(); + return stringMessages.maneuverSpeedDetailsResultsPresenter(); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java index 2ea1a226dd9..a33e8717d00 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java @@ -12,10 +12,12 @@ import com.sap.sse.gwt.client.shared.settings.ComponentContext; public class TabbedSailingResultsPresenter extends AbstractTabbedResultsPresenter { + private final StringMessages stringMessages; + public TabbedSailingResultsPresenter(Component parent, ComponentContext context, DrillDownCallback drillDownCallback, StringMessages stringMessages) { - super(parent, context, drillDownCallback, stringMessages); - + super(parent, context, drillDownCallback); + this.stringMessages = stringMessages; } @Override @@ -40,8 +42,7 @@ public class TabbedSailingResultsPresenter extends AbstractTabbedResultsPresente } else { if (!(getSelectedPresenter() instanceof MultiResultsPresenter)) { CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus( - new MultiResultsPresenter(this, getComponentContext(), drillDownCallback, stringMessages)); + addTabAndFocus(new MultiResultsPresenter(this, getComponentContext(), drillDownCallback)); removeTab(oldHeader); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java index 23e010ebded..c1c705ec83a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java @@ -21,28 +21,30 @@ import com.google.gwt.user.client.ui.SimpleLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.charts.ChartToCsvExporter; +import com.sap.sailing.gwt.ui.datamining.AbstractSailingResultsPresenter; import com.sap.sailing.gwt.ui.datamining.presentation.ChartFactory; import com.sap.sailing.polars.datamining.shared.PolarBackendData; import com.sap.sse.common.settings.Settings; import com.sap.sse.common.util.NaturalComparator; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.presentation.AbstractResultsPresenter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; /** - * Is able to present {@link PolarBackendData}.
Has one polar chart showing the perAngle regression data and two - * x-y-linecharts that show speed and angle over windspeed regressions. + * Is able to present {@link PolarBackendData}.
+ * Has one polar chart showing the perAngle regression data and two x-y-linecharts that show speed and angle over + * windspeed regressions. * - *

+ *
+ *
* Used in conjunction with the datamining framework. * * @author D054528 (Frederik Petersen) * */ -public class PolarBackendResultsPresenter extends AbstractResultsPresenter { +public class PolarBackendResultsPresenter extends AbstractSailingResultsPresenter { private final DockLayoutPanel dockLayoutPanel; @@ -196,7 +198,7 @@ public class PolarBackendResultsPresenter extends AbstractResultsPresenter
+ *
+ *
* * Contains a polar chart on the left displaying the actual polar diagram and two histograms on the right. The upper * histogram shows datacount over angle and the second one shows datacount over windrange upon clicking a point in the * polar chart. * - *

+ *
+ *
* * Used in conjunction with the datamining framework. * * @author D054528 (Frederik Petersen) * */ -public class PolarResultsPresenter extends AbstractResultsPresenter { +public class PolarResultsPresenter extends AbstractSailingResultsPresenter { private final DockLayoutPanel dockLayoutPanel; @@ -265,7 +267,7 @@ public class PolarResultsPresenter extends AbstractResultsPresenter { @Override public String getLocalizedShortName() { - return getStringMessages().polarResultsPresenter(); + return stringMessages.polarResultsPresenter(); } @Override diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AbstractDataMiningComponent.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AbstractDataMiningComponent.java new file mode 100644 index 00000000000..33c39a42cca --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AbstractDataMiningComponent.java @@ -0,0 +1,32 @@ +package com.sap.sse.datamining.ui; + +import com.sap.sse.common.settings.Settings; +import com.sap.sse.gwt.client.shared.components.AbstractComponent; +import com.sap.sse.gwt.client.shared.components.Component; +import com.sap.sse.gwt.client.shared.settings.ComponentContext; + +/** + * Base class for all datamining* components. It creates the {@link StringMessages}. + * + * @author Maximilian Gro (D064866) + * + * @param + */ +public abstract class AbstractDataMiningComponent + extends AbstractComponent { + + private final StringMessages stringMessages = StringMessages.INSTANCE; + + public AbstractDataMiningComponent(Component parent, ComponentContext componentContext) { + super(parent, componentContext); + } + + /** + * Gets the {@link #stringMessages} of the datamining module. + * + * @return the string messages. + */ + protected StringMessages getDataMiningStringMessages() { + return stringMessages; + } +} diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java index 3eb12dcfcff..91cee6e441d 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java @@ -13,7 +13,6 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.Settings; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.ComponentResources; import com.sap.sse.gwt.client.shared.components.CompositeSettings; @@ -22,27 +21,24 @@ import com.sap.sse.gwt.client.shared.components.SettingsDialog; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class AnchorDataMiningSettingsControl extends AbstractComponent +public class AnchorDataMiningSettingsControl extends AbstractDataMiningComponent implements DataMiningSettingsControl { public static final ComponentResources resources = GWT.create(ComponentResources.class); - private final StringMessages stringMessages; private final Collection> components; private final Anchor anchor; - public AnchorDataMiningSettingsControl(Component parent, ComponentContext context, - final StringMessages stringMessages) { + public AnchorDataMiningSettingsControl(Component parent, ComponentContext context) { super(parent, context); - this.stringMessages = stringMessages; components = new LinkedHashSet<>(); anchor = new Anchor(AbstractImagePrototype.create(resources.darkSettingsIcon()).getSafeHtml()); anchor.addStyleName("settingsAnchor"); - anchor.setTitle(stringMessages.dataMiningSettings()); + anchor.setTitle(getDataMiningStringMessages().dataMiningSettings()); anchor.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - new SettingsDialog<>(AnchorDataMiningSettingsControl.this, stringMessages).show(); + new SettingsDialog<>(AnchorDataMiningSettingsControl.this, getDataMiningStringMessages()).show(); } }); } @@ -59,7 +55,7 @@ public class AnchorDataMiningSettingsControl extends AbstractComponent SettingsDialogComponent createSettingsDialogComponent( SettingsType settings); - String getLocalizedName(StringMessages stringMessages); + String getLocalizedName(); } diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java index fcf5b23ed33..af76660c82e 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java @@ -10,22 +10,21 @@ import com.google.gwt.user.client.ui.Widget; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.DataMiningService; import com.sap.sse.datamining.ui.DataMiningServiceAsync; import com.sap.sse.datamining.ui.ManagedDataMiningQueriesCounter; import com.sap.sse.datamining.ui.QueryDefinitionProvider; import com.sap.sse.datamining.ui.QueryRunner; import com.sap.sse.datamining.ui.ResultsPresenter; -import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.datamining.ui.settings.QueryRunnerSettings; import com.sap.sse.datamining.ui.settings.QueryRunnerSettingsDialogComponent; import com.sap.sse.gwt.client.ErrorReporter; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class SimpleQueryRunner extends AbstractComponent implements QueryRunner { +public class SimpleQueryRunner extends AbstractDataMiningComponent implements QueryRunner { /** * The delay before a query is sent to the {@link DataMiningService}. @@ -35,7 +34,6 @@ public class SimpleQueryRunner extends AbstractComponent im private static final int queryBufferTimeInMillis = 200; private final DataMiningSession session; - private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final ManagedDataMiningQueriesCounter counter; @@ -54,11 +52,10 @@ public class SimpleQueryRunner extends AbstractComponent im private final Button runButton; public SimpleQueryRunner(Component parent, ComponentContext context, DataMiningSession session, - StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, QueryDefinitionProvider queryDefinitionProvider, ResultsPresenter resultsPresenter) { super(parent, context); this.session = session; - this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; counter = new SimpleManagedDataMiningQueriesCounter(); @@ -67,7 +64,7 @@ public class SimpleQueryRunner extends AbstractComponent im this.queryDefinitionProvider = queryDefinitionProvider; this.resultsPresenter = resultsPresenter; - runButton = new Button(this.stringMessages.runAsSubstantive()); + runButton = new Button(getDataMiningStringMessages().runAsSubstantive()); runButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -102,7 +99,8 @@ public class SimpleQueryRunner extends AbstractComponent im @Override protected void handleFailure(Throwable caught) { errorReporter.reportError("Error running the query: " + caught.getMessage()); - resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); + resultsPresenter + .showError(getDataMiningStringMessages().errorRunningDataMiningQuery() + "."); } @Override @@ -111,7 +109,7 @@ public class SimpleQueryRunner extends AbstractComponent im } }); } else { - resultsPresenter.showError(stringMessages.queryNotValidBecause(), errorMessages); + resultsPresenter.showError(getDataMiningStringMessages().queryNotValidBecause(), errorMessages); } } @@ -135,7 +133,7 @@ public class SimpleQueryRunner extends AbstractComponent im @Override public String getLocalizedShortName() { - return stringMessages.queryRunner(); + return getDataMiningStringMessages().queryRunner(); } @Override @@ -165,7 +163,7 @@ public class SimpleQueryRunner extends AbstractComponent im @Override public SettingsDialogComponent getSettingsDialogComponent(QueryRunnerSettings settings) { - return new QueryRunnerSettingsDialogComponent(settings, stringMessages); + return new QueryRunnerSettingsDialogComponent(settings, getDataMiningStringMessages()); } @Override diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java index 2cf44a572b8..ae7995924fa 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java @@ -17,7 +17,6 @@ import com.sap.sse.common.Util.Triple; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.datamining.ui.presentation.dataproviders.AbstractNumericDataProvider; import com.sap.sse.datamining.ui.presentation.dataproviders.AverageWithStatsDataProvider; import com.sap.sse.datamining.ui.presentation.dataproviders.BearingDataProvider; @@ -29,54 +28,56 @@ import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public abstract class AbstractNumericResultsPresenter extends AbstractResultsPresenter { - +public abstract class AbstractNumericResultsPresenter + extends AbstractResultsPresenter { + private final DataProvidersPrecedenceList dataProviders; private final ValueListBox dataSelectionListBox; private AbstractNumericDataProvider currentDataProvider; - public AbstractNumericResultsPresenter(Component parent, ComponentContext context, - StringMessages stringMessages) { - super(parent, context, stringMessages); - + public AbstractNumericResultsPresenter(Component parent, ComponentContext context) { + super(parent, context); + final List> basicProviders = Arrays.asList( - new NumberDataProvider(), - new DistanceDataProvider(), - new DurationDataProvider(), + new NumberDataProvider(), new DistanceDataProvider(), new DurationDataProvider(), new BearingDataProvider()); - + final List> allProviders = new ArrayList<>(basicProviders); allProviders.add(new AverageWithStatsDataProvider(new DataProvidersPrecedenceList(basicProviders))); dataProviders = new DataProvidersPrecedenceList(allProviders); dataSelectionListBox = new ValueListBox<>(new AbstractObjectRenderer() { @Override protected String convertObjectToString(String dataKey) { - return currentDataProvider.getLocalizedNameForDataKey(getCurrentResult(), stringMessages, dataKey); + return currentDataProvider.getLocalizedNameForDataKey(getCurrentResult(), getDataMiningStringMessages(), dataKey); } }); dataSelectionListBox.addValueChangeHandler(new ValueChangeHandler() { @Override public void onValueChange(ValueChangeEvent event) { - Map resultValues = currentDataProvider.getData(getCurrentResult(), dataSelectionListBox.getValue()); - Map> errorMargins = currentDataProvider.getErrorData(getCurrentResult(), dataSelectionListBox.getValue()); + Map resultValues = currentDataProvider.getData(getCurrentResult(), + dataSelectionListBox.getValue()); + Map> errorMargins = currentDataProvider + .getErrorData(getCurrentResult(), dataSelectionListBox.getValue()); internalShowNumericResults(resultValues, errorMargins); } }); addControl(dataSelectionListBox); } - + /** * Adjusts, if necessary, the {@link #currentDataProvider} to the type of result, then requests from the - * {@link #currentDataProvider} the mapping of the {@code result} to {@link Number}s for each group key. - * The {@link Number}s returned by the provider will then be passed to {@link #internalShowNumericResults(Map, Map)} - * for display. + * {@link #currentDataProvider} the mapping of the {@code result} to {@link Number}s for each group key. The + * {@link Number}s returned by the provider will then be passed to {@link #internalShowNumericResults(Map, Map)} for + * display. */ protected void internalShowResults(QueryResultDTO result) { currentDataProvider = dataProviders.selectCurrentDataProvider(result.getResultType()); updateDataSelectionListBox(); if (currentDataProvider != null) { - Map resultValues = currentDataProvider.getData(getCurrentResult(), dataSelectionListBox.getValue()); - Map> errorMargins = currentDataProvider.getErrorData(getCurrentResult(), dataSelectionListBox.getValue()); + Map resultValues = currentDataProvider.getData(getCurrentResult(), + dataSelectionListBox.getValue()); + Map> errorMargins = currentDataProvider + .getErrorData(getCurrentResult(), dataSelectionListBox.getValue()); internalShowNumericResults(resultValues, errorMargins); Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override @@ -85,13 +86,13 @@ public abstract class AbstractNumericResultsPresenteremptyList()); + dataSelectionListBox.setAcceptableValues(Collections. emptyList()); } else { Collection dataKeys = currentDataProvider.getDataKeys(getCurrentResult()); String keyToSelect = currentDataProvider.getDefaultDataKeyFor(getCurrentResult()); @@ -100,12 +101,13 @@ public abstract class AbstractNumericResultsPresenter resultValues, Map> errorMargins); + protected abstract void internalShowNumericResults(Map resultValues, + Map> errorMargins); String getSelectedDataKey() { return dataSelectionListBox.getValue(); } - + void setSelectedDataKey(String dataKey) { if (!currentDataProvider.isValidDataKey(getCurrentResult(), dataKey)) { throw new IllegalArgumentException("The given data key '" + dataKey + "' isn't valid"); diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java index 693aa50d24f..b21c3b36ec3 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java @@ -13,20 +13,18 @@ import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.ResultsPresenterWithControls; -import com.sap.sse.datamining.ui.StringMessages; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public abstract class AbstractResultsPresenter extends AbstractComponent - implements ResultsPresenterWithControls { +public abstract class AbstractResultsPresenter + extends AbstractDataMiningComponent implements ResultsPresenterWithControls { private enum ResultsPresenterState { BUSY, ERROR, RESULT } - protected final StringMessages stringMessages; private ResultsPresenterState state; private final DockLayoutPanel mainPanel; @@ -39,9 +37,8 @@ public abstract class AbstractResultsPresenter ex private QueryResultDTO currentResult; private boolean isCurrentResultSimple; - public AbstractResultsPresenter(Component parent, ComponentContext context, StringMessages stringMessages) { + public AbstractResultsPresenter(Component parent, ComponentContext context) { super(parent, context); - this.stringMessages = stringMessages; mainPanel = new DockLayoutPanel(Unit.PX); controlsPanel = new HorizontalPanel(); controlsPanel.setSpacing(5); @@ -61,9 +58,9 @@ public abstract class AbstractResultsPresenter ex mainPanel.add(presentationPanel); errorLabel = new HTML(); errorLabel.setStyleName("chart-importantMessage"); - labeledBusyIndicator = new HTML(stringMessages.runningQuery()); + labeledBusyIndicator = new HTML(getDataMiningStringMessages().runningQuery()); labeledBusyIndicator.setStyleName("chart-busyMessage"); - showError(getStringMessages().runAQuery()); + showError(getDataMiningStringMessages().runAQuery()); } @Override @@ -90,7 +87,7 @@ public abstract class AbstractResultsPresenter ex } else { this.currentResult = null; updateCurrentResultInfo(); - showError(getStringMessages().noDataFound() + "."); + showError(getDataMiningStringMessages().noDataFound() + "."); } } @@ -149,10 +146,6 @@ public abstract class AbstractResultsPresenter ex return isCurrentResultSimple; } - protected StringMessages getStringMessages() { - return stringMessages; - } - @Override public QueryResultDTO getCurrentResult() { return currentResult; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java index 00ab54a3d97..f3814ca6a27 100755 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java @@ -16,31 +16,26 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.DataMiningResources; import com.sap.sse.datamining.ui.ResultsPresenter; -import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.datamining.ui.presentation.ResultsChart.DrillDownCallback; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.controls.ScrolledTabLayoutPanel; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public abstract class AbstractTabbedResultsPresenter extends AbstractComponent +public abstract class AbstractTabbedResultsPresenter extends AbstractDataMiningComponent implements ResultsPresenter { protected static final DataMiningResources resources = GWT.create(DataMiningResources.class); - - protected final StringMessages stringMessages; - protected final ScrolledTabLayoutPanel tabPanel; protected final Map> presentersMappedByHeader; protected final DrillDownCallback drillDownCallback; public AbstractTabbedResultsPresenter(Component parent, ComponentContext context, - DrillDownCallback drillDownCallback, StringMessages stringMessages) { + DrillDownCallback drillDownCallback) { super(parent, context); - this.stringMessages = stringMessages; this.drillDownCallback = drillDownCallback; tabPanel = new ScrolledTabLayoutPanel(30, Unit.PX, resources.arrowLeftIcon(), resources.arrowRightIcon()); tabPanel.setAnimationDuration(0); @@ -48,7 +43,7 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractComponent(); addNewTabTab(); - addTabAndFocus(new MultiResultsPresenter(this, context, drillDownCallback, stringMessages)); + addTabAndFocus(new MultiResultsPresenter(this, context, drillDownCallback)); } private void addNewTabTab() { @@ -62,7 +57,7 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractComponent detailedErrors) { - getSelectedHeader().setText(stringMessages.error()); + getSelectedHeader().setText(getDataMiningStringMessages().error()); getSelectedPresenter().showError(mainError, detailedErrors); } @Override public void showBusyIndicator() { - getSelectedHeader().setText(stringMessages.runningQuery()); + getSelectedHeader().setText(getDataMiningStringMessages().runningQuery()); getSelectedPresenter().showBusyIndicator(); } @@ -116,7 +111,7 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractComponent implements ResultsPresenter { - - private final StringMessages stringMessages; - +public class MultiResultsPresenter extends AbstractDataMiningComponent implements ResultsPresenter { + private final DeckLayoutPanel presenterPanel; private final HorizontalPanel controlsPanel; private final ValueListBox> presentersListBox; private AbstractResultsPresenter currentPresenter; private List> availablePresenters; - - public MultiResultsPresenter(Component parent, ComponentContext context, DrillDownCallback drillDownCallback, StringMessages stringMessages) { + + public MultiResultsPresenter(Component parent, ComponentContext context, + DrillDownCallback drillDownCallback) { super(parent, context); - this.stringMessages = stringMessages; availablePresenters = new ArrayList<>(); availablePresenters.add(new ColumnChartDescriptor(drillDownCallback)); availablePresenters.add(new ColumnChartDescriptorWithErrorBars(drillDownCallback)); availablePresenters.add(new PlainDescriptor()); presenterPanel = new DeckLayoutPanel(); - + controlsPanel = new HorizontalPanel(); controlsPanel.setSpacing(5); - controlsPanel.add(new Label(stringMessages.choosePresentation() + ":")); + controlsPanel.add(new Label(getDataMiningStringMessages().choosePresentation() + ":")); presentersListBox = new ValueListBox<>(new AbstractObjectRenderer>() { @Override protected String convertObjectToString(PresenterDescriptor nonNullObject) { @@ -62,20 +59,20 @@ public class MultiResultsPresenter extends AbstractComponent implement controlsPanel.add(presentersListBox); presentersListBox.setValue(availablePresenters.get(0), false); presentersListBox.setAcceptableValues(availablePresenters); - + setCurrentPresenter(availablePresenters.get(0).getPresenter()); } private void setCurrentPresenter(AbstractResultsPresenter presenter) { controlsPanel.removeFromParent(); presenter.addControl(controlsPanel); - - if (presenter instanceof AbstractNumericResultsPresenter && - currentPresenter instanceof AbstractNumericResultsPresenter) { + + if (presenter instanceof AbstractNumericResultsPresenter + && currentPresenter instanceof AbstractNumericResultsPresenter) { String dataKey = ((AbstractNumericResultsPresenter) currentPresenter).getSelectedDataKey(); ((AbstractNumericResultsPresenter) presenter).setSelectedDataKey(dataKey); } - + currentPresenter = presenter; presenterPanel.setWidget(currentPresenter.getEntryWidget()); Scheduler.get().scheduleDeferred(new ScheduledCommand() { @@ -121,7 +118,7 @@ public class MultiResultsPresenter extends AbstractComponent implement @Override public String getLocalizedShortName() { - return stringMessages.multiResultsPresenter(); + return getDataMiningStringMessages().multiResultsPresenter(); } @Override @@ -158,47 +155,48 @@ public class MultiResultsPresenter extends AbstractComponent implement public Settings getSettings() { return null; } - + @Override public String getDependentCssClassName() { return "multiResultsPresenter"; } private interface PresenterDescriptor { - + public String getName(); - + public AbstractResultsPresenter getPresenter(); - + } - + private class PlainDescriptor implements PresenterDescriptor { - + private final AbstractResultsPresenter presenter; - + public PlainDescriptor() { - presenter = new PlainResultsPresenter(MultiResultsPresenter.this, getComponentContext(), stringMessages); + presenter = new PlainResultsPresenter(MultiResultsPresenter.this, getComponentContext()); } @Override public String getName() { - return stringMessages.plainText(); + return getDataMiningStringMessages().plainText(); } - + @Override public AbstractResultsPresenter getPresenter() { return presenter; } - + } - + private abstract class AbstractColumnChartDescriptor implements PresenterDescriptor { private final ResultsChart presenter; private final String name; public AbstractColumnChartDescriptor(String name, boolean showErrorBars, DrillDownCallback drillDownCallback) { this.name = name; - presenter = new ResultsChart(MultiResultsPresenter.this, getComponentContext(), stringMessages, showErrorBars, drillDownCallback); + presenter = new ResultsChart(MultiResultsPresenter.this, getComponentContext(), showErrorBars, + drillDownCallback); } @Override @@ -211,16 +209,17 @@ public class MultiResultsPresenter extends AbstractComponent implement return presenter; } } - + private class ColumnChartDescriptor extends AbstractColumnChartDescriptor { public ColumnChartDescriptor(DrillDownCallback drillDownCallback) { - super(stringMessages.columnChart(), /* showErrorBars */ false, drillDownCallback); + super(getDataMiningStringMessages().columnChart(), /* showErrorBars */ false, drillDownCallback); } } private class ColumnChartDescriptorWithErrorBars extends AbstractColumnChartDescriptor { public ColumnChartDescriptorWithErrorBars(DrillDownCallback drillDownCallback) { - super(stringMessages.columnChartWithErrorBars(), /* showErrorBars */ true, drillDownCallback); + super(getDataMiningStringMessages().columnChartWithErrorBars(), /* showErrorBars */ true, + drillDownCallback); } } diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainResultsPresenter.java index 4da44f69875..085a30b16c0 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainResultsPresenter.java @@ -18,45 +18,45 @@ import com.sap.sse.common.Util; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; -import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public class PlainResultsPresenter extends AbstractNumericResultsPresenter { - + private static final String htmlWhitespace = " "; -// private final CheckBox appendResultCheckBox; - + // private final CheckBox appendResultCheckBox; + private final ScrollPanel scrollPanel; private final HTML resultsLabel; - + private final LinkedHashSet signifiers; private final Map> results; - - public PlainResultsPresenter(Component parent, ComponentContext context, StringMessages stringMessages) { - super(parent, context, stringMessages); + + public PlainResultsPresenter(Component parent, ComponentContext context) { + super(parent, context); signifiers = new LinkedHashSet<>(); results = new HashMap<>(); - -// appendResultCheckBox = new CheckBox(stringMessages.appendResult()); -// addControl(appendResultCheckBox); - + + // appendResultCheckBox = new CheckBox(stringMessages.appendResult()); + // addControl(appendResultCheckBox); + resultsLabel = new HTML(); scrollPanel = new ScrollPanel(resultsLabel); } @Override - protected void internalShowNumericResults(Map resultValues, Map> errorMargins) { -// boolean appendResult = appendResultCheckBox.getValue(); -// if (!appendResult) { -// signifiers.clear(); -// results.clear(); -// } + protected void internalShowNumericResults(Map resultValues, + Map> errorMargins) { + // boolean appendResult = appendResultCheckBox.getValue(); + // if (!appendResult) { + // signifiers.clear(); + // results.clear(); + // } signifiers.clear(); results.clear(); - + String currentSignifier = getCurrentResult().getResultSignifier(); signifiers.add(currentSignifier); for (Entry entry : resultValues.entrySet()) { @@ -67,13 +67,13 @@ public class PlainResultsPresenter extends AbstractNumericResultsPresenter").appendEscaped(getCurrentResult().getResultSignifier()) - .appendHtmlConstant("").appendHtmlConstant("
"); + .appendHtmlConstant("").appendHtmlConstant("
"); } - + displayBuilder.appendHtmlConstant(""); if (signifiers.size() > 1) { buildTableForMultipleSignifiers(displayBuilder); @@ -115,14 +115,18 @@ public class PlainResultsPresenter extends AbstractNumericResultsPresenter columnHeaders, SafeHtmlBuilder displayBuilder) { - displayBuilder.appendHtmlConstant(""); // First column empty, but selectable to copy the content without shifting the headers + displayBuilder.appendHtmlConstant(""); // First column empty, but selectable + // to copy the content without + // shifting the headers for (Object columnHeader : columnHeaders) { - displayBuilder.appendHtmlConstant(""); + displayBuilder.appendHtmlConstant(""); } displayBuilder.appendHtmlConstant(""); } - - private void buildTableRow(GroupKey rowKey, Iterable orderedColumnKeys, Map columnValues, SafeHtmlBuilder displayBuilder) { + + private void buildTableRow(GroupKey rowKey, Iterable orderedColumnKeys, Map columnValues, + SafeHtmlBuilder displayBuilder) { displayBuilder.appendHtmlConstant(""); displayBuilder.appendHtmlConstant(""); for (Object columnKey : orderedColumnKeys) { @@ -143,7 +147,7 @@ public class PlainResultsPresenter extends AbstractNumericResultsPresenter keys = entry.getKey().getKeys(); GroupKey mainKey = keys.get(0); GroupKey subKey = keys.get(1); - + Map values = unfoldedResultValues.get(mainKey); if (values == null) { values = new HashMap<>(); @@ -159,17 +163,18 @@ public class PlainResultsPresenter extends AbstractNumericResultsPresenter"); displayBuilder.appendHtmlConstant(""); - displayBuilder.appendHtmlConstant(""); + displayBuilder.appendHtmlConstant(""); displayBuilder.appendHtmlConstant(""); } } - + private Iterable getSortedKeys(Set keys) { List sortedKeys = new ArrayList<>(keys); Collections.sort(sortedKeys); return sortedKeys; } - + @Override protected Widget getPresentationWidget() { return scrollPanel; @@ -177,7 +182,7 @@ public class PlainResultsPresenter extends AbstractNumericResultsPresenter { @Override public String toString() { - return getStringMessages().groupName(); + return getDataMiningStringMessages().groupName(); }; }; private final Comparator ascendingByValueKeyComparator = new Comparator() { @@ -74,7 +73,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { @Override public String toString() { - return getStringMessages().valueAscending(); + return getDataMiningStringMessages().valueAscending(); }; }; private final Comparator descendingByValueKeyComparator = new Comparator() { @@ -85,7 +84,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { @Override public String toString() { - return getStringMessages().valueDescending(); + return getDataMiningStringMessages().valueDescending(); }; }; private final Comparator ascendingByGroupAverageComparator = new Comparator() { @@ -97,7 +96,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } public String toString() { - return getStringMessages().groupAverageAscending(); + return getDataMiningStringMessages().groupAverageAscending(); }; }; private final Comparator descendingByGroupAverageComparator = new Comparator() { @@ -107,7 +106,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } public String toString() { - return getStringMessages().groupAverageDescending(); + return getDataMiningStringMessages().groupAverageDescending(); }; }; private final Comparator ascendingByGroupMedianComparator = new Comparator() { @@ -119,7 +118,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } public String toString() { - return getStringMessages().groupMedianAscending(); + return getDataMiningStringMessages().groupMedianAscending(); }; }; private final Comparator descendingByGroupMedianComparator = new Comparator() { @@ -129,7 +128,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } public String toString() { - return getStringMessages().groupMedianDescending(); + return getDataMiningStringMessages().groupMedianDescending(); }; }; @@ -161,14 +160,14 @@ public class ResultsChart extends AbstractNumericResultsPresenter { private final Map medianPerMainKey; private final boolean showErrorBars; - public ResultsChart(Component parent, ComponentContext context, StringMessages stringMessages, - boolean showErrorBars, DrillDownCallback drillDownCallback) { - super(parent, context, stringMessages); + public ResultsChart(Component parent, ComponentContext context, boolean showErrorBars, + DrillDownCallback drillDownCallback) { + super(parent, context); this.showErrorBars = showErrorBars; this.drillDownCallback = drillDownCallback; sortByPanel = new HorizontalPanel(); sortByPanel.setSpacing(5); - sortByPanel.add(new Label(stringMessages.sortBy() + ":")); + sortByPanel.add(new Label(getDataMiningStringMessages().sortBy() + ":")); keyComparatorListBox = new ValueListBox<>(new AbstractRenderer>() { @Override public String render(Comparator object) { @@ -188,7 +187,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { HorizontalPanel decimalsPanel = new HorizontalPanel(); decimalsPanel.setSpacing(5); - decimalsPanel.add(new Label(getStringMessages().shownDecimals() + ":")); + decimalsPanel.add(new Label(getDataMiningStringMessages().shownDecimals() + ":")); decimalsListBox = new ValueListBox(new SimpleObjectRenderer()); decimalsPanel.add(decimalsListBox); decimalsListBox.setValue(0); @@ -215,7 +214,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { seriesMappedByGroupKey = new HashMap<>(); errorSeriesMappedByGroupKey = new HashMap<>(); - simpleResultSeriesKey = new GenericGroupKey<>(stringMessages.results()); + simpleResultSeriesKey = new GenericGroupKey<>(getDataMiningStringMessages().results()); mainKeyToXValueMap = new HashMap<>(); xValueToMainKeyMap = new HashMap<>(); averagePerMainKey = new HashMap<>(); @@ -274,7 +273,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { } private void updateChartSubtitle() { - chart.setChartSubtitle(new ChartSubtitle().setText(getStringMessages().queryResultsChartSubtitle( + chart.setChartSubtitle(new ChartSubtitle().setText(getDataMiningStringMessages().queryResultsChartSubtitle( getCurrentResult().getRetrievedDataAmount(), getCurrentResult().getCalculationTimeInSeconds()))); } @@ -300,7 +299,8 @@ public class ResultsChart extends AbstractNumericResultsPresenter { if (errorMargins != null) { Point errorMarginsPoint = new Point(mainKeyToXValueMap.get(mainKey), errorMargins.getA(), errorMargins.getB()); - errorMarginsPoint.setName(mainKey.asString() + ", " + stringMessages.elements(errorMargins.getC())); + errorMarginsPoint.setName( + mainKey.asString() + ", " + getDataMiningStringMessages().elements(errorMargins.getC())); errorSeriesMappedByGroupKey.get(groupKeyToSeriesKey(resultEntry.getKey())) .addPoint(errorMarginsPoint, false, false, false); } @@ -377,8 +377,8 @@ public class ResultsChart extends AbstractNumericResultsPresenter { if (!seriesMappedByGroupKey.containsKey(seriesKey)) { seriesMappedByGroupKey.put(seriesKey, chart.createSeries().setName(seriesKey.asString())); if (showErrorBars) { - errorSeriesMappedByGroupKey.put(seriesKey, chart.createSeries().setType(Type.ERRORBAR) - .setName(seriesKey.asString() + " " + getStringMessages().dataMiningErrorMargins())); + errorSeriesMappedByGroupKey.put(seriesKey, chart.createSeries().setType(Type.ERRORBAR).setName( + seriesKey.asString() + " " + getDataMiningStringMessages().dataMiningErrorMargins())); } } } @@ -415,7 +415,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { Chart chart = new Chart().setType(Series.Type.COLUMN).setMarginLeft(100).setMarginRight(45).setWidth100() .setHeight100().setBorderColor(new Color("#F0AB00")).setPlotBorderWidth(0) .setCredits(new Credits().setEnabled(false)) - .setChartTitle(new ChartTitle().setText(getStringMessages().dataMiningResult())); + .setChartTitle(new ChartTitle().setText(getDataMiningStringMessages().dataMiningResult())); chart.setExporting(new Exporting().setEnabled(false)); chart.getXAxis().setAllowDecimals(false); chart.getYAxis().setAxisTitleText("Result").setLabels(new YAxisLabels().setFormatter(new AxisLabelsFormatter() { @@ -446,7 +446,7 @@ public class ResultsChart extends AbstractNumericResultsPresenter { @Override public String getLocalizedShortName() { - return getStringMessages().resultsChart(); + return getDataMiningStringMessages().resultsChart(); } @Override diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java index 0a1ae9c0ba1..7afbf876f22 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java @@ -19,18 +19,17 @@ import com.google.gwt.user.client.ui.VerticalPanel; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.DataMiningServiceAsync; import com.sap.sse.datamining.ui.QueryDefinitionChangedListener; import com.sap.sse.datamining.ui.QueryDefinitionProvider; -import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public abstract class AbstractQueryDefinitionProvider extends AbstractComponent implements QueryDefinitionProvider { +public abstract class AbstractQueryDefinitionProvider + extends AbstractDataMiningComponent implements QueryDefinitionProvider { - private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; @@ -38,29 +37,31 @@ public abstract class AbstractQueryDefinitionProvider listeners; public AbstractQueryDefinitionProvider(Component parent, ComponentContext context, - StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter) { + DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter) { super(parent, context); - this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; - + dataminingComponentsChangedTimer = new Timer() { @Override public void run() { getDataMiningService().getComponentsChangedTimepoint(new AsyncCallback() { @Override public void onFailure(Throwable caught) { - AbstractQueryDefinitionProvider.this.errorReporter.reportError(stringMessages.errorFetchingComponentsChangedTimepoint(caught.getMessage())); + AbstractQueryDefinitionProvider.this.errorReporter.reportError(getDataMiningStringMessages() + .errorFetchingComponentsChangedTimepoint(caught.getMessage())); dataminingComponentsChangedTimer.schedule(timerDelayInMillis); } + @Override public void onSuccess(Date componentsChangedTimepoint) { - if (componentsChangedTimepoint.after(AbstractQueryDefinitionProvider.this.componentsChangedTimepoint)) { + if (componentsChangedTimepoint + .after(AbstractQueryDefinitionProvider.this.componentsChangedTimepoint)) { AbstractQueryDefinitionProvider.this.componentsChangedTimepoint = componentsChangedTimepoint; componentsChangedDialog.center(); } @@ -73,12 +74,14 @@ public abstract class AbstractQueryDefinitionProvider(); - + getDataMiningService().getComponentsChangedTimepoint(new AsyncCallback() { @Override public void onFailure(Throwable caught) { - AbstractQueryDefinitionProvider.this.errorReporter.reportError(stringMessages.errorFetchingComponentsChangedTimepoint(caught.getMessage())); + AbstractQueryDefinitionProvider.this.errorReporter.reportError( + getDataMiningStringMessages().errorFetchingComponentsChangedTimepoint(caught.getMessage())); } + @Override public void onSuccess(Date componentsChangedTimepoint) { AbstractQueryDefinitionProvider.this.componentsChangedTimepoint = componentsChangedTimepoint; @@ -86,22 +89,24 @@ public abstract class AbstractQueryDefinitionProvider validateQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { Collection errorMessages = new ArrayList(); - + if (queryDefinition != null) { String grouperError = validateGrouper(queryDefinition); if (grouperError != null && !grouperError.isEmpty()) { @@ -142,7 +147,7 @@ public abstract class AbstractQueryDefinitionProvider +public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractDataMiningComponent implements ExtractionFunctionProvider, AggregatorDefinitionProvider, DataRetrieverChainDefinitionChangedListener { private static final String STATISTIC_PROVIDER_ELEMENT_STYLE = "statisticProviderElement"; - private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final Collection extractionFunctionListeners; @@ -57,10 +55,9 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC private final ValueListBox aggregatorDefinitionListBox; public ExtractionFunctionAndAggregatorDefinitionProvider(Component parent, ComponentContext context, - StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, DataRetrieverChainDefinitionProvider retrieverChainProvider) { super(parent, context); - this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; extractionFunctionListeners = new HashSet<>(); @@ -78,7 +75,7 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC selectionPanel.add(aggregatorDefinitionListBox); mainPanel = new FlowPanel(); - Label label = new Label(this.stringMessages.calculateThe()); + Label label = new Label(this.getDataMiningStringMessages().calculateThe()); label.addStyleName(STATISTIC_PROVIDER_ELEMENT_STYLE); mainPanel.add(label); mainPanel.add(selectionPanel); @@ -242,7 +239,7 @@ public class ExtractionFunctionAndAggregatorDefinitionProvider extends AbstractC @Override public String getLocalizedShortName() { - return stringMessages.statisticProvider(); + return getDataMiningStringMessages().statisticProvider(); } @Override diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java index b2db1f26c4c..4c6c77da93b 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java @@ -22,28 +22,26 @@ import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.DataMiningServiceAsync; import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; import com.sap.sse.datamining.ui.GroupingChangedListener; import com.sap.sse.datamining.ui.GroupingProvider; -import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class MultiDimensionalGroupingProvider extends AbstractComponent +public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponent implements GroupingProvider { - + private static final String GROUPING_PROVIDER_ELEMENT_STYLE = "groupingProviderElement"; - - private final StringMessages stringMessages; + private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final Set listeners; - + private final FlowPanel mainPanel; private final List> dimensionToGroupByBoxes; @@ -52,10 +50,9 @@ public class MultiDimensionalGroupingProvider extends AbstractComponent availableDimensions; public MultiDimensionalGroupingProvider(Component parent, ComponentContext context, - StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, - DataRetrieverChainDefinitionProvider retrieverChainProvider) { + DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataRetrieverChainDefinitionProvider retrieverChainProvider) { super(parent, context); - this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; listeners = new HashSet(); @@ -63,9 +60,9 @@ public class MultiDimensionalGroupingProvider extends AbstractComponent(); isAwaitingReload = false; dimensionToGroupByBoxes = new ArrayList>(); - + mainPanel = new FlowPanel(); - Label groupByLabel = new Label(this.stringMessages.groupBy()); + Label groupByLabel = new Label(this.getDataMiningStringMessages().groupBy()); groupByLabel.addStyleName(GROUPING_PROVIDER_ELEMENT_STYLE); mainPanel.add(groupByLabel); @@ -73,23 +70,23 @@ public class MultiDimensionalGroupingProvider extends AbstractComponent>() { - @Override - public void onSuccess(HashSet dimensions) { - clearAvailableDimensionsAndGroupByBoxes(); - for (FunctionDTO dimension : dimensions) { - availableDimensions.add(dimension); - } - ValueListBox firstDimensionToGroupByBox = createDimensionToGroupByBox(); - addDimensionToGroupByBoxAndUpdateAcceptableValues(firstDimensionToGroupByBox); - if (!availableDimensions.isEmpty()) { - Collections.sort(availableDimensions); - firstDimensionToGroupByBox.setValue(availableDimensions.iterator().next(), true); - } else { - notifyListeners(); - } - } + dataMiningService.getDimensionsFor(currentRetrieverChainDefinition, + LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback>() { + @Override + public void onSuccess(HashSet dimensions) { + clearAvailableDimensionsAndGroupByBoxes(); + for (FunctionDTO dimension : dimensions) { + availableDimensions.add(dimension); + } + ValueListBox firstDimensionToGroupByBox = createDimensionToGroupByBox(); + addDimensionToGroupByBoxAndUpdateAcceptableValues(firstDimensionToGroupByBox); + if (!availableDimensions.isEmpty()) { + Collections.sort(availableDimensions); + firstDimensionToGroupByBox.setValue(availableDimensions.iterator().next(), true); + } else { + notifyListeners(); + } + } - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the dimensions from the server: " + caught.getMessage()); - } - }); + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError( + "Error fetching the dimensions from the server: " + caught.getMessage()); + } + }); } else { clearAvailableDimensionsAndGroupByBoxes(); ValueListBox firstDimensionToGroupByBox = createDimensionToGroupByBox(); @@ -139,7 +137,7 @@ public class MultiDimensionalGroupingProvider extends AbstractComponent getAvailableDimensions() { return Collections.unmodifiableList(availableDimensions); @@ -175,13 +173,14 @@ public class MultiDimensionalGroupingProvider extends AbstractComponent createDimensionToGroupByBoxWithoutEventHandler() { - ValueListBox dimensionToGroupByBox = new ValueListBox(new AbstractObjectRenderer() { - @Override - protected String convertObjectToString(FunctionDTO function) { - return function.getDisplayName(); - } - - }); + ValueListBox dimensionToGroupByBox = new ValueListBox( + new AbstractObjectRenderer() { + @Override + protected String convertObjectToString(FunctionDTO function) { + return function.getDisplayName(); + } + + }); dimensionToGroupByBox.addStyleName(GROUPING_PROVIDER_ELEMENT_STYLE); return dimensionToGroupByBox; } @@ -219,10 +218,10 @@ public class MultiDimensionalGroupingProvider extends AbstractComponent> i=dimensionToGroupByBoxes.iterator(); i.hasNext(); ) { + for (final Iterator> i = dimensionToGroupByBoxes.iterator(); i.hasNext();) { final ValueListBox dimensionListBox = i.next(); if (Util.equalsWithNull(dimension, dimensionListBox.getValue())) { i.remove(); @@ -251,7 +250,7 @@ public class MultiDimensionalGroupingProvider extends AbstractComponent parent, ComponentContext context, - DataMiningSession session, StringMessages stringMessages, DataMiningServiceAsync dataMiningService, - ErrorReporter errorReporter, DataMiningSettingsControl settingsControl, - DataMiningSettingsInfoManager settingsManager, ResultsPresenter resultsPresenter) { - super(parent, context, stringMessages, dataMiningService, errorReporter); + DataMiningSession session, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningSettingsControl settingsControl, DataMiningSettingsInfoManager settingsManager, + ResultsPresenter resultsPresenter) { + super(parent, context, dataMiningService, errorReporter); providerListener = new ProviderListener(); // Creating the header panel, that contains the retriever chain provider and the controls controlsPanel = new FlowPanel(); @@ -97,7 +96,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition settings = new AdvancedDataMiningSettings(); this.settingsControl.addSettingsComponent(this); - queryDefinitionViewerToggleButton = new ToggleButton(getStringMessages().viewQueryDefinition(), + queryDefinitionViewerToggleButton = new ToggleButton(getDataMiningStringMessages().viewQueryDefinition(), new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -105,12 +104,12 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition !queryDefinitionViewerToggleButton.getValue()); } }); - queryDefinitionViewer = new QueryDefinitionViewer(parent, context, getStringMessages()); + queryDefinitionViewer = new QueryDefinitionViewer(parent, context, getDataMiningStringMessages()); addQueryDefinitionChangedListener(queryDefinitionViewer); - predefinedQueryRunner = new PredefinedQueryRunner(parent, context, session, getStringMessages(), + predefinedQueryRunner = new PredefinedQueryRunner(parent, context, session, getDataMiningStringMessages(), dataMiningService, errorReporter, resultsPresenter); - Button clearSelectionButton = new Button(this.getStringMessages().clearSelection()); + Button clearSelectionButton = new Button(getDataMiningStringMessages().clearSelection()); clearSelectionButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -119,7 +118,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition }); addControl(clearSelectionButton); - Button reloadButton = new Button(getStringMessages().reload()); + Button reloadButton = new Button(getDataMiningStringMessages().reload()); reloadButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -134,7 +133,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition } SuggestBoxStatisticProvider statisticProvider = new SuggestBoxStatisticProvider(parent, context, - getStringMessages(), getDataMiningService(), getErrorReporter(), settingsControl, settingsManager); + getDataMiningService(), getErrorReporter(), settingsControl, settingsManager); retrieverChainProvider = statisticProvider; retrieverChainProvider.addDataRetrieverChainDefinitionChangedListener(providerListener); @@ -148,8 +147,8 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition aggregationDefinitionProvider = statisticProvider; aggregationDefinitionProvider.addAggregatorDefinitionChangedListener(providerListener); - groupingProvider = new MultiDimensionalGroupingProvider(parent, context, getStringMessages(), - getDataMiningService(), getErrorReporter(), retrieverChainProvider); + groupingProvider = new MultiDimensionalGroupingProvider(parent, context, getDataMiningService(), + getErrorReporter(), retrieverChainProvider); groupingProvider.addGroupingChangedListener(providerListener); filterSplitPanel = new SplitLayoutPanel(15); @@ -157,7 +156,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition filterSplitPanel.addEast(queryDefinitionViewer.getEntryWidget(), 600); filterSplitPanel.setWidgetHidden(queryDefinitionViewer.getEntryWidget(), true); filterSelectionProvider = new ListRetrieverChainFilterSelectionProvider(parent, context, session, - stringMessages, dataMiningService, errorReporter, retrieverChainProvider); + dataMiningService, errorReporter, retrieverChainProvider); filterSelectionProvider.addSelectionChangedListener(providerListener); filterSplitPanel.add(filterSelectionProvider.getEntryWidget()); @@ -213,13 +212,13 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition private ValueListBox dimensionChooser; public FirstDimensionSelectionDialog(DialogCallback callback) { - super(getStringMessages().chooseDifferentDimensionTitle(), - getStringMessages().chooseDifferentDimensionMessage(), getStringMessages().ok(), - getStringMessages().cancel(), new DataEntryDialog.Validator() { + super(getDataMiningStringMessages().chooseDifferentDimensionTitle(), + getDataMiningStringMessages().chooseDifferentDimensionMessage(), getDataMiningStringMessages().ok(), + getDataMiningStringMessages().cancel(), new DataEntryDialog.Validator() { @Override public String getErrorMessage(FunctionDTO valueToValidate) { if (valueToValidate == null) { - return getStringMessages().pleaseSelectADimension(); + return getDataMiningStringMessages().pleaseSelectADimension(); } else { return null; } @@ -339,7 +338,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition @Override public String getLocalizedShortName() { - return getStringMessages().queryDefinitionProvider(); + return getDataMiningStringMessages().queryDefinitionProvider(); } @Override @@ -365,7 +364,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition @Override public SettingsDialogComponent getSettingsDialogComponent( AdvancedDataMiningSettings settings) { - return new AdvancedDataMiningSettingsDialogComponent(settings, getStringMessages()); + return new AdvancedDataMiningSettingsDialogComponent(settings, getDataMiningStringMessages()); } @Override diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java index 1d49a0542e1..acfccc09587 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java @@ -3,11 +3,11 @@ package com.sap.sse.datamining.ui.selection; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public abstract class RetrieverLevelSettingsComponent extends AbstractComponent { +public abstract class RetrieverLevelSettingsComponent extends AbstractDataMiningComponent { private final DataRetrieverLevelDTO retrieverLevel; private final String localizedName; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java index ce02931e2f5..7ea4d6b27fe 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java @@ -23,25 +23,23 @@ import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.DataMiningServiceAsync; import com.sap.sse.datamining.ui.DataMiningSettingsControl; import com.sap.sse.datamining.ui.DataMiningSettingsInfo; import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; -import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.CompositeSettings; import com.sap.sse.gwt.client.shared.components.CompositeTabbedSettingsDialogComponent; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponent +public class SimpleDataRetrieverChainDefinitionProvider extends AbstractDataMiningComponent implements DataRetrieverChainDefinitionProvider { - private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final Set listeners; @@ -57,10 +55,9 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen private final List> retrieverLevelSettingsComponents; public SimpleDataRetrieverChainDefinitionProvider(Component parent, ComponentContext context, - final StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, DataMiningSettingsControl settingsControl, DataMiningSettingsInfoManager settingsManager) { super(parent, context); - this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; this.retrieverLevelSettingsComponents = new ArrayList<>(); @@ -73,7 +70,7 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen mainPanel = new HorizontalPanel(); mainPanel.setSpacing(5); - mainPanel.add(new Label(this.stringMessages.analyze())); + mainPanel.add(new Label(getDataMiningStringMessages().analyze())); retrieverChainsListBox = createRetrieverChainsListBox(); mainPanel.add(retrieverChainsListBox); @@ -184,7 +181,7 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen @Override public String getLocalizedShortName() { - return stringMessages.dataMiningRetrieval(); + return getDataMiningStringMessages().dataMiningRetrieval(); } @Override @@ -237,7 +234,7 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen DataMiningSettingsInfo settingsInfo = settingsManager.getSettingsInfo(settingsType); settingsComponents.add(new RetrieverLevelSettingsComponent(SimpleDataRetrieverChainDefinitionProvider.this, getComponentContext(), retrieverLevel, settingsInfo.getId(), - settingsInfo.getLocalizedName(stringMessages)) { + settingsInfo.getLocalizedName()) { @Override public SettingsDialogComponent getSettingsDialogComponent( SerializableSettings settings) { @@ -286,7 +283,7 @@ public class SimpleDataRetrieverChainDefinitionProvider extends AbstractComponen DataMiningSettingsInfo settingsInfo = settingsManager.getSettingsInfo(settingsType); RetrieverLevelSettingsComponent c = new RetrieverLevelSettingsComponent( SimpleDataRetrieverChainDefinitionProvider.this, getComponentContext(), retrieverLevel, - settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { + settingsInfo.getId(), settingsInfo.getLocalizedName()) { @Override public SettingsDialogComponent getSettingsDialogComponent( SerializableSettings settings) { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java index 922f4cb2bb4..78700c87a8d 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java @@ -30,6 +30,7 @@ import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.AggregatorDefinitionChangedListener; import com.sap.sse.datamining.ui.DataMiningServiceAsync; import com.sap.sse.datamining.ui.DataMiningSettingsControl; @@ -39,9 +40,7 @@ import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; import com.sap.sse.datamining.ui.ExtractionFunctionChangedListener; import com.sap.sse.datamining.ui.StatisticChangedListener; import com.sap.sse.datamining.ui.StatisticProvider; -import com.sap.sse.datamining.ui.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.CompositeSettings; import com.sap.sse.gwt.client.shared.components.CompositeTabbedSettingsDialogComponent; @@ -58,11 +57,11 @@ import com.sap.sse.gwt.client.suggestion.CustomSuggestBox; * * @author Lennart Hensler */ -public class SuggestBoxStatisticProvider extends AbstractComponent implements StatisticProvider { +public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent + implements StatisticProvider { private static final String STATISTIC_PROVIDER_ELEMENT_STYLE = "statisticProviderElement"; - private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final Set retrieverChainListeners; @@ -82,10 +81,9 @@ public class SuggestBoxStatisticProvider extends AbstractComponent aggregatorListBox; public SuggestBoxStatisticProvider(Component parent, ComponentContext componentContext, - StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, DataMiningSettingsControl settingsControl, DataMiningSettingsInfoManager settingsManager) { super(parent, componentContext); - this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; retrieverChainListeners = new HashSet<>(); @@ -99,7 +97,7 @@ public class SuggestBoxStatisticProvider extends AbstractComponent(); mainPanel = new FlowPanel(); - Label label = new Label(this.stringMessages.calculateThe()); + Label label = new Label(getDataMiningStringMessages().calculateThe()); label.addStyleName(STATISTIC_PROVIDER_ELEMENT_STYLE); mainPanel.add(label); @@ -295,7 +293,7 @@ public class SuggestBoxStatisticProvider extends AbstractComponent settingsType = retrieverLevelSettings.getValue().getClass(); DataMiningSettingsInfo settingsInfo = settingsManager.getSettingsInfo(settingsType); settingsComponents.add(new RetrieverLevelSettingsComponent(this, getComponentContext(), retrieverLevel, - settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { + settingsInfo.getId(), settingsInfo.getLocalizedName()) { @Override public SettingsDialogComponent getSettingsDialogComponent( SerializableSettings settings) { @@ -343,7 +341,8 @@ public class SuggestBoxStatisticProvider extends AbstractComponent settingsType = retrieverLevelSettings.getValue().getClass(); DataMiningSettingsInfo settingsInfo = settingsManager.getSettingsInfo(settingsType); RetrieverLevelSettingsComponent c = new RetrieverLevelSettingsComponent(this, getComponentContext(), - retrieverLevel, settingsInfo.getId(), settingsInfo.getLocalizedName(stringMessages)) { + retrieverLevel, settingsInfo.getId(), + settingsInfo.getLocalizedName()) { @Override public SettingsDialogComponent getSettingsDialogComponent( SerializableSettings settings) { @@ -447,7 +446,7 @@ public class SuggestBoxStatisticProvider extends AbstractComponent +public class ListRetrieverChainFilterSelectionProvider extends AbstractDataMiningComponent implements FilterSelectionProvider { private final DataMiningSession session; - private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final DataRetrieverChainDefinitionProvider retrieverChainProvider; @@ -76,11 +74,10 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent private ReducedDimensionsDTO reducedDimensions; public ListRetrieverChainFilterSelectionProvider(Component parent, ComponentContext context, - DataMiningSession session, StringMessages stringMessages, DataMiningServiceAsync dataMiningService, - ErrorReporter errorReporter, DataRetrieverChainDefinitionProvider retrieverChainProvider) { + DataMiningSession session, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataRetrieverChainDefinitionProvider retrieverChainProvider) { super(parent, context); this.session = session; - this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; this.retrieverChainProvider = retrieverChainProvider; @@ -100,11 +97,11 @@ public class ListRetrieverChainFilterSelectionProvider extends AbstractComponent ScrollPanel retrieverLevelListScrollPanel = new ScrollPanel(retrieverLevelList); DockLayoutPanel selectionDockLayoutPanel = new DockLayoutPanel(Unit.PX); - selectionDockLayoutPanel.addNorth(new Label(this.stringMessages.filterBy()), 18); + selectionDockLayoutPanel.addNorth(new Label(getDataMiningStringMessages().filterBy()), 18); selectionPanel = new ScrollPanel(); selectionDockLayoutPanel.add(selectionPanel); - selectionPresenter = new PlainFilterSelectionPresenter(this, context, stringMessages, retrieverChainProvider, + selectionPresenter = new PlainFilterSelectionPresenter(this, context, getDataMiningStringMessages(), retrieverChainProvider, this); selectionPresenterScrollPanel = new ScrollPanel(selectionPresenter.getEntryWidget()); diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java index 1348b766fb8..d7a856ea234 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java @@ -21,14 +21,14 @@ import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; +import com.sap.sse.datamining.ui.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.DataMiningServiceAsync; import com.sap.sse.gwt.client.ErrorReporter; -import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class RetrieverLevelFilterSelectionProvider extends AbstractComponent { +public class RetrieverLevelFilterSelectionProvider extends AbstractDataMiningComponent { private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; From c063a33d25fab54ec7a8e19f548f0186671c069c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Thu, 12 Apr 2018 12:24:10 +0200 Subject: [PATCH 05/63] started to extract sailing independent string messages --- .../sailing/gwt/ui/client/StringMessages.java | 104 ++---------------- .../sap/sse/datamining/ui/StringMessages.java | 34 ++---- .../sap/sse/gwt/client/StringMessages.java | 20 ++++ 3 files changed, 39 insertions(+), 119 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 4049a4b1a41..b2532cd38b1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -11,7 +11,7 @@ import com.sap.sse.gwt.client.DefaultRule_1_0n; @DefaultLocale("en") public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, - com.sap.sse.gwt.adminconsole.StringMessages, CommonStringMessages, com.sap.sse.datamining.ui.StringMessages { + com.sap.sse.gwt.adminconsole.StringMessages, CommonStringMessages { public static final StringMessages INSTANCE = GWT.create(StringMessages.class); String manage2Sail(); @@ -312,7 +312,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String welcomeToSailingAnalyticsBody(); String home(); String clickAndDragToZoomIn(); - String windSpeed(); String allTimesInUTC(); String autoZoomTo(); String autoZoomToBoats(); @@ -332,11 +331,9 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String selectAtLeastOneCompetitorForInvitation(); String directionChange(); String speedChange(); - String degreesShort(); String untracked(); String delayForLiveMode(); String notAvailable(); - String details(); String noGroupSelected(); String combinedWindSourceTypeName(); String legMiddleWindSourceTypeName(); @@ -415,7 +412,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String simulateWithOffset(); String boatClassDoesNotMatchSelectedRegatta(String boatClass); String regattaExistForSelectedBoatClass(); - String reload(); String addRegatta(); String importRegattas(); String exchangeName(); @@ -578,7 +574,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String scoringSchemeHighPointFirstGetsOne(); String scoringSchemeHighPointFirstGetsOneDescription(); String scoringSchemeHighPointFirstGetsTen(); - String knotsUnit(); String knotsValue(double value); String knotsRange(double lowerValue, double upperValue); String averageJibeLossInMetersTooltip(); @@ -657,10 +652,8 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String regattaRankTooltip(); String overallRank(); String overallRankTooltip(); - String noDataFound(); String displayName(); String histogram(); - String numberOfDataPoints(); String angleAndTotalNumberOfDataPointsAndCovAndCm(int angle, int dataCount, double coefficiantOfVariation, double confidenceMeasure); String buoyZone(); @@ -917,16 +910,13 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String polars(); String foilingSegments(); String sailID(); - String clearSelection(); String running(); String distanceToLineFiveSecondsBeforeStart(); String speedOverGroundFiveSecondsBeforeStart(); String distanceToLineFiveSecondsBeforeStartTooltip(); String speedOverGroundFiveSecondsBeforeStartTooltip(); - String runAsSubstantive(); String done(); String lastFinished(); - String run(); String times(); String dataAmount(); String averageCleanedServerTime(); @@ -936,7 +926,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String cleanedServerTime(); String overallTime(); String cleanedOverallTime(); - String dataMiningResult(); String confidenceShouldBeBetween(); String minDataValuesNeedToBeAtLeastZero(); String numberOfColumnsAtLeast2(); @@ -951,16 +940,10 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String removeAllSheets(); String removeAll(); String selectSheet(); - String groupBy(); String statisticToCalculate(); - String queryResultsChartSubtitle(int retrievedDataAmount, double calculationTime); String noQuerySelected(); - String runAutomatically(); - String noStatisticSelectedError(); String noCustomGrouperScriptTextError(); - String noDimensionToGroupBySelectedError(); String noGrouperSelectedError(); - String noDataRetrieverChainDefinitonSelectedError(); String windImport_Upload(); String windImport_Title(); String windImport_BoatId(); @@ -987,14 +970,12 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String raceTimeDownwindTooltip(); String raceTimeReachingTooltip(); String raceTimeUpwindTooltip(); - String queryNotValidBecause(); String dataMining(); String hideToolbar(); String showSeriesLeaderboards(); String showOverallLeaderboard(); String exchangeHost(); String explainExchangeHostName(); - String errorRunningDataMiningQuery(); String offset(); String line(); String lineAngleToWindAndAdvantage(String startLineLength, String startLineAngleToCombinedWind, String startLineAdvantageousSide, String startLineAdvantageInMeters); @@ -1014,7 +995,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String id(); String compress(); String compressTooltip(); - String queryRunner(); String rerunQueryAfterRefresh(); String refreshIntervalMustntBeEmpty(); String selectionTables(); @@ -1101,15 +1081,9 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String timeSinceStart(String timeSince); String distanceToLine(); String TWATooltip(); - String TWA(); String showBoatClassChartsLabel(); String showDiagram(); - String runAutomaticallyTooltip(); String rerunQueryAfterRefreshTooltip(); - String queryDefinitionProvider(); - String statisticProvider(); - String calculateThe(); - String groupingProvider(); String releaseNotes(); String hasSplitFleetContiguousScoring(); String eventOverview(); @@ -1266,7 +1240,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String raceVisibilityColumn(); String enterCarryValueFor(String competitorName); String advanced(); - String basedOn(); String mappingDetails(); String deviceMappingQrCodeExplanation(); String qrCode(); @@ -1288,7 +1261,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String userManagement(); String regattaStructureImport(); String filteredBy(); - String filterBy(); String editSeries(); String pleaseSelectAtLeastOneRegatta(); String pleaseSelectAnEvent(); @@ -1301,7 +1273,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String timeBeforeRaceStart(); String showXYDiagram(); String xyDiagram(); - String boatSpeed(); String confidence(); String errorTryingToGetEvents(String message); String createDefaultSettingsForAllRegattas(); @@ -1312,7 +1283,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String successfullyCreatedRegattas(); String errorTryingToRegisterRacesForTracking(String raceNames, String message); String errorDeterminingPolarAvailability(String raceName, String message); - String error(); String fileStorage(); String active(); String scoringSchemeHighPointEssOverallDescription(); @@ -1357,7 +1327,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String alwaysShowCompetitorNationalityColumn(); String alwaysShowCompetitorNationalityColumnTooltip(); String loadingDimensionValues(); - String runningQuery(); String inviteBuoyTenders(); String orMultipleEmails(); String courseOverGroundTrueDegreesTooltip(); @@ -1365,11 +1334,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String distanceIncludingGateStartInMeters(); String distanceTraveledIncludingGateStartTooltip(); String raceDistanceTraveledIncludingGateStartTooltip(); - String results(); - String groupName(); - String valueAscending(); - String valueDescending(); - String sortBy(); String dashboardHeader(); String dashboardNoWindBotAvailableHeader(); @@ -1410,15 +1374,12 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String suppressedMarkPassing(); String warningSettingFixedPassing(String waypoint); String windUp(); - String currentFilterSelection(); String notCapableOfGeneratingACodeForIdentifier(); String serverUrl(); String rotatedFromTrueNorth(double mappedTrueNorthDeg); String clickToToggleWindUp(); String clickToToggleWindStreamlets(); String startLineToFirstMarkTriangle(String distanceInMeters); - String dataMiningComponentsHaveBeenUpdated(); - String dataMiningComponentsNeedReloadDialogMessage(); String noDataForEvent(); String countriesCount(@PluralCount(DefaultRule_1_0n.class) int count); @@ -1509,30 +1470,15 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String racesOverview(); String listFormatLabel(); String competitionFormatLabel(); - String empty(); - String runAQuery(); String latestRegattaStandings(); - String plainText(); - String columnChart(); - String columnChartWithErrorBars(); - String choosePresentation(); - String cantDisplayDataOfType(String resultType); - String shownDecimals(); String openFullscreenView(); String closeFullscreenView(); String videosCount(@PluralCount(DefaultRule_1_0n.class) int count); String photosCount(@PluralCount(DefaultRule_1_0n.class) int count); String eventsHaveTakenPlace(@PluralCount(DefaultRule_1_0n.class) int eventCount); String raceOffice(); - String analyze(); - String dataMiningSettings(); - String multiResultsPresenter(); - String plainResultsPresenter(); - String resultsChart(); - String tabbedResultsPresenter(); String polarResultsPresenter(); String maneuverSpeedDetailsResultsPresenter(); - String dataMiningRetrieval(); String actionWatch(); String actionAnalyze(); String inviteSelectedCompetitors(); @@ -1549,23 +1495,9 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String defaultName(); String exampleTextForName(); String flightsCount(@PluralCount(DefaultRule_1_0n.class) int count); - String viewQueryDefinition(); String queryDefinitionViewer(); - String groupAverageAscending(); - String groupAverageDescending(); - String groupMedianAscending(); - String groupMedianDescending(); String resultsFoundForSearch(@PluralCount(DefaultRule_1_0n.class) int amount, String searchText); - String runPredefinedQuery(); - String selectPredefinedQuery(); - String predefinedQueryRunner(); - String developerOptions(); - String copyToClipboard(); - String code(); String useClassGetName(); - String useClassGetNameTooltip(); - String useStringLiterals(); - String useStringLiteralsTooltip(); String errorLoadingDataWithTryAgain(); String addGalleryPhoto(); String addStageImage(); @@ -1739,8 +1671,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String notificationAboutUpcomingRaces(); String notificationRegattaConfigurationUpdatedUsingByMarks(); String warningOverrideRegattaConfigurationCourseDesignerToByMarks(); - String allRacesHaveBeenDenoted(); - + String allRacesHaveBeenDenoted(); String chartSelectionHint(); String chooseALanguage(); String solutions(); @@ -1865,22 +1796,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String gribWindImport_Title(); String nmeaWindImport_Title(); String bravoWindImport_Title(); - String angleInDegree(); - String angleInRadian(); - String centralAngleInRadian(); - String centralAngleInDegree(); - String kilometers(); - String meters(); - String nauticalMiles(); - String seaMiles(); - String geographicalMiles(); - String days(); - String hours(); - String minutes(); - String seconds(); - String milliseconds(); - String floatNumber(); - String integer(); String appendResult(); String sampleColor(); String leaderboardPage(); @@ -1889,7 +1804,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String estimatedDistance(); String estimatedTime(); String nothingUpcoming(); - String chooseAAutoplayConfiguration(); String raceRankShort(); String showRaceRankColumn(); @@ -1935,7 +1849,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String errorFetchingStatistics(String message); String errorFetchingAggregators(String message); String errorLoadingDataRetrieverChainDefinitions(String message); - String errorFetchingComponentsChangedTimepoint(String message); String errorRunningQuery(String message); String errorReadingWindFixes(String message); String errorAddingWindFixForRace(String raceIdentifier, String message); @@ -1994,11 +1907,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String minimumDurationBetweenAdjacentFoilingSegmentsInSeconds(); String minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip(); String needToProvideValidMinimumRideHeight(); - String dataMiningErrorMargins(); - String elements(long count); - String chooseDifferentDimensionTitle(); - String chooseDifferentDimensionMessage(); - String pleaseSelectADimension(); String currentPortDaggerboardRake(); String currentPortDaggerboardRakeTooltip(); String currentStbdDaggerboardRake(); @@ -2107,4 +2015,12 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String avgTurningRate(); String lowestSpeed(); String degreesPerSecondUnit(); + String boatSpeed(); + String knotsUnit(); + String windSpeed(); + String TWA(); + String degreesShort(); + String numberOfDataPoints(); + + } diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java index d13b5ea4436..9d1c7505d1c 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java @@ -1,7 +1,15 @@ package com.sap.sse.datamining.ui; import com.google.gwt.core.client.GWT; +import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale; + +/** + * Defines the text strings for i18n that are used by the Datamining GWT bundle. + * + * @author Maximilian Gro (D064866) + */ +@DefaultLocale("en") public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { public static final StringMessages INSTANCE = GWT.create(StringMessages.class); @@ -18,7 +26,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String useStringLiterals(); String useStringLiteralsTooltip(); String copyToClipboard(); - String details(); String code(); String queryDefinitionViewer(); String runAsSubstantive(); @@ -28,13 +35,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String integer(); String runAQuery(); String runningQuery(); - String noDataFound(); - String numberOfDataPoints(); - String boatSpeed(); - String knotsUnit(); - String windSpeed(); - String TWA(); - String degreesShort(); String choosePresentation(); String plainText(); String groupName(); @@ -52,11 +52,9 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String resultsChart(); String cantDisplayDataOfType(String resultType); String sortBy(); - String results(); String developerOptions(); String runAutomatically(); String runAutomaticallyTooltip(); - String filterBy(); String currentFilterSelection(); String plainResultsPresenter(); String multiResultsPresenter(); @@ -65,7 +63,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String errorFetchingComponentsChangedTimepoint(String message); String dataMiningComponentsHaveBeenUpdated(); String dataMiningComponentsNeedReloadDialogMessage(); - String reload(); String noDimensionToGroupBySelectedError(); String noDataRetrieverChainDefinitonSelectedError(); String noStatisticSelectedError(); @@ -79,23 +76,10 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String chooseDifferentDimensionMessage(); String pleaseSelectADimension(); String queryDefinitionProvider(); - String analyze(); String dataMiningRetrieval(); - String error(); String tabbedResultsPresenter(); - String empty(); String angleInDegree(); String angleInRadian(); String centralAngleInRadian(); - String centralAngleInDegree(); - String kilometers(); - String meters(); - String nauticalMiles(); - String seaMiles(); - String geographicalMiles(); - String days(); - String hours(); - String minutes(); - String seconds(); - String milliseconds(); + String centralAngleInDegree(); } diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java index cba8b19016d..d04c9a06766 100755 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java @@ -33,4 +33,24 @@ public interface StringMessages extends Messages { String resetToDefaultInProgress(); String settingsRemoved(); String settingsRemovedError(); + + String details(); + String filterBy(); + String noDataFound(); + String results(); + String analyze(); + String reload(); + String empty(); + String error(); + + String kilometers(); + String meters(); + String nauticalMiles(); + String seaMiles(); + String geographicalMiles(); + String days(); + String hours(); + String minutes(); + String seconds(); + String milliseconds(); } From 98ec295e737fe0b77c56b4e0e2eb714fc1e52fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Fri, 13 Apr 2018 11:12:49 +0200 Subject: [PATCH 06/63] extracted sailing independent StringMessages into separat .properties files located under sse --- .../sailing/gwt/ui/client/StringMessages.java | 29 ------------- .../gwt/ui/client/StringMessages.properties | 42 ------------------- .../ui/client/StringMessages_de.properties | 42 ------------------- .../ui/client/StringMessages_es.properties | 42 ------------------- .../ui/client/StringMessages_fr.properties | 42 ------------------- .../ui/client/StringMessages_ja.properties | 42 ------------------- .../ui/client/StringMessages_pt.properties | 42 ------------------- .../ui/client/StringMessages_ru.properties | 35 ---------------- .../ui/client/StringMessages_zh.properties | 42 ------------------- .../org.eclipse.core.resources.prefs | 8 ++++ .../sap/sse/gwt/client/StringMessages.java | 5 +++ .../sse/gwt/client/StringMessages.properties | 42 +++++++++++++++++++ .../gwt/client/StringMessages_de.properties | 42 +++++++++++++++++++ .../gwt/client/StringMessages_es.properties | 42 +++++++++++++++++++ .../gwt/client/StringMessages_fr.properties | 42 +++++++++++++++++++ .../gwt/client/StringMessages_ja.properties | 42 +++++++++++++++++++ .../gwt/client/StringMessages_pt.properties | 42 +++++++++++++++++++ .../gwt/client/StringMessages_ru.properties | 35 ++++++++++++++++ .../gwt/client/StringMessages_zh.properties | 42 +++++++++++++++++++ 19 files changed, 342 insertions(+), 358 deletions(-) create mode 100644 java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties create mode 100644 java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties create mode 100644 java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_es.properties create mode 100644 java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_fr.properties create mode 100644 java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ja.properties create mode 100644 java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_pt.properties create mode 100644 java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ru.properties create mode 100644 java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_zh.properties diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index b2532cd38b1..aa049ed7772 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -25,8 +25,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String wind(); String windPanelLabel(); String refresh(); - @Override - String remove(); String removeNumber(int count); String windSource(); String dampeningInterval(); @@ -63,8 +61,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String linkToColumn(); String unlink(); String leaderboardName(); - @Override - String cancel(); String pleaseEnterAName(); String pleaseEnterABoatClass(); String discardRacesFromHowManyStartedRacesOn(); @@ -76,8 +72,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String renameLeaderboard(); String addColumnToLeaderboard(); String pleaseEnterNameForNewRaceColumn(); - @Override - String ok(); String medalRace(); String renameRace(); String openSelectedLeaderboard(); @@ -93,8 +87,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String leaderboard(); String leaderboards(); String leaderboardSettings(); - @Override - String settings(); String page(); String linkedRaces(); String selectAtLeastOneLegDetail(); @@ -175,8 +167,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String penaltyCircles(); String medalRaceIsNull(); String maneuverTypes(); - @Override - String configuration(); String chooseChart(); String distanceTraveled(); String velocityMadeGoodLong(); @@ -191,15 +181,11 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String metersUnit(); String millimetersUnit(); String degreesUnit(); - @Override - String close(); String compareCompetitors(); String description(); String sailNumber(); String country(); String no3LetterCodes(); - @Override - String add(); String delete(); String showCharts(); String raceWithThisNameAlreadyExists(); @@ -266,7 +252,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String blockedApplyButton(); String multiplierInfo(); String noPairingListAvailable(); - String settingsForComponent(String localizedComponentName); String noEventsFound(); String noEventSelected(); String noLeaderboardsFound(); @@ -303,8 +288,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String pleaseEnterNonEmptyDescription(); String groupWithThisNameAlreadyExists(); String detailsOfLeaderboardGroup(); - String edit(); - String save(); String abort(); String noLeaderboardGroupWithNameFound(String groupName); String overview(); @@ -1250,14 +1233,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String enterRaceName(); String enterCourseName(); String scoringSchemeHighPointFirstGetsTenOrEightDescription(); - @Override - String serverError(); - @Override - String remoteProcedureCall(); - @Override - String serverReplies(); - @Override - String errorCommunicatingWithServer(); String userManagement(); String regattaStructureImport(); String filteredBy(); @@ -1518,8 +1493,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String competitorToolTipMessage(String competitorName, String currentFleetName, String assignedToFleet, String raceName); String addMarkToRegatta(); String selectALeaderboardGroup(); - @Override - String pleaseSelect(); String requiresValidRegatta(); String couldNotObtainRace(String regattaLikeName, String raceColumnName, String fleetName, String technicalErrorMessage); String errorTryingToCreateEmbeddedMap(String message); @@ -2021,6 +1994,4 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String TWA(); String degreesShort(); String numberOfDataPoints(); - - } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index f7e41b9168f..9dcea48205e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -13,7 +13,6 @@ wind=Wind maneuverType=Maneuver windPanelLabel=This is the Wind Panel which so far is completely empty. refresh=Refresh -remove=Remove removeNumber=Remove ({0}) windSource=Wind Source dampeningInterval=Dampening Interval @@ -52,7 +51,6 @@ trackedRaceConnectedToSelectedRaceName=Tracked Race Connected to Selected Race N linkToColumn=Link to Column unlink=Unlink leaderboardName=Leaderboard Name -cancel=Cancel pleaseEnterAName=Please enter a name pleaseEnterABoatClass=Please enter a boat class discardRacesFromHowManyStartedRacesOn=Discard one more race starting with how many started races @@ -64,7 +62,6 @@ startingFromNumberOfRaces=Starting from how many races renameLeaderboard=Rename Leaderboard addColumnToLeaderboard=Add Column to Leaderboard pleaseEnterNameForNewRaceColumn=Please enter a name for new race column -ok=OK medalRace=Medal Race renameRace=Rename Race openSelectedLeaderboard=Open Selected Leaderboard @@ -88,7 +85,6 @@ sapSailingAnalytics=Sailing Analytics leaderboard=Leaderboard leaderboards=Leaderboards leaderboardSettings=Leaderboard Settings -settings=Settings selectAtLeastOneLegDetail=Select at least one leg detail currentSpeedOverGroundInKnots=SOG currentSpeedOverGroundInKnotsTooltip=The current speed over ground. @@ -172,7 +168,6 @@ tacks=Tacks jibes=Jibes penaltyCircles=Penalty Circles medalRaceIsNull=Medalrace value not allowed -configuration=Configuration maneuverTypes=Maneuvers chooseChart=Choose chart distanceTraveled=Distance Traveled @@ -190,13 +185,11 @@ secondsPerNauticalMileUnit=s/NM metersUnit=m millimetersUnit=mm degreesUnit=° -close=Close compareCompetitors=Compare competitors description=Description sailNumber=Sail number country=Country no3LetterCodes=Unable to find the IOC 3-letter-codes. -add=Add delete=Delete showCharts=Show charts raceWithThisNameAlreadyExists=A race with that name already exists. @@ -270,7 +263,6 @@ printHint=Prints the applied version blockedApplyButton=Registered Competitors are unequal to Competitors from Pairinglist! multiplierInfo=Multipes flights and create them next to each other so that a competition with less boatchanges is possible noPairingListAvailable=The print function is only available when a pairing list has already been applied to the selected leaderboards race logs. -settingsForComponent=Settings for {0} noEventsFound=No events were found noEventSelected=No event selected noLeaderboardsFound=No leaderboards were found @@ -308,8 +300,6 @@ leaderboardGroup=Leaderboard Group pleaseEnterNonEmptyDescription=Please enter a non-empty description groupWithThisNameAlreadyExists=A leaderboard group with this name already exists. detailsOfLeaderboardGroup=Details of leaderboard group -edit=Edit -save=Save abort=Abort noLeaderboardGroupWithNameFound=No leaderboard group with the name {0} found overview=Overview @@ -346,7 +336,6 @@ degreesShort=deg untracked=Untracked delayForLiveMode=Delay for live mode: notAvailable=Not available -details=Details noGroupSelected=No group selected combinedWindSourceTypeName=Combined legMiddleWindSourceTypeName=Middle of Leg @@ -428,7 +417,6 @@ simulateAsLiveRace=Simulate as live race simulateWithOffset=Offset before start in minutes: boatClassDoesNotMatchSelectedRegatta=The selected races contain boat classes which are not the same as the boat class ''{0}'' of the selected regatta. No races will be loaded. regattaExistForSelectedBoatClass=There is at least one regatta for the selected boat classes. Really create default regatta(s) for those race(s)? -reload=Reload addRegatta=Add Regatta... importRegattas=Import Regattas... exchangeName=Exchange Name @@ -650,7 +638,6 @@ totalNetPointsColumnTooltip=The total net points of a competitor in the regatta. windData=Wind data gpsData=GPS data status=Status -noDataFound=No data found displayName=Display name histogram=Histogram numberOfDataPoints=Number of data points @@ -1251,10 +1238,6 @@ enterImageURL=Enter image URL... enterVideoURL=Enter video URL... enterSponsorImageURL=Enter sponsor image URL... enterRaceName=Enter race name... -serverError=An error occurred while attempting to contact the server. Please check your network connection and try again. -remoteProcedureCall=Remote Procedure Call -serverReplies=Server replies -errorCommunicatingWithServer=Error communicating with server userManagement=User Management regattaStructureImport=Regatta Structure Import filteredBy=filtered by @@ -1281,7 +1264,6 @@ noFleetsDefined=No fleets defined. successfullyCreatedRegattas=Successfully created regattas errorTryingToRegisterRacesForTracking=Error trying to register races {0} for tracking: {1}. Check live/stored URI syntax. errorDeterminingPolarAvailability=Error determining availability of polar / VPP data for race {0}: {1} -error=Error fileStorage=File Storage active=Active scoringSchemeHighPointEssOverallDescription=Score in points. Winner of an act scores 10 points, 2nd - 9 points, .... Any tie in the overall Extreme Sailing Series is broken in favour of the competitor with the most Act wins. If that does not break the tie, the result in the last Act will be used. @@ -1332,7 +1314,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=Distance (w/ Gate Start) distanceTraveledIncludingGateStartTooltip=The distance traveled from the leg start to the end\nor to the current time point, if the leg isn''t finished.\nIf the leg includes a gate start, the distance from the pin end to the starting position is included\nto make competitors comparable even when started at different times. raceDistanceTraveledIncludingGateStartTooltip=The distance traveled from the race start to the end\nor to the current time point, if the race isn''t finished. For a gate start, the distance from the pin end to the starting position is included\nto make competitors comparable even when started at different times. -results=Results groupName=Group Name valueAscending=Value (Ascending) valueDescending=Value (Descending) @@ -1372,7 +1353,6 @@ dashboardRCBoat = RC Boat fixedMarkPassing=(fixed) suppressedMarkPassing=(suppressed) windUp=Wind-Up (show wind from top of map) -filterBy=Filter by currentFilterSelection=Current filter selection notCapableOfGeneratingACodeForIdentifier=I''m not capable of generating a code for this identifier. serverUrl=Server URL @@ -1479,7 +1459,6 @@ noFinishedRaces=There are no finished races yet racesOverview=Races overview listFormatLabel=List format competitionFormatLabel=Competition format -empty=Empty runAQuery=Run a Query latestRegattaStandings=Latest Regatta Standings plainText=Plain Text @@ -1497,7 +1476,6 @@ photosCount[one]={0,number} photo eventsHaveTakenPlace={0} events have taken place eventsHaveTakenPlace[one]= One event has taken place raceOffice=Race Office -analyze=Analyze dataMiningSettings=Data Mining Settings multiResultsPresenter=Multi Results Presenter plainResultsPresenter=Plain Results Presenter @@ -1558,7 +1536,6 @@ warningForDisabledCompetitors=The following competitors cannot be registered to competitorToolTipMessage={0} has already been assigned to fleet {2} in race {3} and therefore cannot be assigned to fleet {1} within the same race addMarkToRegatta=Add Mark to Regatta selectALeaderboardGroup=Select a leaderboard group... -pleaseSelect=Please select requiresValidRegatta=This page requires a valid regatta, race column and fleet name to identify the race to show. couldNotObtainRace=Could not obtain a race with name {1} for fleet {2} for a regatta with name {0}: {3} errorTryingToCreateEmbeddedMap=Error trying to create the embedded map: {0} @@ -1842,26 +1819,11 @@ angleInDegree=Angle in degree angleInRadian=Angle in radian centralAngleInRadian=Central angle in radian centralAngleInDegree=Central angle in degree -kilometers=Kilometers -meters=Meters -nauticalMiles=Nautical Miles -seaMiles=Sea Miles -geographicalMiles=Geographical Miles -days=Days -hours=Hours -minutes=Minutes -seconds=Seconds -milliseconds=Milliseconds floatNumber=Float integer=Integer appendResult=Append result sampleColor=Color Sample -sharedSettingsLink=Link with settings leaderboardPage=LeaderboardPage -makeDefault=Make default -makeDefaultInProgress=In progress... -settingsSavedMessage=Your current settings have been successfully set as default -settingsSaveErrorMessage=An error occurred during setting your settings as default showLiveNow=Show "Live now" useOnlyOneOfStartTimeInferenceAndControlTrackingFromStartAndFinishTimes=Use only one of "Start Time Inference" and "Control Tracking from Start and Finish Times" unknownLeaderboardType=Unknown leaderboard type {0} @@ -1880,10 +1842,6 @@ settingsId=Settings ID documentSettingsId=Document settings ID settingsForId=Settings for ID ''{0}'' userProfileSettingsTabDescription=User settings are generated by settings dialogs to be found in many places of the page. This view shows all your collected settings in a technical way for power users. Be aware that removed entries can not be restored, so use with caution. -resetToDefault=Reset to default -resetToDefaultInProgress=In resetting... -settingsRemoved=Default settings restored -settingsRemovedError=Could not restore default settings userSettingsFilter=Settings filter requiresRegattaRaceAndLeaderboard=This page requires a valid regatta name, race name and leaderboard name. couldNotFindRaceInRegatta=Could not obtain a race with name {0} for a regatta with name {1} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index c147482c3a2..f48504936f4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -13,7 +13,6 @@ listRegattas=Regatten anzeigen wind=Wind windPanelLabel=This is the Wind Panel which so far is completely empty. refresh=Aktualisieren -remove=Löschen removeNumber=Löschen ({0}) windSource=Windquelle dampeningInterval=Mittelungsintervall @@ -52,7 +51,6 @@ trackedRaceConnectedToSelectedRaceName=Wettfahrt verbunden mit dem selektierten linkToColumn=Verbindung mit Spalte unlink=Unlink leaderboardName=Name der Rangliste -cancel=Abbrechen pleaseEnterAName=Bitte geben Sie einen Namen ein. pleaseEnterABoatClass=Bitte geben Sie eine Bootsklasse ein. discardRacesFromHowManyStartedRacesOn=Discard one more race starting with how many started races @@ -64,7 +62,6 @@ startingFromNumberOfRaces=Ab wievielen Rennen renameLeaderboard=Rangliste umbenennen addColumnToLeaderboard=Spalte zu Rangliste hinzufügen pleaseEnterNameForNewRaceColumn=Namen für Renn-Spalten eingeben -ok=OK medalRace=Medal Race renameRace=Rennen umbenennen openSelectedLeaderboard=Ausgewählte Rangliste öffnen @@ -88,7 +85,6 @@ sapSailingAnalytics=Sailing Analytics leaderboard=Rangliste leaderboards=Ranglisten leaderboardSettings=Einstellungen Rangliste -settings=Einstellungen maneuverType=Manöver selectAtLeastOneLegDetail=Mindestens ein Detail auswählen currentSpeedOverGroundInKnots=FüG @@ -175,7 +171,6 @@ jibes=Halsen penaltyCircles=Strafkreise medalRaceIsNull=Medaillenrennen nicht erlaubt maneuverTypes=Manöver -configuration=Konfiguration chooseChart=Diagramm wählen raceNameEmpty=Rennname leer distanceTraveled=Zurückgelegte Strecke @@ -193,13 +188,11 @@ secondsPerNauticalMileUnit=s/sm metersUnit=m millimetersUnit=mm degreesUnit=° -close=Schließen compareCompetitors=Teilnehmer vergleichen description=Beschreibung sailNumber=Segelnummer country=Land no3LetterCodes=IOC 3-Buchstaben-Codes können nicht gefunden werden. -add=Hinzufügen delete=Löschen showCharts=Grafische Ansicht raceWithThisNameAlreadyExists=Ein Rennen mit diesem Namen existiert schon. @@ -272,7 +265,6 @@ printHint=Druckt die aktuell angewendete Version! blockedApplyButton=Die Anzahl der Teilnehmer der Paarungliste ist ungleich den registrierten Teilnehmern! multiplierInfo=Vervielfacht die WEttfahrten und schreibt gleiche hintereinader um möglichst wenig Bootswechsel zu ermöglichen noPairingListAvailable=Die Druckfunktion ist erst möglich, wenn bereits eine Gegner Paarungsliste auf die Race Logs des ausgewählten Leaderbaord angewendet wurde. -settingsForComponent=Einstellungen für {0} noEventsFound=Es wurden keine Rennen gefunden noEventSelected=Kein Rennen ausgewählt noLeaderboardsFound=Es wurden keine Ranglisten gefunden @@ -310,8 +302,6 @@ leaderboardGroup=Ranglisten-Gruppe pleaseEnterNonEmptyDescription=Bitte eine nicht-leere Beschreibung eingeben groupWithThisNameAlreadyExists=Ranglisten-Gruppe mit diesem Namen existiert bereits detailsOfLeaderboardGroup=Details der Ranglisten-Gruppe -edit=Bearbeiten -save=Speichern abort=Abbrechen noLeaderboardGroupWithNameFound=Keine Ranglisten-Gruppe mit dem Namen {0} gefunden overview=Übersicht @@ -348,7 +338,6 @@ degreesShort=deg untracked=Nicht getracked delayForLiveMode=Verzögerung im Live-Modus: notAvailable=Nicht verfügbar -details=Details noGroupSelected=Keine Gruppe ausgewählt combinedWindSourceTypeName=Kombiniert courseBasedWindSourceTypeName=Kurslayout @@ -430,7 +419,6 @@ simulateAsLiveRace=Simuliere als Live Rennen simulateWithOffset=Zeit bis zum Start in Minuten: boatClassDoesNotMatchSelectedRegatta=Die ausgewählten Rennen enthalten eine Bootsklasse, die nicht der Bootsklasse der ausgewählten Regatta ''{0}'' entspricht. Es werden keine Rennen geladen. regattaExistForSelectedBoatClass=Es gibt mindestens eine Regatta zu den ausgewählten Bootsklassen. Dennoch Default-Regatta für diese(s) Rennen anlegen? -reload=Neu laden addRegatta=Regatta hinzufügen... importRegattas=Regatten importieren... exchangeName=Exchange Name @@ -645,7 +633,6 @@ totalNetPointsColumnTooltip=Summe aller Punkte eines Teilnehmers in der Regatta windData=Winddaten gpsData=GPS-Daten status=Status -noDataFound=Keine Daten gefunden displayName=Anzeigename histogram=Histogramm numberOfDataPoints=Anzahl Datenpunkte @@ -1241,10 +1228,6 @@ enterVideoURL=Video-URL eingeben... enterSponsorImageURL=Sponsorbild-URL eingeben... enterRaceName=Wettfahrtnamen eingeben... scoringSchemeHighPointFirstGetsTenOrEightDescription=High Point System, der Gewinner erhält 10 Punkte, der Zweite 9 und so weiter. -serverError=Es ist ein Fehler beim Versuch aufgetreten, den Server zu kontaktieren. Bitte Netzwerkverbindung prüfen und erneut versuchen. -remoteProcedureCall=Entfernter Prozeduraufruf -serverReplies=Server antwortet -errorCommunicatingWithServer=Fehler bei der Kommunikation mit dem Server userManagement=Benutzerverwaltung regattaStructureImport=Regattastruktur-Import editSeries=Serie bearbeiten @@ -1267,7 +1250,6 @@ noFleetsDefined=Keine Gruppen definiert. successfullyCreatedRegattas=Regatten erfolgreich angelegt errorTryingToRegisterRacesForTracking=Fehler beim Versuch, die Wettfahrten {0} zum Tracking zu registrieren: {1}. Live/stored URI syntax prüfen. errorDeterminingPolarAvailability=Fehler bei der Verfügbarkeitsprüfung für Polardaten für Wettfahrt {0}: {1} -error=Fehler fileStorage=Datei Speicherung active=Aktiv scoringSchemeHighPointEssOverallDescription=High Point System, der Gewinner eines Acts erhält 10 Punkte, der Zweite 9 und so weiter. @@ -1317,7 +1299,6 @@ courseOverGroundTrueDegrees=KüG distanceIncludingGateStartInMeters=Distanz (m. Torstart) distanceTraveledIncludingGateStartTooltip=Die zurückgelegt Strecke vom Start des Schenkels bis zum Ende\noder bis zum aktuellen Zeitpunkt, falls der Schenkel noch nicht beendet ist.\nEnthält der Schenkel einen Torstart, so wird die Distanz vom Pin End bis zur Startposition des Teilnehmers hinzugezählt,\num so vergleichbare Distanzen auch für Teilneher zu erhalten, die zu verschiedenen Zeiten gestartet sind. raceDistanceTraveledIncludingGateStartTooltip=Die zurückgelegte Strecke vom Start des Rennens, bis zum Ende\noder bis zum aktuellen Zeitpunkt, falls das Rennen noch nicht beendet ist. Bei einem Torstart wird die Distanz vom Pin End bis zur Startposition des Teilnehmers hinzugezählt,\num so vergleichbare Distanzen auch für Teilneher zu erhalten, die zu verschiedenen Zeiten gestartet sind. -results=Ergebnisse groupName=Gruppename valueAscending=Wert (Aufsteigend) valueDescending=Wert (Absteigend) @@ -1357,7 +1338,6 @@ dashboardRCBoat=Startboot fixedMarkPassing=(fest) suppressedMarkPassing=(unterdrückt) windUp=Wind von oben anzeigen -filterBy=Gefiltert nach currentFilterSelection=Aktuelle Filter-Selektion notCapableOfGeneratingACodeForIdentifier=Für diesen Identifier kann kein Barcode generiert werden. serverUrl=Server URL @@ -1463,7 +1443,6 @@ noFinishedRaces=Es wurden noch keine Wettfahrten beendet. racesOverview=Wettfahrtübersicht listFormatLabel=Listenansicht competitionFormatLabel=Wettbewerbsansicht -empty=Leer runAQuery=Führe eine Anfrage aus latestRegattaStandings=Aktuelle Plazierungen plainText=Einfacher Text @@ -1481,7 +1460,6 @@ photosCount[one]={0,number} Bild eventsHaveTakenPlace={0} Veranstaltungen haben stattgefunden eventsHaveTakenPlace[one]= Eine Veranstaltung hat stattgefunden raceOffice=Wettfahrtleitung -analyze=Untersuche dataMiningSettings=Data Mining Einstellungen multiResultsPresenter=Multi Ergebnis-Darsteller plainResultsPresenter=Einfacher Ergebnis-Darsteller @@ -1542,7 +1520,6 @@ warningForDisabledCompetitors=Die folgenden Teilnehmer konnten nicht für diese competitorToolTipMessage=Teilnehmer {0} ist bereits der Gruppe {2} in der Wettfahrt {3} zugewiesen und kann daher nicht der Gruppe {1} in der selben Wettfahrt zugewiesen werden addMarkToRegatta=Tonne zu Regatta hinzufügen selectALeaderboardGroup=Bitte eine Ranglisten-Gruppe auswählen... -pleaseSelect=Bitte auswählen requiresValidRegatta=Diese Seite benötigt eine gültige Regatta, Rennspalte und einen gültigen Gruppennamen um die anzuzeigende Wettfahrt zu identifizieren. couldNotObtainRace=Wettfahrt namens {1} für Gruppe {2} in einer Regatta names {0} konnte nicht gefunden werden: {3} errorTryingToCreateEmbeddedMap=Fehler beim Erstellen der eingebetteten Karte: {0} @@ -1828,26 +1805,11 @@ angleInDegree=Winkel in Grad angleInRadian=Winkel in Radiant centralAngleInRadian=Kreiswinkel in Radiant centralAngleInDegree=Kreiswinkel in Grad -kilometers=Kilometer -meters=Meter -nauticalMiles=Nautische Meilen -seaMiles=Seemeilen -geographicalMiles=Geografische Meilen -days=Tage -hours=Stunden -minutes=Minuten -seconds=Sekunden -milliseconds=Millisekunden floatNumber=Gleitkommazahl integer=Ganzzahl appendResult=Ergebnis anhängen sampleColor=Farbbeispiel -sharedSettingsLink=Link mit Settings leaderboardPage=Ranglisten-Seite -makeDefault=Als Voreinstellung -makeDefaultInProgress=In Bearbeitung... -settingsSavedMessage=Ihre aktuellen Einstellungen wurden als Voreinstellungen erfolgreich übernommen. -settingsSaveErrorMessage=Bei dem Versuch, Ihre aktuellen Einstellungen als Voreinstellungen zu übernehmen, ist ein Fehler aufgetreten. showLiveNow="Jetzt live" anzeigen useOnlyOneOfStartTimeInferenceAndControlTrackingFromStartAndFinishTimes=Höchstens eine der Einstellungen "Startzeit aus Startlinienüberquerungen automatisch ableiten" und "Tracking durch Start- und Ende-Zeiten automatisch steuern" darf ausgewählt sein chooseAAutoplayConfiguration=Autoplay Konfiguration wählen @@ -1865,10 +1827,6 @@ settingsId=Einstellungs ID documentSettingsId=ID der Dokumenten-Einstellungen settingsForId=Einstellungen für ID "{0}" userProfileSettingsTabDescription=Einstellungen werden bei der Benutzung vieler Einstellungsdialoge dieser Seite erzeugt. Diese Übersicht bietet eine technische Ansicht aller vorhandenen Einstellungen, welche für Poweruser nützlich ist. Gelöschte Einstellungen können nicht wiederhergestellt werden, bei der Benutzung ist deshalb Vorsicht geboten. -resetToDefault=Auf Standard zurücksetzen -resetToDefaultInProgress=Setze zurück... -settingsRemoved=Standardeinstellungen wiederhergestellt -settingsRemovedError=Fehler beim Widerherstellen der Standardeinstellungen userSettingsFilter=Einstellungsfilter errorLoadingRegattasForLeaderboardGroup=Es ist ein Fehler beim Laden der zugehörigen Regatten aufgetreten {0}: {1} errorLoadingLeaderBoardGroup=Fehler beim laden der LeaderboardGruppe {0}: {1} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties index 07e08fee345..753bbe63d7f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties @@ -13,7 +13,6 @@ wind=Viento maneuverType=Maniobra windPanelLabel=Este es el panel de vientos, y hasta el momento está totalmente vacío. refresh=Refrescar -remove=Eliminar removeNumber=Eliminar ({0}) windSource=Fuente de vientos dampeningInterval=Intervalo de amortiguación @@ -49,7 +48,6 @@ trackedRaceConnectedToSelectedRaceName=Carrera rastreada conectada al nombre de linkToColumn=Enlace a columna unlink=Quitar enlace leaderboardName=Nombre de tabla de clasificación -cancel=Cancelar pleaseEnterAName=Indique un nombre pleaseEnterABoatClass=Indique una clase de embarcación discardRacesFromHowManyStartedRacesOn=Descartar un inicio de carrera más con cuántas carreras iniciadas @@ -61,7 +59,6 @@ startingFromNumberOfRaces=Empezando por cuántas carreras renameLeaderboard=Cambiar nombre de tabla de clasificación addColumnToLeaderboard=Añadir columna a tabla de clasificación pleaseEnterNameForNewRaceColumn=Indique un nombre para la nueva columna de carrera -ok=OK medalRace=Medal Race renameRace=Cambiar nombre de carrera openSelectedLeaderboard=Abrir tabla de clasificación seleccionada @@ -85,7 +82,6 @@ sapSailingAnalytics=Sailing Analytics leaderboard=Tabla de clasificación leaderboards=Tablas de clasificación leaderboardSettings=Opciones de tabla de clasificación -settings=Opciones selectAtLeastOneLegDetail=Seleccione al menos un detalle de tramo currentSpeedOverGroundInKnots=SOG (speed over ground) currentSpeedOverGroundInKnotsTooltip=Velocidad actual sobre el fondo. @@ -168,7 +164,6 @@ tacks=Bordadas jibes=Trasluchadas penaltyCircles=Círculos de penalización medalRaceIsNull=Valor de regata final no permitido -configuration=Configuración maneuverTypes=Maniobras chooseChart=Seleccionar gráfico distanceTraveled=Distancia viajada @@ -186,13 +181,11 @@ secondsPerNauticalMileUnit=s/NM metersUnit=m millimetersUnit=mm degreesUnit=° -close=Cerrar compareCompetitors=Comparar competidores description=Descripción sailNumber=Número de vela country=País no3LetterCodes=No es posible encontrar los códigos IOC de 3 letras. -add=Añadir delete=Borrar showCharts=Mostrar gráficos raceWithThisNameAlreadyExists=Ya existe una carrera con este nombre. @@ -260,7 +253,6 @@ printHint=Imprime la versión aplicada blockedApplyButton=Los competidores registrados difieren de los competidores de la lista de emparejamientos multiplierInfo=Multiplica los flights y los crea uno junto a otro de modo que sea posible una competición con menos modificaciones de embarcación. noPairingListAvailable=La función de impresión solo está disponible si ya se han aplicado las listas de emparejamientos a los registros de carrera de las clasificaciones seleccionadas. -settingsForComponent=Opciones para {0} noEventsFound=No se han encontrado eventos noEventSelected=Ningún evento seleccionado noLeaderboardsFound=No se han encontrado tablas de clasificación @@ -298,8 +290,6 @@ leaderboardGroup=Grupo de tablas de clasificación pleaseEnterNonEmptyDescription=Indique una descripción no vacía groupWithThisNameAlreadyExists=Ya existe un grupo de tablas de clasificación con este nombre. detailsOfLeaderboardGroup=Detalles del grupo de tablas de clasificación -edit=Editar -save=Grabar abort=Detener noLeaderboardGroupWithNameFound=No se ha encontrado ningún grupo de tablas de clasificación con el nombre {0} overview=Resumen @@ -334,7 +324,6 @@ degreesShort=grados untracked=No rastreado delayForLiveMode=Retraso para modo en directo notAvailable=No disponible -details=Detalles noGroupSelected=Ningún grupo seleccionado combinedWindSourceTypeName=Combinado legMiddleWindSourceTypeName=Mitad de tramo @@ -417,7 +406,6 @@ simulateAsLiveRace=Simular como carrera en directo simulateWithOffset=Offset antes de inicio en minutos: boatClassDoesNotMatchSelectedRegatta=Las carreras seleccionadas contienen clases de embarcación distintas de la clase ''''{0}'''' de la regata seleccionada. No se cargará ninguna carrera. regattaExistForSelectedBoatClass=Hay al menos una regata para las clases de embarcación seleccionadas. ¿Realmente desea crear regata(s) por defecto para esta(s) carrera(s)? -reload=Recargar addRegatta=Añadir regata... importRegattas=Importar regatas... exchangeName=Intercambiar nombre @@ -639,7 +627,6 @@ totalNetPointsColumnTooltip=El total de puntos netos de un competidor de la rega windData=Datos de vientos gpsData=Datos de GPS status=Status -noDataFound=No se han encontrado datos displayName=Visualizar nombre histogram=Histograma numberOfDataPoints=Número de puntos de datos @@ -1231,10 +1218,6 @@ enterImageURL=Indicar URL de imagen... enterVideoURL=Indicar URL de vídeo... enterSponsorImageURL=Indicar URL de imagen de patrocinador... enterRaceName=Indicar nombre de carrera... -serverError=Se ha producido un error al intentar contactar con el servidor. Compruebe la conexión de red e inténtelo de nuevo. -remoteProcedureCall=Llamada de procedimiento remoto -serverReplies=Servidor responde -errorCommunicatingWithServer=Error al comunicar con el servidor userManagement=Gestión de usuarios regattaStructureImport=Importación de la estructura de regata filteredBy=Filtrado por @@ -1261,7 +1244,6 @@ noFleetsDefined=Ninguna flota definida successfullyCreatedRegattas=Regatas creadas con éxito errorTryingToRegisterRacesForTracking=Error al intentar registrar carreras {0} para rastreo: {1}. Compruebe sintaxis URI en directo/grabada. errorDeterminingPolarAvailability=Error al determinar la disponibilidad de datos polares / VPP para la carrera {0}: {1} -error=Error fileStorage=Almacenamiento de archivos active=Activo scoringSchemeHighPointEssOverallDescription=Calificación en puntos. El ganador de una prueba obtiene 10 puntos; el segundo, 9 puntos, etc. Si hay un empate en la serie de Extreme Sailing, el empate se resuelve a favor del competidor que ha ganado más pruebas. Si aún persiste el empate, se utiliza el resultado de la última prueba. @@ -1309,7 +1291,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=Distancia (con inicio de puerta de salida) distanceTraveledIncludingGateStartTooltip=Distancia recorrida desde el inicio hasta el final del tramo\o hasta la fecha y hora actual si no se ha acabado el tramo.\nSi el tramo incluye un inicio de puerta de salida, la distancia desde el extremo hasta la posición inicial se incluye\n para que puedan compararse los competidores aunque hayan empezado en tiempos diferentes. raceDistanceTraveledIncludingGateStartTooltip=Distancia recorrida desde el inicio hasta el final de la carrera\o hasta la fecha y hora actual si no se ha acabado la carrera. Para el inicio de la puerta de salida, la distancia desde el extremo hasta la posición inicial se incluye\n para que puedan compararse los competidores aunque hayan empezado en tiempos diferentes. -results=Resultados groupName=Nombre de grupo valueAscending=Valor (ascendente) valueDescending=Valor (descendente) @@ -1349,7 +1330,6 @@ dashboardRCBoat=Barco RC fixedMarkPassing=(fijado) suppressedMarkPassing=(suprimido) windUp=Viento al norte (mostrar viento de la parte superior del mapa) -filterBy=Filtrar por currentFilterSelection=Seleccion de filtro actual notCapableOfGeneratingACodeForIdentifier=No sé generar un código para este identificador. serverUrl=URL del servidor @@ -1456,7 +1436,6 @@ noFinishedRaces=Todavía no ha finalizado ninguna carrera racesOverview=Resumen de carreras listFormatLabel=Formato de lista competitionFormatLabel=Formato de competición -empty=Vacío runAQuery=Realice una consulta latestRegattaStandings=Últimas posiciones de la regata plainText=Texto sin formato @@ -1474,7 +1453,6 @@ photosCount[one]={0,number} foto eventsHaveTakenPlace=Han tenido lugar {0} eventos eventsHaveTakenPlace[one]=Ha tenido lugar un evento raceOffice=Oficina de carrera -analyze=Analizar dataMiningSettings=Opciones de minería de datos multiResultsPresenter=Presentador de resultados múltiples plainResultsPresenter=Presentador de resultados simples @@ -1534,7 +1512,6 @@ warningForDisabledCompetitors=Los siguientes competidores no se pueden registrar competitorToolTipMessage={0} ya ha sido asignado a la flota {2} en la carrera {3} y, por consiguiente, no se puede asignar a la flota {1} de la misma carrera addMarkToRegatta=Añadir marca a regata selectALeaderboardGroup=Seleccione un grupo de tablas de clasificación... -pleaseSelect=Seleccione requiresValidRegatta=Esta página requiere una regata, una columna de carreras y un nombre de flota válidos para identificar la regata que se desea mostrar. couldNotObtainRace=No se ha podido obtener la regata con el nombre {1} para la flota {2} para una regata con el nombre {0}: {3} errorTryingToCreateEmbeddedMap=Error al intentar crear el mapa incrustado: {0} @@ -1816,25 +1793,10 @@ angleInDegree=Ángulo en grado angleInRadian=Ángulo en radián centralAngleInRadian=Ángulo central en radián centralAngleInDegree=Ángulo central en grado -kilometers=Kilómetros -meters=Metros -nauticalMiles=Millas náuticas -seaMiles=Millas marinas -geographicalMiles=Millas geográficas -days=Días -hours=Horas -minutes=Minutos -seconds=Segundos -milliseconds=Milisegundos floatNumber=Flotador integer=Entero sampleColor=Muestra de color -sharedSettingsLink=Enlace con opciones leaderboardPage=Página de clasificación -makeDefault=Establecer como predeterminado -makeDefaultInProgress=En curso... -settingsSavedMessage=Sus opciones actuales se han definido correctamente como estándar -settingsSaveErrorMessage=Se ha producido un error durante la definición de sus opciones como estándar showLiveNow=Mostrar "En directo ahora" useOnlyOneOfStartTimeInferenceAndControlTrackingFromStartAndFinishTimes=Utilice solo una "Inferencia de hora de inicio" y "Control de rastreo de horas de inicio y de fin" unknownLeaderboardType=Tipo de tabla de clasificación {0} desconocido @@ -1852,10 +1814,6 @@ settingsId=ID de opciones documentSettingsId=ID de opciones de documento settingsForId=Opciones para ID ''''{0}'''' userProfileSettingsTabDescription=Las opciones del usuario se generan mediante los diálogos de opciones que se encuentran en varios puntos de la página. Esta vista muestra todas sus opciones agrupadas de una manera técnica para los usuarios expertos. Tenga en cuenta que las entradas eliminadas no se pueden restablecer, por lo que tenga precaución al utilizarlas. -resetToDefault=Reinicializar a valores por defecto -resetToDefaultInProgress=Reinicializando... -settingsRemoved=Opciones por defecto restablecidas -settingsRemovedError=No se han podido restablecer las opciones por defecto userSettingsFilter=Filtro de opciones requiresRegattaRaceAndLeaderboard=Esta página requiere un nombre de regata, un nombre de carrera y un nombre de tabla de clasificación válidos. couldNotFindRaceInRegatta=No se ha podido obtener la carrera con el nombre {0} para la regata con el nombre {1} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties index 7dab2a1a5c8..05f1a93fb47 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties @@ -13,7 +13,6 @@ wind=Vent maneuverType=Manœuvre windPanelLabel=Ceci est le panneau des mesures du vent, vide pour l''instant. refresh=Actualiser -remove=Supprimer removeNumber=Supprimer ({0}) windSource=Source du vent dampeningInterval=Intervalle d''atténuation @@ -49,7 +48,6 @@ trackedRaceConnectedToSelectedRaceName=Course suivie liée au nom de course sél linkToColumn=Lier à la colonne unlink=Annuler Lier leaderboardName=Nom du palmarès -cancel=Annuler pleaseEnterAName=Saisissez un nom. pleaseEnterABoatClass=Saisissez une catégorie de bateau. discardRacesFromHowManyStartedRacesOn=Éliminez une course de plus en commençant au nombre de courses déjà lancées. @@ -61,7 +59,6 @@ startingFromNumberOfRaces=Début au nombre de courses renameLeaderboard=Renommer palmarès addColumnToLeaderboard=Ajouter colonne à palmarès pleaseEnterNameForNewRaceColumn=Saisissez un nom pour la nouvelle colonne de course. -ok=OK medalRace=Course médaillée renameRace=Renommer course openSelectedLeaderboard=Ouvrir le palmarès sélectionné @@ -85,7 +82,6 @@ sapSailingAnalytics=Sailing Analytics leaderboard=Palmarès leaderboards=Palmarès leaderboardSettings=Options du palmarès -settings=Options selectAtLeastOneLegDetail=Sélectionnez au moins un détail de portion de parcours. currentSpeedOverGroundInKnots=Vf currentSpeedOverGroundInKnotsTooltip=La vitesse fond actuelle. @@ -168,7 +164,6 @@ tacks=Virements jibes=Changements d''amure penaltyCircles=Tours de pénalité medalRaceIsNull=Valeur de course à la médaille non autorisée -configuration=Configuration maneuverTypes=Manœuvres chooseChart=Sélectionner graphique distanceTraveled=Distance parcourue @@ -186,13 +181,11 @@ secondsPerNauticalMileUnit=s/NM metersUnit=m millimetersUnit=mm degreesUnit=° -close=Fermer compareCompetitors=Comparer concurrents description=Description sailNumber=Numéro de voile country=Pays no3LetterCodes=Codes CIO à trois lettres introuvables -add=Ajouter delete=Supprimer showCharts=Afficher graphiques raceWithThisNameAlreadyExists=Une course de ce nom existe déjà. @@ -260,7 +253,6 @@ printHint=Imprime la version appliquée blockedApplyButton=Le nombre de concurrents inscrits ne correspond pas au nombre de concurrents de la liste d''appariement. multiplierInfo=Multipliez les flights et créez-les les uns après les autres pour obtenir une compétition avec le moins de bateaux possible. noPairingListAvailable=La fonction d''impression est uniquement disponible lorsqu''une liste d''appariement a déjà été appliquée aux journaux de course des palmarès sélectionnés. -settingsForComponent=Options pour {0} noEventsFound=Aucune manifestation trouvée noEventSelected=Aucune manifestation sélectionnée noLeaderboardsFound=Aucun palmarès trouvé @@ -298,8 +290,6 @@ leaderboardGroup=Groupe de palmarès pleaseEnterNonEmptyDescription=Saisissez une description (ne pas laisser vide). groupWithThisNameAlreadyExists=Un groupe de palmarès de ce nom existe déjà. detailsOfLeaderboardGroup=Détails du groupe de palmarès -edit=Modifier -save=Enregistrer abort=Abandonner noLeaderboardGroupWithNameFound=Aucun groupe de palmarès ayant pour nom {0} n''a été trouvé. overview=Synthèse @@ -334,7 +324,6 @@ degreesShort=deg untracked=Non suivi delayForLiveMode=Décalage pour mode en direct notAvailable=Non disponible -details=Détails noGroupSelected=Aucun groupe sélectionné combinedWindSourceTypeName=Combiné legMiddleWindSourceTypeName=Milieu de la portion de parcours @@ -417,7 +406,6 @@ simulateAsLiveRace=Simulation de course en direct simulateWithOffset=Décalage avant le départ (en minutes) : boatClassDoesNotMatchSelectedRegatta=Les courses sélectionnées contiennent des catégories de bateaux qui ne sont pas identiques à la catégorie de bateau "{0}" de la régate sélectionnée. Aucune course ne sera chargée. regattaExistForSelectedBoatClass=Il existe au moins une régate pour les catégories de bateaux sélectionnées. Voulez-vous vraiment créer une (des) régate(s) pour cette (ces) course(s) ? -reload=Recharger addRegatta=Ajouter régate... importRegattas=Importer régates... exchangeName=Nom d''échange @@ -639,7 +627,6 @@ totalNetPointsColumnTooltip=Total net des points d''un concurrent dans la régat windData=Données de vent gpsData=Données GPS status=Statut -noDataFound=Aucune donnée trouvée displayName=Afficher nom histogram=Histogramme numberOfDataPoints=Nombre de points de données @@ -1231,10 +1218,6 @@ enterImageURL=Saisissez l''URL de l''image... enterVideoURL=Saisissez l''URL de la vidéo... enterSponsorImageURL=Saisissez l''URL de l''image du sponsor... enterRaceName=Saisissez le nom du parcours... -serverError=Une erreur s''est produite lors de la tentative de contact du serveur. Vérifiez la connexion réseau et réessayez. -remoteProcedureCall=Procédure d''appel distante -serverReplies=Réponses du serveur -errorCommunicatingWithServer=Erreur lors de la communication avec le serveur userManagement=Gestion des utilisateurs regattaStructureImport=Importation de la structure de la régate filteredBy=filtré par @@ -1261,7 +1244,6 @@ noFleetsDefined=Aucune flotte définie successfullyCreatedRegattas=Création des régates réussie errorTryingToRegisterRacesForTracking=Erreur lors de la tentative d''enregistrement des courses {0} pour le suivi : {1}. Vérifiez la syntaxe de l''URL stockée/du direct. errorDeterminingPolarAvailability=Erreur lors de la détermination de la disponibilité des données polaires/VPP pour la course {0} : {1} -error=Erreur fileStorage=Stockage du fichier active=Actif scoringSchemeHighPointEssOverallDescription=Score en points. Le vainqueur d''un Act totalise 10 points, le 2e - 9 points, etc. En cas d''égalité au classement général des Extreme Sailing Series, la victoire est accordée au concurrent ayant remporté le plus d''Act. Si l''égalité persiste, le résultat obtenu au dernier Act sera utilisé. @@ -1309,7 +1291,6 @@ courseOverGroundTrueDegrees=Route fond distanceIncludingGateStartInMeters=Distance (si départ au lièvre) distanceTraveledIncludingGateStartTooltip=La distance naviguée du départ de la portion de parcours jusqu''à sa fin\nou jusqu''à l''heure actuelle (si la portion de parcours n''est pas terminée).\nSi la portion de parcours inclut un départ au lièvre, la distance de la bouée de ligne jusqu''à la position de départ est incluse \npour permettre de comparer les concurrents même si leur départ ne s''est pas fait à la même heure. raceDistanceTraveledIncludingGateStartTooltip=La distance naviguée du départ de la course jusqu''à sa fin\nou jusqu''à l''heure actuelle (si la course n''est pas terminée).\nEn cas de départ au lièvre, la distance de la bouée de ligne jusqu''à la position de départ est incluse \npour permettre de comparer les concurrents même si leur départ ne s''est pas fait à la même heure. -results=Résultats groupName=Nom du groupe valueAscending=Valeur (ascendant) valueDescending=Valeur (descendant) @@ -1349,7 +1330,6 @@ dashboardRCBoat=Bateau du comité de course fixedMarkPassing=(fixé) suppressedMarkPassing=(supprimé) windUp=Orienté par rapport au sens du vent (le vent vient du haut de la carte) -filterBy=Filtrer par currentFilterSelection=Sélection du filtre actuel notCapableOfGeneratingACodeForIdentifier=Je ne suis pas capable de générer un code pour cet identifiant. serverUrl=URL du serveur @@ -1456,7 +1436,6 @@ noFinishedRaces=Aucune course terminée pour l''instant. racesOverview=Synthèse des courses listFormatLabel=Format de liste competitionFormatLabel=Format de compétition -empty=Vide runAQuery=Exécuter une requête latestRegattaStandings=Classement de régate le plus récent plainText=Texte brut @@ -1474,7 +1453,6 @@ photosCount[one]={0,number} photo eventsHaveTakenPlace={0} manifestations ont eu lieu. eventsHaveTakenPlace[one]=Une manifestation a eu lieu. raceOffice=Bureau de course -analyze=Analyser dataMiningSettings=Options de l''exploration de données multiResultsPresenter=Visualiseur de résultats multiples plainResultsPresenter=Visualiseur de résultats bruts @@ -1534,7 +1512,6 @@ warningForDisabledCompetitors=Les concurrents suivants ne peuvent pas être insc competitorToolTipMessage={0} a déjà été affecté à la flotte {2} dans la course {3} et ne peut donc pas être affecté à la flotte {1} dans la même course. addMarkToRegatta=Ajouter marque à la régate selectALeaderboardGroup=Sélectionner groupe de palmarès… -pleaseSelect=Sélectionnez requiresValidRegatta=Pour identifier la course à afficher, cette page nécessite une régate valide, une colonne de course et un nom de flotte. couldNotObtainRace=Impossible de trouver une course ayant le nom {1} pour la flotte {2} pour une régate ayant le nom {0} : {3} errorTryingToCreateEmbeddedMap=Erreur lors de la tentative de création de la carte intégrée : {0} @@ -1816,25 +1793,10 @@ angleInDegree=Angle en degrés angleInRadian=Angle en radians centralAngleInRadian=Angle au centre en radians centralAngleInDegree=Angle au centre en degrés -kilometers=Kilomètres -meters=Mètres -nauticalMiles=Milles nautiques -seaMiles=Milles marins -geographicalMiles=Milles géographiques -days=Jours -hours=Heures -minutes=Minutes -seconds=Secondes -milliseconds=Millisecondes floatNumber=Flottant integer=Entier sampleColor=Échantillon de couleur -sharedSettingsLink=Lier aux options leaderboardPage=Page du palmarès -makeDefault=Définir par défaut -makeDefaultInProgress=En cours... -settingsSavedMessage=Vos options actuelles ont correctement été définies comme options par défaut. -settingsSaveErrorMessage=Une erreur s''est produite lors de la définition de vos options comme options par défaut. showLiveNow=Afficher "En direct" useOnlyOneOfStartTimeInferenceAndControlTrackingFromStartAndFinishTimes=Utilisez "Interférence temporelle de départ" ou bien "Contrôler suivi à partir des heures de départ et d''arrivée", mais pas les deux. unknownLeaderboardType=Type de palmarès {0} inconnu @@ -1852,10 +1814,6 @@ settingsId=ID d''options documentSettingsId=ID d''options du document settingsForId=Options pour l''ID "{0}" userProfileSettingsTabDescription=Les options utilisateur sont générées dans des boîtes de dialogues pour options que vous trouverez à de nombreux endroits sur la page. Cette vue montre toutes vos options regroupées pour les mettre techniquement à disposition des utilisateurs de référence. Soyez prudent : les entrées supprimées ne peuvent pas être restaurées. -resetToDefault=Réinitialiser sur les valeurs par défaut -resetToDefaultInProgress=Réinitialisation en cours... -settingsRemoved=Options par défaut restaurées -settingsRemovedError=Impossible de restaurer les options par défaut userSettingsFilter=Filtre d''options requiresRegattaRaceAndLeaderboard=Cette page requiert un nom de régate, un nom de course et un nom de palmarès valides. couldNotFindRaceInRegatta=Impossible de trouver une course nommée {0} pour une régate nommée {1}. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties index fc772363e4f..b5080b41640 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties @@ -13,7 +13,6 @@ wind=風 maneuverType=マニューバー windPanelLabel=これは風パネルであり、今のところ完全に空となっています。 refresh=リフレッシュ -remove=削除 removeNumber=削除 ({0}) windSource=風源 dampeningInterval=制動間隔 @@ -51,7 +50,6 @@ trackedRaceConnectedToSelectedRaceName=選択されたレース名に結び付 linkToColumn=列にリンク unlink=リンク解除 leaderboardName=リーダーボード名 -cancel=取消 pleaseEnterAName=名称を入力してください pleaseEnterABoatClass=艇種を入力してください discardRacesFromHowManyStartedRacesOn=レース除外 (スタート済レースから) @@ -63,7 +61,6 @@ startingFromNumberOfRaces=レース数から開始 renameLeaderboard=リーダーボード名称変更 addColumnToLeaderboard=リーダーボードに列を追加 pleaseEnterNameForNewRaceColumn=新規レース列の名称を入力してください -ok=OK medalRace=メダルレース renameRace=レース名称変更 openSelectedLeaderboard=選択したリーダーボードを開く @@ -87,7 +84,6 @@ sapSailingAnalytics=Sailing Analytics leaderboard=リーダーボード leaderboards=リーダーボード leaderboardSettings=リーダーボード設定 -settings=設定 selectAtLeastOneLegDetail=レグ詳細を少なくとも 1 つ選択 currentSpeedOverGroundInKnots=SOG currentSpeedOverGroundInKnotsTooltip=現在の対地速力です。 @@ -171,7 +167,6 @@ tacks=タック jibes=ジャイブ penaltyCircles=ペナルティーサークル medalRaceIsNull=メダルレース値は不可 -configuration=設定 maneuverTypes=マニューバー chooseChart=チャートの選択 distanceTraveled=移動した距離 @@ -189,13 +184,11 @@ secondsPerNauticalMileUnit=s/NM metersUnit=m millimetersUnit=mm degreesUnit=° -close=閉じる compareCompetitors=競技者比較 description=内容説明 sailNumber=セールナンバー country=国 no3LetterCodes=IOC 3 文字コードを検索できませんせした。 -add=追加 delete=削除 showCharts=チャート表示 raceWithThisNameAlreadyExists=その名称のレースはすでに登録されています。 @@ -263,7 +256,6 @@ printHint=適用バージョンを印刷 blockedApplyButton=登録されている競技者数が対戦表にある競技者数と同じでありません multiplierInfo=複数のフライトを艇変更がより少なく競技が可能となるよう互いに隣り合わせに作成 noPairingListAvailable=印刷機能は選択したリーダーボードレースログに対戦表がすでに適用されている場合にのみ利用が可能です。 -settingsForComponent={0} の設定 noEventsFound=イベントが見つかりませんでした noEventSelected=イベントが選択されていません noLeaderboardsFound=リーダーボードが見つかりませんでした @@ -301,8 +293,6 @@ leaderboardGroup=リーダーボードグループ pleaseEnterNonEmptyDescription=空でない説明を入力してください groupWithThisNameAlreadyExists=この名称のリーダーボードグループはすでに登録されています。 detailsOfLeaderboardGroup=リーダーボードグループの詳細 -edit=編集 -save=保存 abort=中止 noLeaderboardGroupWithNameFound={0} という名称のリーダーボードグループは見つかりませんでした overview=概要 @@ -337,7 +327,6 @@ degreesShort=度 untracked=未追跡 delayForLiveMode=ライブモードの遅延: notAvailable=利用不可 -details=詳細 noGroupSelected=グループ未選択 combinedWindSourceTypeName=複合 legMiddleWindSourceTypeName=レグの中間 @@ -420,7 +409,6 @@ simulateAsLiveRace=ライブレースとしてシミュレート simulateWithOffset=スタート前のオフセット (分): boatClassDoesNotMatchSelectedRegatta=選択したレースに、選択したレガッタの艇種 ''{0}'' と同じでない艇種が含まれています。レースはロードされません。 regattaExistForSelectedBoatClass=選択した艇種に対して少なくとも 1 つのレガッタがあります。このレースに対してレガッタを初期登録しますか。 -reload=リロード addRegatta=レガッタ追加... importRegattas=レガッタのインポート... exchangeName=エクスチェンジ名 @@ -642,7 +630,6 @@ totalNetPointsColumnTooltip=レガッタにおける競技者の総合得点を windData=風データ gpsData=GPS データ status=ステータス -noDataFound=データが見つかりませんでした displayName=名称表示 histogram=ヒストグラム numberOfDataPoints=データポイント数 @@ -1234,10 +1221,6 @@ enterImageURL=画像 URL を入力... enterVideoURL=動画 URL を入力... enterSponsorImageURL=スポンサー画像 URL を入力... enterRaceName=レース名を入力... -serverError=サーバにアクセスしようとしてエラーが発生しました。ネットワーク接続を確認して再試行してください。 -remoteProcedureCall=リモートプロシージャコール -serverReplies=サーバ応答 -errorCommunicatingWithServer=サーバとの通信でエラー発生 userManagement=ユーザ管理 regattaStructureImport=レガッタ構成のインポート filteredBy=フィルタキー @@ -1264,7 +1247,6 @@ noFleetsDefined=フリートが定義されていません。 successfullyCreatedRegattas=レガッタが登録されました errorTryingToRegisterRacesForTracking=追跡するレース {0} を登録しようとしてエラーが発生: {1}。ライブ/格納 URI 構文をチェックしてください。 errorDeterminingPolarAvailability=レース {0} のポーラー/VPP データの利用可能性の決定でエラー発生: {1} -error=エラー fileStorage=ファイルストレージ active=有効 scoringSchemeHighPointEssOverallDescription=得点数によるスコアです。アクトの勝者が 10 点、2 位が 9 点などと得点します。Extreme Sailing シリーズ全体で同点となった場合は、より多くのアクトで勝者となった競技者を上位とします。それでも同じ場合には、最終アクトの結果を用います。 @@ -1312,7 +1294,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=距離 (ゲートスタートでの) distanceTraveledIncludingGateStartTooltip=レグ始点からレグ終点まで、またはレグをフィニッシュ\nしていない場合は現時点までに移動した距離です。\nレグにゲートスタートが含まれる場合は、異なる時刻にスタートしたときでも\n競技者を比較するためにピンエンドからスタート位置までの距離が含まれます。 raceDistanceTraveledIncludingGateStartTooltip=レース開始からレース終了まで、またはレースがフィニッシュ\nしていない場合は現時点までに移動した距離です。ゲートスタートの場合は、異なる時刻にスタートしたときでも\n競技者を比較するためにピンエンドからスタート位置までの距離が含まれます。 -results=結果 groupName=グループ名 valueAscending=値 (昇順) valueDescending=値 (降順) @@ -1352,7 +1333,6 @@ dashboardRCBoat=RC 艇 fixedMarkPassing=(固定) suppressedMarkPassing=(非表示) windUp=ウィンドアップ (マップの最上部から風を表示) -filterBy=フィルタキー currentFilterSelection=現在のフィルタ選択 notCapableOfGeneratingACodeForIdentifier=この ID のコードを生成することができません。 serverUrl=サーバ URL @@ -1459,7 +1439,6 @@ noFinishedRaces=フィニッシュしたレースがまだありません。 racesOverview=レース概要 listFormatLabel=レース一覧 competitionFormatLabel=競技日 -empty=空 runAQuery=クエリを実行 latestRegattaStandings=レガッタ最新順位表 plainText=プレーンテキスト @@ -1477,7 +1456,6 @@ photosCount[one]={0,number} 写真 eventsHaveTakenPlace={0} イベントが行われました eventsHaveTakenPlace[one]=1 つのイベントが行われました raceOffice=レース事務所 -analyze=分析 dataMiningSettings=データマイニング設定 multiResultsPresenter=複数結果表示 plainResultsPresenter=プレーン結果表示ツール @@ -1537,7 +1515,6 @@ warningForDisabledCompetitors=次の競技者はこのレースに登録する competitorToolTipMessage={0} はすでにレース {3} のフリート {2} に割り当てられており、そのため同一レース内でフリート {1} に割り当てることはできません addMarkToRegatta=マークをレガッタに追加 selectALeaderboardGroup=リーダーボードグループを選択... -pleaseSelect=選択: requiresValidRegatta=このページには、表示するレースを識別するために有効なレガッタ、レース列、およびフリート名が必要です。 couldNotObtainRace=名称 {0} のレガッタに対してフリート {2} の名称 {1} でレースが取得できませんでした: {3} errorTryingToCreateEmbeddedMap=埋込マップを登録しようとしてエラーが発生: {0} @@ -1819,25 +1796,10 @@ angleInDegree=角度 (度) angleInRadian=角度 (ラジアン) centralAngleInRadian=中心角 (度) centralAngleInDegree=中心角 (ラジアン) -kilometers=キロメートル -meters=メートル -nauticalMiles=海里 -seaMiles=海里 -geographicalMiles=地理マイル -days=日 -hours=時間 -minutes=分 -seconds=秒 -milliseconds=ミリ秒 floatNumber=浮動小数点型 integer=整数 sampleColor=色サンプル -sharedSettingsLink=設定にリンク leaderboardPage=リーダーボードページ -makeDefault=デフォルトを設定 -makeDefaultInProgress=実行中です... -settingsSavedMessage=現在の設定がデフォルトとして設定されました -settingsSaveErrorMessage=使用している設定をデフォルトとして設定する際にエラーが発生しました showLiveNow="実況中" を表示 useOnlyOneOfStartTimeInferenceAndControlTrackingFromStartAndFinishTimes="推定スタート時刻" および "スタート/フィニッシュ時刻からのコントロール追跡" は 1 つだけ使用してください unknownLeaderboardType=未知のリーダーボードタイプ {0} @@ -1855,10 +1817,6 @@ settingsId=設定 ID documentSettingsId=文書設定 ID settingsForId=ID ''{0}'' の設定 userProfileSettingsTabDescription=ユーザ設定は、このページの多くの場所にあるダイアログを設定することによって生成されます。このビューには、収集したすべての設定がパワーユーザ向けの技術的な方法で表示されます。削除したエントリは復元できないため、注意して使用してください。 -resetToDefault=デフォルトに戻す -resetToDefaultInProgress=リセット中です... -settingsRemoved=デフォルト設定が復元されました -settingsRemovedError=デフォルト設定を復元できませんでした userSettingsFilter=設定フィルタ requiresRegattaRaceAndLeaderboard=このページには有効なレガッタ名、レース名、およびリーダーボード名が必要です。 couldNotFindRaceInRegatta=名前 {1} のレガッタに対して名前 {0} のレースが取得できませんでした diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties index b24f3f94ba3..e88b70ccebf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties @@ -13,7 +13,6 @@ wind=Vento maneuverType=Manobra windPanelLabel=Este é o painel eólico que até o momento está completamente vazio. refresh=Atualizar -remove=Remover removeNumber=Remover ({0}) windSource=Origem do vento dampeningInterval=Intervalo de atenuação @@ -49,7 +48,6 @@ trackedRaceConnectedToSelectedRaceName=Corrida rastreada conectada ao nome da co linkToColumn=Link a coluna unlink=Eliminar link leaderboardName=Nome do painel de classificação -cancel=Cancelar pleaseEnterAName=Insira um nome pleaseEnterABoatClass=Insira uma classe de barcos discardRacesFromHowManyStartedRacesOn=Descartar mais um corrida a partir de quantas corridas iniciadas @@ -61,7 +59,6 @@ startingFromNumberOfRaces=A partir de quantas corridas renameLeaderboard=Renomear painel de classificação addColumnToLeaderboard=Adicionar coluna ao painel de classificação pleaseEnterNameForNewRaceColumn=Insira um nome para a coluna da corrida nova -ok=OK medalRace=Corrida para medalha renameRace=Renomear corrida openSelectedLeaderboard=Abrir painel de classificação selecionado @@ -85,7 +82,6 @@ sapSailingAnalytics=Sailing Analytics leaderboard=Painel de classificação leaderboards=Painéis de classificação leaderboardSettings=Configurações do painel de classificação -settings=Configurações selectAtLeastOneLegDetail=Selecionar pelo menos um detalhe da perna currentSpeedOverGroundInKnots=SOG currentSpeedOverGroundInKnotsTooltip=A velocidade no fundo atual. @@ -168,7 +164,6 @@ tacks=Cambadas jibes=Jaibes penaltyCircles=Voltas de punição medalRaceIsNull=Valor de corrida para medalha não permitido -configuration=Configuração maneuverTypes=Manobras chooseChart=Selecionar diagrama distanceTraveled=Distância navegada @@ -186,13 +181,11 @@ secondsPerNauticalMileUnit=s/NM metersUnit=m millimetersUnit=mm degreesUnit=° -close=Encerrar compareCompetitors=Comparar competidores description=Descrição sailNumber=Número da vela country=País no3LetterCodes=Impossível encontrar os códigos de 3 letras do COI. -add=Adicionar delete=Eliminar showCharts=Visualizar diagramas raceWithThisNameAlreadyExists=Já existe uma corrida com esse nome. @@ -260,7 +253,6 @@ printHint=Imprime a versão aplicada blockedApplyButton=Os competidores registrados são diferentes dos competidores da lista de pares! multiplierInfo=Multiplica os voos e cria-os uns junto aos outros de modo que seja possível uma competição com menos mudanças de barco. noPairingListAvailable=A função de impressão só está disponível caso já tenha sido aplicada uma lista de pares aos registros de corridas dos painéis de classificação selecionados. -settingsForComponent=Configurações para {0} noEventsFound=Nenhum evento encontrado noEventSelected=Nenhum evento selecionado noLeaderboardsFound=Nenhum painel de classificação encontrado @@ -298,8 +290,6 @@ leaderboardGroup=Grupo de painéis de classificação pleaseEnterNonEmptyDescription=Insira uma descrição não vazia groupWithThisNameAlreadyExists=Já existe um grupo de painéis de classificação com este nome. detailsOfLeaderboardGroup=Detalhes do grupo de painéis de classificação -edit=Processar -save=Gravar abort=Cancelar noLeaderboardGroupWithNameFound=Não foi encontrado um grupo de painéis de classificação com o nome {0} overview=Síntese @@ -334,7 +324,6 @@ degreesShort=graus untracked=Não rastreado delayForLiveMode=Atraso para modo ao vivo: notAvailable=Não disponível -details=Detalhes noGroupSelected=Nenhum grupo selecionado combinedWindSourceTypeName=Combinado legMiddleWindSourceTypeName=Meio da perna @@ -417,7 +406,6 @@ simulateAsLiveRace=Simular como corrida ao vivo simulateWithOffset=Deslocamento antes da partida em minutos: boatClassDoesNotMatchSelectedRegatta=As corridas selecionadas contêm classes de barcos que não são as mesmas da classe de barcos ''{0}'' da regata selecionada. Não será carregada nenhuma corrida. regattaExistForSelectedBoatClass=Existe pelo menos uma regata para as classes de barcos selecionadas. Criar regatas padrão para essas corridas? -reload=Recarregar addRegatta=Adicionar regata... importRegattas=Importar regatas... exchangeName=Trocar nome @@ -639,7 +627,6 @@ totalNetPointsColumnTooltip=O total de pontos líquidos de um competidor na rega windData=Dados do vento gpsData=Dados do GPS status=Status -noDataFound=Não foram encontrados dados displayName=Nome de exibição histogram=Histograma numberOfDataPoints=Número de pontos de dados @@ -1231,10 +1218,6 @@ enterImageURL=Inserir URL de imagem... enterVideoURL=Inserir URL de vídeo... enterSponsorImageURL=Inserir URL de imagem de patrocinador... enterRaceName=Inserir nome da corrida... -serverError=Ocorreu um erro ao tentar contatar o servidor. Verifique sua conexão à rede e tente novamente. -remoteProcedureCall=Chamada de procedimento remoto -serverReplies=Respostas do servidor -errorCommunicatingWithServer=Erro ao comunicar com o servidor userManagement=Administração de usuários regattaStructureImport=Importação de estrutura da regata filteredBy=filtrado por @@ -1261,7 +1244,6 @@ noFleetsDefined=Nenhuma flotilha definida. successfullyCreatedRegattas=Regatas criadas com êxito errorTryingToRegisterRacesForTracking=Erro ao tentar registrar corridas {0} para rastreamento: {1}. Verificar sintaxe de URI ao vivo/armazenado. errorDeterminingPolarAvailability=Erro ao determinar disponibilidade de dados de carta polar/VPP para corrida {0}: {1} -error=Erro fileStorage=Armazenamento de arquivos active=Ativo scoringSchemeHighPointEssOverallDescription=Pontuação em pontos. O vencedor de uma etapa pontua 10 pontos, o 2º - 9 pontos, .... O desempate na pontuação geral da Extreme Sailing Series é efetuado a favor do competidor com o maior número de vitórias em etapas. Se isso não efetuar o desempate, será utilizado o resultado na última etapa. @@ -1309,7 +1291,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=Distância (com início do portão) distanceTraveledIncludingGateStartTooltip=A distância navegada desde o início até o fim da perna\nou até a data/hora atual, se a perna não estiver concluída.\nSe a perna incluir o início de um portão, a distância desde o fim da marcação até a posição inicial é incluída\npara ser possível comparar os competidores mesmo quando começam em horas diferentes. raceDistanceTraveledIncludingGateStartTooltip=A distância navegada desde o início até o fim da corrida\nou até a data/hora atual, se a corrida não estiver concluída.\nPara o início de um portão, a distância desde o fim da marcação até a posição inicial é incluída\npara ser possível comparar os competidores mesmo quando começam em horas diferentes. -results=Resultados groupName=Nome do grupo valueAscending=Valor (crescente) valueDescending=Valor (decrescente) @@ -1349,7 +1330,6 @@ dashboardRCBoat=Barco de rádio-controle fixedMarkPassing=(fixo) suppressedMarkPassing=(suprimido) windUp=Orientação pelo vento (visualizar vento no topo do mapa) -filterBy=Filtrar por currentFilterSelection=Seleção de filtro atual notCapableOfGeneratingACodeForIdentifier=Não é possível gerar um código para este identificador. serverUrl=URL de servidor @@ -1456,7 +1436,6 @@ noFinishedRaces=Ainda não existem corridas concluídas. racesOverview=Síntese de corridas listFormatLabel=Formato de lista competitionFormatLabel=Formato da competição -empty=Vazio runAQuery=Executar uma consulta latestRegattaStandings=Posições da última regata plainText=Texto simples @@ -1474,7 +1453,6 @@ photosCount[one]={0,number} foto eventsHaveTakenPlace=Foram realizados {0} eventos eventsHaveTakenPlace[one]=Foi realizado um evento raceOffice=Secretaria do evento -analyze=Analisar dataMiningSettings=Configurações de data mining multiResultsPresenter=Apresentador de vários resultados plainResultsPresenter=Apresentador de resultados simples @@ -1534,7 +1512,6 @@ warningForDisabledCompetitors=Os competidores seguintes não podem ser registrad competitorToolTipMessage={0} já foi atribuído à flotilha {2} na corrida {3} e por isso não pode ser atribuído à flotilha {1} na mesma corrida addMarkToRegatta=Adicionar marca à regata selectALeaderboardGroup=Selecionar um grupo de painéis de classificação... -pleaseSelect=Selecione requiresValidRegatta=Esta página requer uma regata válida, a coluna da corrida e o nome da flotilha para identificar a corrida a ser exibida. couldNotObtainRace=Não foi possível obter uma corrida com o nome {1} para a flotilha {2} para uma regata com o nome {0}: {3} errorTryingToCreateEmbeddedMap=Erro ao tentar criar o mapa integrado: {0} @@ -1816,25 +1793,10 @@ angleInDegree=Ângulo em graus angleInRadian=Ângulo em radianos centralAngleInRadian=Ângulo central em radianos centralAngleInDegree=Ângulo central em graus -kilometers=Quilômetros -meters=Metros -nauticalMiles=Milhas náuticas -seaMiles=Milhas marítimas -geographicalMiles=Milhas geográficas -days=Dias -hours=Horas -minutes=Minutos -seconds=Segundos -milliseconds=Milissegundos floatNumber=Margem integer=Número inteiro sampleColor=Amostra de cor -sharedSettingsLink=Link com configurações leaderboardPage=Página do painel de classificação -makeDefault=Definir como padrão -makeDefaultInProgress=Em andamento... -settingsSavedMessage=Suas configurações atuais foram definidas com êxito como padrão -settingsSaveErrorMessage=Ocorreu um erro ao definir suas configurações como padrão showLiveNow=Exibir "Ao vivo agora" useOnlyOneOfStartTimeInferenceAndControlTrackingFromStartAndFinishTimes=Utilizar só um de "Inferência da hora de partida" e "Rastreamento de controle das horas de partida e chegada" unknownLeaderboardType=Tipo de painel de classificação desconhecido {0} @@ -1852,10 +1814,6 @@ settingsId=ID de configurações documentSettingsId=ID de configuração do documento settingsForId=Configurações para ID ''{0}'' userProfileSettingsTabDescription=As configurações dos usuários são geradas por diálogos de configurações que podem ser encontrados em vários locais da página. Esta visão exibe todas as suas configurações coletadas de uma forma técnica para usuários avançados. Tenha em atenção que as entradas removidas não podem ser restauradas, por isso utilize-as com cuidado. -resetToDefault=Reinicializar para padrão -resetToDefaultInProgress=Na reinicialização... -settingsRemoved=Configurações padrão restauradas -settingsRemovedError=Não foi possível restaurar configurações padrão userSettingsFilter=Filtro de configurações requiresRegattaRaceAndLeaderboard=Esta página necessita de um nome de regata, um nome de corrida e um nome de painel de classificação válidos. couldNotFindRaceInRegatta=Não foi possível obter uma corrida com o nome {0} para uma regata com o nome {1} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties index a790f34c6cc..a56ad094a80 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties @@ -13,7 +13,6 @@ wind=Ветер maneuverType=Маневр windPanelLabel=Это панель ветров, которая пока что совсем пуста. refresh=Обновить -remove=Удалить removeNumber=Удалить ({0}) windSource=Источник ветра dampeningInterval=Интервал смягчения @@ -51,7 +50,6 @@ trackedRaceConnectedToSelectedRaceName=Отслеживаемая гонка с linkToColumn=Связать со столбцом unlink=Отменить связывание leaderboardName=Название таблицы лидеров -cancel=Отмена pleaseEnterAName=Введите название pleaseEnterABoatClass=Введите класс лодки discardRacesFromHowManyStartedRacesOn=Исключить еще одну гонку, начиная с числа стартов в гонках @@ -63,7 +61,6 @@ startingFromNumberOfRaces=Начиная с числа гонок renameLeaderboard=Переименовать таблицу лидеров addColumnToLeaderboard=Добавить столбец в таблицу лидеров pleaseEnterNameForNewRaceColumn=Введите название для столбца новой гонки -ok=ОК medalRace=Гонка на медали renameRace=Переименовать гонку openSelectedLeaderboard=Открыть выбранную таблицу лидеров @@ -171,7 +168,6 @@ tacks=Поворотов оверштаг jibes=Поворотов фордевинд penaltyCircles=Штрафных кругов medalRaceIsNull=Значение гонки на медали не разрешено -configuration=Конфигурация maneuverTypes=Маневры chooseChart=Выберите диаграмму distanceTraveled=Пройденная дистанция @@ -189,13 +185,11 @@ secondsPerNauticalMileUnit=с/NM metersUnit=м millimetersUnit=мм degreesUnit=° -close=Закрыть compareCompetitors=Сравнить участников description=Описание sailNumber=Номер на парусе country=Страна no3LetterCodes=Не удалось найти 3-буквенные коды IOC. -add=Добавить delete=Удалить showCharts=Показать диаграммы raceWithThisNameAlreadyExists=Гонка с таким названием уже существует. @@ -263,7 +257,6 @@ printHint=Печать примененной версии blockedApplyButton=Число зарегистрированных участников не равно числу участников из списка пар! multiplierInfo=Планируйте флайты таким образом, чтобы обеспечить соревнования с минимально возможной переменой лодок noPairingListAvailable=Функция печати доступна только после применения списка пар к журналам гонок выбранных таблиц лидеров. -settingsForComponent={0} — параметры noEventsFound=События не найдены noEventSelected=Не выбрано событие noLeaderboardsFound=Таблицы лидеров не найдены @@ -301,8 +294,6 @@ leaderboardGroup=Группа таблиц лидеров pleaseEnterNonEmptyDescription=Введите непустое описание groupWithThisNameAlreadyExists=Группа таблиц лидеров с таким названием уже существует. detailsOfLeaderboardGroup=Подробности группы таблиц лидеров -edit=Изменить -save=Сохранить abort=Прервать noLeaderboardGroupWithNameFound=Группа таблиц лидеров с названием {0} не найдена overview=Обзор @@ -1234,10 +1225,6 @@ enterImageURL=Ввести URL-адрес изображения... enterVideoURL=Ввести URL-адрес видео... enterSponsorImageURL=Ввести URL-адрес изображения спонсора... enterRaceName=Ввести название гонки... -serverError=При попытке обратиться к серверу возникла ошибка. Проверьте подключение к сети и повторите попытку. -remoteProcedureCall=Удаленный вызов процедуры -serverReplies=Ответы сервера -errorCommunicatingWithServer=Ошибка связи с сервером userManagement=Управление пользователями regattaStructureImport=Импорт структуры регаты filteredBy=отфильтровано по @@ -1264,7 +1251,6 @@ noFleetsDefined=Не определены флоты. successfullyCreatedRegattas=Регаты успешно созданы errorTryingToRegisterRacesForTracking=Ошибка при попытке зарегистрировать гонки {0} для отслеживания: {1}. проверьте синтаксис URI оперативных/хранимых данных. errorDeterminingPolarAvailability=Ошибка при определении доступности полярных/VPP данных для гонки {0}: {1} -error=Ошибка fileStorage=Хранилище файлов active=Активно scoringSchemeHighPointEssOverallDescription=Оценка в баллах. Победитель в акте получает 10 баллов, 2-й — 9 баллов, .... Любое равенство в общей оценке Extreme Sailing Series разрешается в пользу участника с наибольшим числом побед в актах. В случае равенства числа побед для разрешения используется последний акт. @@ -1459,7 +1445,6 @@ noFinishedRaces=Завершенных гонок еще нет racesOverview=Обзор гонок listFormatLabel=Формат списка competitionFormatLabel=Формат соревнования -empty=Пусто runAQuery=Выполнить запрос latestRegattaStandings=Позиции в последней регате plainText=Простой текст @@ -1537,7 +1522,6 @@ warningForDisabledCompetitors=Регистрация следующих учас competitorToolTipMessage={0} уже присвоен флоту {2} в гонке {3} и поэтому не может быть присвоен флоту {1} в той же самой гонке addMarkToRegatta=Добавить отметку к регате selectALeaderboardGroup=Выбрать группу таблиц лидеров... -pleaseSelect=Выберите requiresValidRegatta=Эта страница определяет гонку для отображения по допустимым значениям регаты, столбца гонки и названия флота. couldNotObtainRace=Не удалось получить гонку с названием {1} для флота {2} для регаты с названием {0}: {3} errorTryingToCreateEmbeddedMap=Ошибка при попытке создать внедренную карту: {0} @@ -1819,25 +1803,10 @@ angleInDegree=Угол в градусах angleInRadian=Угол в радианах centralAngleInRadian=Центральный угол в градусах centralAngleInDegree=Центральный угол в радианах -kilometers=Километры -meters=Метры -nauticalMiles=Морские мили -seaMiles=Морские мили -geographicalMiles=Географические мили -days=Дни -hours=Часы -minutes=Минуты -seconds=Секунды -milliseconds=Миллисекунды floatNumber=Плавающее integer=Целое sampleColor=Образец цвета -sharedSettingsLink=Связать с настройками leaderboardPage=Страница таблицы лидеров -makeDefault=Использовать по умолчанию -makeDefaultInProgress=Выполняется... -settingsSavedMessage=Текущие настройки успешно заданы для использования по умолчанию -settingsSaveErrorMessage=При задании настроек для использования по умолчанию возникла ошибка showLiveNow=Показать "Оперативные данные" useOnlyOneOfStartTimeInferenceAndControlTrackingFromStartAndFinishTimes=Использовать только один из параметров "Вывод о времени старта" и "Контролировать отслеживание от времени старта и финиша" unknownLeaderboardType=Неизвестный тип таблицы лидеров {0} @@ -1851,14 +1820,10 @@ estimatedTime=Оценка времени nothingUpcoming=Дальнейших запланированных гонок сейчас нет noUpcomingRaceDataAvailable=Данные предстоящей гонки недоступны reallyRemoveSeries=Действительно удалить серии ''{0}''? Примечание: все журналы для вложенных столбцов гонки также будут окончательно удалены! -settingsId=Ид. настроек documentSettingsId=Ид. настроек документа settingsForId=Настройки для ид. ''{0}'' userProfileSettingsTabDescription=Пользовательские настройки генерируются диалогами настроек, расположенными во многих местах страницы. Здесь отображено техническое представление всех собранных настроек для ключевых пользователей. Соблюдайте осторожность, так как восстановить удаленные записи невозможно. -resetToDefault=Восстановить настройки по умолчанию resetToDefaultInProgress=Выполняется сброс... -settingsRemoved=Восстановлены настройки по умолчанию -settingsRemovedError=Не удалось восстановить настройки по умолчанию userSettingsFilter=Фильтр настроек requiresRegattaRaceAndLeaderboard=Для этой страницы требуются действительные названия регаты, гонки и таблицы лидеров. couldNotFindRaceInRegatta=Не удалось получить гонку с названием {0} для регаты с названием {1} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties index 96cf2208ab0..f5f603a9ec9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties @@ -13,7 +13,6 @@ wind=风力 maneuverType=操作 windPanelLabel=这是风力面板，目前完全空白。 refresh=刷新 -remove=移除 removeNumber=移除 ({0}) windSource=风源 dampeningInterval=阻尼间隔 @@ -51,7 +50,6 @@ trackedRaceConnectedToSelectedRaceName=跟踪的比赛轮次已连接到所选 linkToColumn=链接到列 unlink=取消链接 leaderboardName=积分榜名称 -cancel=取消 pleaseEnterAName=请输入名称 pleaseEnterABoatClass=请输入船只级别 discardRacesFromHowManyStartedRacesOn=从已开始的比赛轮次数开始再放弃一个比赛轮次 @@ -63,7 +61,6 @@ startingFromNumberOfRaces=从比赛轮次数开始 renameLeaderboard=重命名积分榜 addColumnToLeaderboard=向积分榜添加列 pleaseEnterNameForNewRaceColumn=请输入新比赛轮次列的名称 -ok=确定 medalRace=奖牌轮 renameRace=重命名比赛轮次 openSelectedLeaderboard=打开选择的积分榜 @@ -87,7 +84,6 @@ sapSailingAnalytics=Sailing Analytics leaderboard=积分榜 leaderboards=积分榜 leaderboardSettings=积分榜设置 -settings=设置 selectAtLeastOneLegDetail=至少选择一个航段详情 currentSpeedOverGroundInKnots=SOG currentSpeedOverGroundInKnotsTooltip=当前实际速度。 @@ -171,7 +167,6 @@ tacks=迎风转向 jibes=顺风转向 penaltyCircles=惩罚转圈 medalRaceIsNull=不允许奖牌轮值 -configuration=配置 maneuverTypes=操作 chooseChart=选择记录 distanceTraveled=航行距离 @@ -189,13 +184,11 @@ secondsPerNauticalMileUnit=s/NM metersUnit=m millimetersUnit=mm degreesUnit=° -close=关闭 compareCompetitors=比较参赛队 description=描述 sailNumber=帆号 country=国家/地区 no3LetterCodes=无法找到 IOC 3 个字母的代码。 -add=添加 delete=删除 showCharts=显示记录 raceWithThisNameAlreadyExists=具有此名称的比赛轮次已存在。 @@ -263,7 +256,6 @@ printHint=打印应用的版本 blockedApplyButton=注册的参赛队不等于配对清单中的参赛队！ multiplierInfo=多个航程，彼此相邻，这样就可以减少船只更换情况进行比赛 noPairingListAvailable=打印功能仅在配对清单可应用于选择的积分榜比赛轮次日志时可用。 -settingsForComponent={0}设置 noEventsFound=未找到活动 noEventSelected=未选择活动 noLeaderboardsFound=未找到积分榜 @@ -301,8 +293,6 @@ leaderboardGroup=积分榜组 pleaseEnterNonEmptyDescription=请输入非空描述 groupWithThisNameAlreadyExists=具有此名称的积分榜组已存在。 detailsOfLeaderboardGroup=积分榜组详情 -edit=编辑 -save=保存 abort=中止 noLeaderboardGroupWithNameFound=未找到名称为{0}的积分榜组 overview=总览 @@ -337,7 +327,6 @@ degreesShort=deg untracked=取消跟踪 delayForLiveMode=实况模式延迟： notAvailable=不可用 -details=详情 noGroupSelected=未选择分组 combinedWindSourceTypeName=组合 legMiddleWindSourceTypeName=航段中部 @@ -420,7 +409,6 @@ simulateAsLiveRace=模拟实况比赛轮次 simulateWithOffset=起航前的偏移（分钟）： boatClassDoesNotMatchSelectedRegatta=所选的比赛轮次包含不同于所选比赛船只级别 "{0}" 的船只级别。将不加载比赛轮次。 regattaExistForSelectedBoatClass=所选船只级别至少有一场比赛。是否确定为这些比赛轮次创建默认比赛？ -reload=重新加载 addRegatta=添加比赛... importRegattas=导入比赛... exchangeName=交换机名称 @@ -642,7 +630,6 @@ totalNetPointsColumnTooltip=参赛队在比赛中的总净分。\n按名次（ windData=风力数据 gpsData=GPS 数据 status=状态 -noDataFound=未找到数据 displayName=显示名称 histogram=直方图 numberOfDataPoints=数据点数 @@ -1234,10 +1221,6 @@ enterImageURL=输入图像 URL... enterVideoURL=输入视频 URL... enterSponsorImageURL=输入赞助商图像 URL... enterRaceName=输入比赛轮次名称... -serverError=尝试联系服务器时出错。请检查网络连接，并重试。 -remoteProcedureCall=远程过程调用 -serverReplies=服务器应答 -errorCommunicatingWithServer=与服务器通信时发生错误 userManagement=用户管理 regattaStructureImport=比赛结构导入 filteredBy=筛选方式 @@ -1264,7 +1247,6 @@ noFleetsDefined=未定义船队。 successfullyCreatedRegattas=已成功创建比赛 errorTryingToRegisterRacesForTracking=尝试注册比赛轮次{0}用于跟踪出错： {1}。检查实况/存储的 URI 语法。 errorDeterminingPolarAvailability=确定比赛轮次{0}的极坐标/VPP 数据的可用性出错： {1} -error=错误 fileStorage=文件存储 active=已激活 scoringSchemeHighPointEssOverallDescription=得分。 分站赛获胜者得 10 分、第 2 名 9 分、.... 在总体极限帆船系列赛中如有平局，以获得最多分站赛名次的参赛队取得胜利。 如果仍有平局，就以最后一个分站赛的名次打破平局。 @@ -1312,7 +1294,6 @@ courseOverGroundTrueDegrees=对地航向 distanceIncludingGateStartInMeters=距离（起航门标） distanceTraveledIncludingGateStartTooltip=如果航段没有结束，从航段起点到终点\n或当前时间点航行的距离。\n如果航段包括起航门标，则包括尾销到起航位置的距离，\n这样，即便在不同时间起航，也可以比较参赛队。 raceDistanceTraveledIncludingGateStartTooltip=如果比赛轮次没有结束，从比赛轮次开始到结束\n或当前时间点航行的距离。对于起航门标，包括尾销到起航位置的距离，\n这样，即便在不同时间起航，也可以比较参赛队。 -results=结果 groupName=分组名称 valueAscending=值（递增） valueDescending=值（递减） @@ -1352,7 +1333,6 @@ dashboardRCBoat=RC 船只 fixedMarkPassing=（固定） suppressedMarkPassing=（禁止） windUp=风向向上（从地图的顶部显示风力） -filterBy=筛选方式 currentFilterSelection=当前筛选器选择 notCapableOfGeneratingACodeForIdentifier=无法为此标识符生成代码。 serverUrl=服务器 URL @@ -1459,7 +1439,6 @@ noFinishedRaces=没有结束的比赛轮次 racesOverview=比赛轮次总览 listFormatLabel=清单格式 competitionFormatLabel=赛制 -empty=空 runAQuery=运行查询 latestRegattaStandings=最新比赛排名 plainText=纯文本 @@ -1477,7 +1456,6 @@ photosCount[one]={0,number} 张照片 eventsHaveTakenPlace={0}个活动已举行 eventsHaveTakenPlace[one]=已举行一场活动 raceOffice=竞赛办公室 -analyze=分析 dataMiningSettings=数据挖掘设置 multiResultsPresenter=多结果展示区 plainResultsPresenter=纯结果展示区 @@ -1537,7 +1515,6 @@ warningForDisabledCompetitors=以下参赛队无法注册此比赛轮次：{0} competitorToolTipMessage={0}已分配到比赛轮次{3}中的船队{2}，因此，无法分配到同一比赛轮次中的船队{1} addMarkToRegatta=向比赛添加标志 selectALeaderboardGroup=选择积分榜组... -pleaseSelect=请选择 requiresValidRegatta=此页面需要有效的比赛、比赛轮次列和船队名称，才能识别显示的比赛轮次。 couldNotObtainRace=无法为名称为{0}的比赛获取船队{2}名称为{1}的比赛轮次： {3} errorTryingToCreateEmbeddedMap=尝试创建嵌入式地图出错： {0} @@ -1819,25 +1796,10 @@ angleInDegree=角度（度） angleInRadian=角度（弧度） centralAngleInRadian=圆心角（弧度） centralAngleInDegree=圆心角（度） -kilometers=千米 -meters=米 -nauticalMiles=海里 -seaMiles=海里 -geographicalMiles=地理英里 -days=天 -hours=小时 -minutes=分钟 -seconds=秒 -milliseconds=毫秒 floatNumber=浮点数 integer=整数 sampleColor=颜色样本 -sharedSettingsLink=链接与设置 leaderboardPage=积分榜页面 -makeDefault=设为默认值 -makeDefaultInProgress=正在进行... -settingsSavedMessage=当前设置已成功设为默认设置 -settingsSaveErrorMessage=将设置设为默认设置时发生错误 showLiveNow=显示“现在直播” useOnlyOneOfStartTimeInferenceAndControlTrackingFromStartAndFinishTimes=仅使用“开始时间推断”和“从开始和结束时间控制跟踪”中的其中一个 unknownLeaderboardType=积分榜类型{0}未知 @@ -1855,10 +1817,6 @@ settingsId=设置编号 documentSettingsId=文档设置编号 settingsForId=编号 ''''{0}'''' 的设置 userProfileSettingsTabDescription=用户设置由可在页面多个位置找到的设置对话生成。此视图以技术方式为高级用户显示收集的所有设置。请注意，移除的条目无法恢复，请谨慎使用。 -resetToDefault=重置为默认值 -resetToDefaultInProgress=正在重置... -settingsRemoved=默认设置已恢复 -settingsRemovedError=无法恢复默认设置 userSettingsFilter=设置筛选器 requiresRegattaRaceAndLeaderboard=此页面需要有效的比赛名称、比赛轮次名称和积分榜名称。 couldNotFindRaceInRegatta=无法为名称为{1}的比赛获取名称为{0}的比赛轮次 diff --git a/java/com.sap.sse.gwt/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sse.gwt/.settings/org.eclipse.core.resources.prefs index da4704b5186..98ceb0eebc3 100644 --- a/java/com.sap.sse.gwt/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sse.gwt/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,12 @@ eclipse.preferences.version=1 +encoding//src/com/sap/sse/gwt/client/StringMessages.properties=UTF-8 +encoding//src/com/sap/sse/gwt/client/StringMessages_de.properties=UTF-8 +encoding//src/com/sap/sse/gwt/client/StringMessages_es.properties=UTF-8 +encoding//src/com/sap/sse/gwt/client/StringMessages_fr.properties=UTF-8 +encoding//src/com/sap/sse/gwt/client/StringMessages_ja.properties=UTF-8 +encoding//src/com/sap/sse/gwt/client/StringMessages_pt.properties=UTF-8 +encoding//src/com/sap/sse/gwt/client/StringMessages_ru.properties=UTF-8 +encoding//src/com/sap/sse/gwt/client/StringMessages_zh.properties=UTF-8 encoding//src/com/sap/sse/gwt/client/controls/filestorage/StringMessages.properties=UTF-8 encoding//src/com/sap/sse/gwt/client/controls/filestorage/StringMessages_de.properties=UTF-8 encoding//src/com/sap/sse/gwt/client/controls/filestorage/StringMessages_fr.properties=UTF-8 diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java index d04c9a06766..f3d503aec33 100755 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java @@ -1,13 +1,18 @@ package com.sap.sse.gwt.client; +import com.google.gwt.core.client.GWT; import com.google.gwt.i18n.client.Messages; +import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale; /** * Defines the text strings for i18n that are used by the SSE GWT bundle. * @author Axel Uhl (D043530) * */ +@DefaultLocale("en") public interface StringMessages extends Messages { + public static final StringMessages INSTANCE = GWT.create(StringMessages.class); + String makeDefault(); String makeDefaultInProgress(); String settingsSavedMessage(); diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties new file mode 100644 index 00000000000..915b3157ef3 --- /dev/null +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties @@ -0,0 +1,42 @@ +makeDefault=Make default +makeDefaultInProgress=In progress... +settingsSavedMessage=Your current settings have been successfully set as default +settingsSaveErrorMessage=An error occurred during setting your settings as default +save=Save +remove=Remove +ok=OK +cancel=Cancel +add=Add +edit=Edit +serverError=An error occurred while attempting to contact the server. Please check your network connection and try again. +close=Close +remoteProcedureCall=Remote Procedure Call +serverReplies=Server replies +errorCommunicatingWithServer=Error communicating with server +configuration=Configuration +settings=Settings +settingsForComponent=Settings for {0} +pleaseSelect=Please select +sharedSettingsLink=Link with settings +resetToDefault=Reset to default +resetToDefaultInProgress=In resetting... +settingsRemoved=Default settings restored +settingsRemovedError=Could not restore default settings +details=Details +filterBy=Filter by +noDataFound=No data found +results=Results +analyze=Analyze +reload=Reload +empty=Empty +error=Error +kilometers=Kilometers +meters=Meters +nauticalMiles=Nautical Miles +seaMiles=Sea Miles +geographicalMiles=Geographical Miles +days=Days +hours=Hours +minutes=Minutes +seconds=Seconds +milliseconds=Milliseconds diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties new file mode 100644 index 00000000000..0a101c08348 --- /dev/null +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties @@ -0,0 +1,42 @@ +makeDefault=Als Voreinstellung +makeDefaultInProgress=In Bearbeitung... +settingsSavedMessage=Ihre aktuellen Einstellungen wurden als Voreinstellungen erfolgreich übernommen. +settingsSaveErrorMessage=Bei dem Versuch, Ihre aktuellen Einstellungen als Voreinstellungen zu übernehmen, ist ein Fehler aufgetreten. +save=Speichern +remove=Löschen +ok=OK +cancel=Abbrechen +add=Hinzufügen +edit=Bearbeiten +serverError=Es ist ein Fehler beim Versuch aufgetreten, den Server zu kontaktieren. Bitte Netzwerkverbindung prüfen und erneut versuchen. +close=Schließen +remoteProcedureCall=Entfernter Prozeduraufruf +serverReplies=Server antwortet +errorCommunicatingWithServer=Fehler bei der Kommunikation mit dem Server +configuration=Konfiguration +settings=Einstellungen +settingsForComponent=Einstellungen für {0} +pleaseSelect=Bitte auswählen +sharedSettingsLink=Link mit Settings +resetToDefault=Auf Standard zurücksetzen +resetToDefaultInProgress=Setze zurück... +settingsRemoved=Standardeinstellungen wiederhergestellt +settingsRemovedError=Fehler beim Widerherstellen der Standardeinstellungen +details=Details +filterBy=Gefiltert nach +noDataFound=Keine Daten gefunden +results=Ergebnisse +analyze=Untersuche +reload=Neu laden +empty=Leer +error=Fehler +kilometers=Kilometer +meters=Meter +nauticalMiles=Nautische Meilen +seaMiles=Seemeilen +geographicalMiles=Geografische Meilen +days=Tage +hours=Stunden +minutes=Minuten +seconds=Sekunden +milliseconds=Millisekunden diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_es.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_es.properties new file mode 100644 index 00000000000..166e9f80aef --- /dev/null +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_es.properties @@ -0,0 +1,42 @@ +makeDefault=Establecer como predeterminado +makeDefaultInProgress=En curso... +settingsSavedMessage=Sus opciones actuales se han definido correctamente como estándar +settingsSaveErrorMessage=Se ha producido un error durante la definición de sus opciones como estándar +save=Grabar +remove=Eliminar +ok=OK +cancel=Cancelar +add=Añadir +edit=Editar +serverError=Se ha producido un error al intentar contactar con el servidor. Compruebe la conexión de red e inténtelo de nuevo. +close=Cerrar +remoteProcedureCall=Llamada de procedimiento remoto +serverReplies=Servidor responde +errorCommunicatingWithServer=Error al comunicar con el servidor +configuration=Configuración +settings=Opciones +settingsForComponent=Opciones para {0} +pleaseSelect=Seleccione +sharedSettingsLink=Enlace con opciones +resetToDefault=Reinicializar a valores por defecto +resetToDefaultInProgress=Reinicializando... +settingsRemoved=Opciones por defecto restablecidas +settingsRemovedError=No se han podido restablecer las opciones por defecto +details=Detalles +filterBy=Filtrar por +noDataFound=No se han encontrado datos +results=Resultados +analyze=Analizar +reload=Recargar +empty=Vacío +error=Error +kilometers=Kilómetros +meters=Metros +nauticalMiles=Millas náuticas +seaMiles=Millas marinas +geographicalMiles=Millas geográficas +days=Días +hours=Horas +minutes=Minutos +seconds=Segundos +milliseconds=Milisegundos diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_fr.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_fr.properties new file mode 100644 index 00000000000..0ff0cc7bc75 --- /dev/null +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_fr.properties @@ -0,0 +1,42 @@ +makeDefault=Définir par défaut +makeDefaultInProgress=En cours... +settingsSavedMessage=Vos options actuelles ont correctement été définies comme options par défaut. +settingsSaveErrorMessage=Une erreur s''est produite lors de la définition de vos options comme options par défaut. +save=Enregistrer +remove=Supprimer +ok=OK +cancel=Annuler +add=Ajouter +edit=Modifier +serverError=Une erreur s''est produite lors de la tentative de contact du serveur. Vérifiez la connexion réseau et réessayez. +close=Fermer +remoteProcedureCall=Procédure d''appel distante +serverReplies=Réponses du serveur +errorCommunicatingWithServer=Erreur lors de la communication avec le serveur +configuration=Configuration +settings=Options +settingsForComponent=Options pour {0} +pleaseSelect=Sélectionnez +sharedSettingsLink=Lier aux options +resetToDefault=Réinitialiser sur les valeurs par défaut +resetToDefaultInProgress=Réinitialisation en cours... +settingsRemoved=Options par défaut restaurées +settingsRemovedError=Impossible de restaurer les options par défaut +details=Détails +filterBy=Filtrer par +noDataFound=Aucune donnée trouvée +results=Résultats +analyze=Analyser +reload=Recharger +empty=Vide +error=Erreur +kilometers=Kilomètres +meters=Mètres +nauticalMiles=Milles nautiques +seaMiles=Milles marins +geographicalMiles=Milles géographiques +days=Jours +hours=Heures +minutes=Minutes +seconds=Secondes +milliseconds=Millisecondes diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ja.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ja.properties new file mode 100644 index 00000000000..d807631b022 --- /dev/null +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ja.properties @@ -0,0 +1,42 @@ +makeDefault=デフォルトを設定 +makeDefaultInProgress=実行中です... +settingsSavedMessage=現在の設定がデフォルトとして設定されました +settingsSaveErrorMessage=使用している設定をデフォルトとして設定する際にエラーが発生しました +save=保存 +remove=削除 +ok=OK +cancel=取消 +add=追加 +edit=編集 +serverError=サーバにアクセスしようとしてエラーが発生しました。ネットワーク接続を確認して再試行してください。 +close=閉じる +remoteProcedureCall=リモートプロシージャコール +serverReplies=サーバ応答 +errorCommunicatingWithServer=サーバとの通信でエラー発生 +configuration=設定 +settings=設定 +settingsForComponent={0} の設定 +pleaseSelect=選択: +sharedSettingsLink=設定にリンク +resetToDefault=デフォルトに戻す +resetToDefaultInProgress=リセット中です... +settingsRemoved=デフォルト設定が復元されました +settingsRemovedError=デフォルト設定を復元できませんでした +details=詳細 +filterBy=フィルタキー +noDataFound=データが見つかりませんでした +results=結果 +analyze=分析 +reload=リロード +empty=空 +error=エラー +kilometers=キロメートル +meters=メートル +nauticalMiles=海里 +seaMiles=海里 +geographicalMiles=地理マイル +days=日 +hours=時間 +minutes=分 +seconds=秒 +milliseconds=ミリ秒 diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_pt.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_pt.properties new file mode 100644 index 00000000000..5fff1652bbe --- /dev/null +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_pt.properties @@ -0,0 +1,42 @@ +makeDefault=Definir como padrão +makeDefaultInProgress=Em andamento... +settingsSavedMessage=Suas configurações atuais foram definidas com êxito como padrão +settingsSaveErrorMessage=Ocorreu um erro ao definir suas configurações como padrão +save=Gravar +remove=Remover +ok=OK +cancel=Cancelar +add=Adicionar +edit=Processar +serverError=Ocorreu um erro ao tentar contatar o servidor. Verifique sua conexão à rede e tente novamente. +close=Encerrar +remoteProcedureCall=Chamada de procedimento remoto +serverReplies=Respostas do servidor +errorCommunicatingWithServer=Erro ao comunicar com o servidor +configuration=Configuração +settings=Configurações +settingsForComponent=Configurações para {0} +pleaseSelect=Selecione +sharedSettingsLink=Link com configurações +resetToDefault=Reinicializar para padrão +resetToDefaultInProgress=Na reinicialização... +settingsRemoved=Configurações padrão restauradas +settingsRemovedError=Não foi possível restaurar configurações padrão +details=Detalhes +filterBy=Filtrar por +noDataFound=Não foram encontrados dados +results=Resultados +analyze=Analisar +reload=Recarregar +empty=Vazio +error=Erro +kilometers=Quilômetros +meters=Metros +nauticalMiles=Milhas náuticas +seaMiles=Milhas marítimas +geographicalMiles=Milhas geográficas +days=Dias +hours=Horas +minutes=Minutos +seconds=Segundos +milliseconds=Milissegundos diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ru.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ru.properties new file mode 100644 index 00000000000..fc39bd04a95 --- /dev/null +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ru.properties @@ -0,0 +1,35 @@ +makeDefault=Использовать по умолчанию +makeDefaultInProgress=Выполняется... +settingsSavedMessage=Текущие настройки успешно заданы для использования по умолчанию +settingsSaveErrorMessage=При задании настроек для использования по умолчанию возникла ошибка +save=Сохранить +remove=Удалить +ok=ОК +cancel=Отмена +add=Добавить +edit=Изменить +serverError=При попытке обратиться к серверу возникла ошибка. Проверьте подключение к сети и повторите попытку. +close=Закрыть +remoteProcedureCall=Удаленный вызов процедуры +serverReplies=Ответы сервера +errorCommunicatingWithServer=Ошибка связи с сервером +configuration=Конфигурация +settingsId=Ид. настроек +settingsForComponent={0} — параметры +pleaseSelect=Выберите +sharedSettingsLink=Связать с настройками +resetToDefault=Восстановить настройки по умолчанию +settingsRemoved=Восстановлены настройки по умолчанию +settingsRemovedError=Не удалось восстановить настройки по умолчанию +empty=Пусто +error=Ошибка +kilometers=Километры +meters=Метры +nauticalMiles=Морские мили +seaMiles=Морские мили +geographicalMiles=Географические мили +days=Дни +hours=Часы +minutes=Минуты +seconds=Секунды +milliseconds=Миллисекунды \ No newline at end of file diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_zh.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_zh.properties new file mode 100644 index 00000000000..97522149320 --- /dev/null +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_zh.properties @@ -0,0 +1,42 @@ +makeDefault=设为默认值 +makeDefaultInProgress=正在进行... +settingsSavedMessage=当前设置已成功设为默认设置 +settingsSaveErrorMessage=将设置设为默认设置时发生错误 +save=保存 +remove=移除 +ok=确定 +cancel=取消 +add=添加 +edit=编辑 +serverError=尝试联系服务器时出错。请检查网络连接，并重试。 +close=关闭 +remoteProcedureCall=远程过程调用 +serverReplies=服务器应答 +errorCommunicatingWithServer=与服务器通信时发生错误 +configuration=配置 +settings=设置 +settingsForComponent={0}设置 +pleaseSelect=请选择 +sharedSettingsLink=链接与设置 +resetToDefault=重置为默认值 +resetToDefaultInProgress=正在重置... +settingsRemoved=默认设置已恢复 +settingsRemovedError=无法恢复默认设置 +details=详情 +filterBy=筛选方式 +noDataFound=未找到数据 +results=结果 +analyze=分析 +reload=重新加载 +empty=空 +error=错误 +kilometers=千米 +meters=米 +nauticalMiles=海里 +seaMiles=海里 +geographicalMiles=地理英里 +days=天 +hours=小时 +minutes=分钟 +seconds=秒 +milliseconds=毫秒 \ No newline at end of file From cbda33fb72b5a15ac0f43e17e8b49379f26345bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Fri, 13 Apr 2018 12:49:08 +0200 Subject: [PATCH 07/63] extracted sailing independent string messages into new sse.datamining properties files --- .../gwt/ui/client/StringMessages.properties | 68 ---------------- .../ui/client/StringMessages_de.properties | 68 ---------------- .../ui/client/StringMessages_es.properties | 68 ---------------- .../ui/client/StringMessages_fr.properties | 68 ---------------- .../ui/client/StringMessages_ja.properties | 67 ---------------- .../ui/client/StringMessages_pt.properties | 68 ---------------- .../ui/client/StringMessages_ru.properties | 77 +------------------ .../ui/client/StringMessages_zh.properties | 68 ---------------- .../org.eclipse.core.resources.prefs | 9 +++ .../sap/sse/datamining/ui/StringMessages.java | 26 +------ .../datamining/ui/StringMessages.properties | 44 +++++++++++ .../ui/StringMessages_de.properties | 44 +++++++++++ .../ui/StringMessages_es.properties | 44 +++++++++++ .../ui/StringMessages_fr.properties | 44 +++++++++++ .../ui/StringMessages_ja.properties | 44 +++++++++++ .../ui/StringMessages_pt.properties | 44 +++++++++++ .../ui/StringMessages_ru.properties | 44 +++++++++++ .../ui/StringMessages_zh.properties | 44 +++++++++++ .../sap/sse/gwt/client/StringMessages.java | 27 ++++++- .../sse/gwt/client/StringMessages.properties | 25 ++++++ .../gwt/client/StringMessages_de.properties | 24 ++++++ .../gwt/client/StringMessages_es.properties | 24 ++++++ .../gwt/client/StringMessages_fr.properties | 24 ++++++ .../gwt/client/StringMessages_ja.properties | 26 +++++++ .../gwt/client/StringMessages_pt.properties | 24 ++++++ .../gwt/client/StringMessages_ru.properties | 35 ++++++++- .../gwt/client/StringMessages_zh.properties | 26 ++++++- 27 files changed, 594 insertions(+), 580 deletions(-) create mode 100644 java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.properties create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_de.properties create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_es.properties create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_fr.properties create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ja.properties create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_pt.properties create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ru.properties create mode 100644 java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_zh.properties diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 9dcea48205e..15d73580ae4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -885,12 +885,9 @@ legType=Leg Type sailID=Sail Number seriesLeaderboard=Series leaderboard regattaLeaderboards=Regatta leaderboards -clearSelection=Clear Selection running=Running -runAsSubstantive=Run done=Done lastFinished=Last finished -run=Run times=times dataAmount=Data amount averageCleanedServerTime=\u2205 Cleaned Server Time @@ -914,12 +911,8 @@ selectSheet=Select sheet cleanedServerTime=Cleaned Server Time overallTime=Overall Time cleanedOverallTime=Cleaned Overall Time -dataMiningResult=Data Mining Result -groupBy=Group by statisticToCalculate=Calculate statistic -queryResultsChartSubtitle=Worked through {0} data entries in {1} seconds noQuerySelected=No query selected -runAutomatically=Run automatically windImport_Upload=Upload windImport_Title=Import Wind from Expedition windImport_BoatId=Boat Id: @@ -949,14 +942,9 @@ raceTimeTooltip=Total time traveled in this race, starting to measure when compe raceTimeDownwindTooltip=Total time traveled downwind in this race raceTimeReachingTooltip=Total time traveled reaching in this race raceTimeUpwindTooltip=Total time traveled upwind in this race -noStatisticSelectedError=No statistic to calculate is selected noCustomGrouperScriptTextError=The grouper script is empty -noDimensionToGroupBySelectedError=No dimension to group by is selected noGrouperSelectedError=No grouper type is selected -noDataRetrieverChainDefinitonSelectedError=No data retriever is selected -queryNotValidBecause=No query possible, because dataMining=Data Mining -errorRunningDataMiningQuery=An error occured running the query hideToolbar=Hide toolbar showSeriesLeaderboards=Show series leaderboards showOverallLeaderboard=Show overall leaderboard @@ -979,7 +967,6 @@ id=ID allowReload=Allow reload compress=Compress compressTooltip=Use only if exporting server instance is at least\nrunning with commit 0fbf6071dea125bec4a56dee55d61c99def4a62e. -queryRunner=Query Runner rerunQueryAfterRefresh=Rerun query after refresh refreshIntervalMustntBeEmpty=Refresh interval mustn''t be empty selectionTables=Selection Tables @@ -1064,12 +1051,7 @@ TWATooltip=The angle between the competitors direction and the wind TWA=True Wind Angle showBoatClassChartsLabel=You can also view the overall diagram for the available boat classes. showDiagram=Show Diagram -runAutomaticallyTooltip=Run the query automatically, after you changed e.g. the statistic or the grouping. rerunQueryAfterRefreshTooltip=Reruns the query after the tables have been refreshed. -queryDefinitionProvider=Query Definition Provider -statisticProvider=Statistic Provider -calculateThe=Calculate the -groupingProvider=Grouping Provider releaseNotes=News and Release History hasSplitFleetContiguousScoring=Split fleets scored contiguously addRaceLogTracker=Add RaceLog Tracker @@ -1227,7 +1209,6 @@ showAll=Show all raceVisibilityColumn=Visibility enterCarryValueFor=Enter carried points for competitor {0} advanced=Advanced -basedOn=based on retrieveWith=Retrieve with mappingDetails=Mapping Details deviceMappingQrCodeExplanation=If you are using the Tracking App, you can add the device mapping also by selecting a competitor/mark, setting the from and to times, and then scanning this QRCode. @@ -1306,7 +1287,6 @@ showCompetitorFullNameColumn=Competitor Full Name alwaysShowCompetitorNationalityColumn=Always show competitor nationality alwaysShowCompetitorNationalityColumnTooltip=Show both, nationality flags as well as competitor images if available loadingDimensionValues=Loading dimension values -runningQuery=Running Query inviteBuoyTenders=Invite Buoy Tenders orMultipleEmails=or multiple E-Mails separated by comma courseOverGroundTrueDegreesTooltip=True course over ground in degrees @@ -1314,10 +1294,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=Distance (w/ Gate Start) distanceTraveledIncludingGateStartTooltip=The distance traveled from the leg start to the end\nor to the current time point, if the leg isn''t finished.\nIf the leg includes a gate start, the distance from the pin end to the starting position is included\nto make competitors comparable even when started at different times. raceDistanceTraveledIncludingGateStartTooltip=The distance traveled from the race start to the end\nor to the current time point, if the race isn''t finished. For a gate start, the distance from the pin end to the starting position is included\nto make competitors comparable even when started at different times. -groupName=Group Name -valueAscending=Value (Ascending) -valueDescending=Value (Descending) -sortBy=Sort by dashboardHeader=Dashboard dashboardNoWindBotAvailableHeader=Wind Bot is not available. dashboardNoWindBotAvailableMessage=To receive live wind data from wind measurement units, ensure that the wind bot is switched on and connected to the SAP Sailing Analytics. @@ -1353,15 +1329,12 @@ dashboardRCBoat = RC Boat fixedMarkPassing=(fixed) suppressedMarkPassing=(suppressed) windUp=Wind-Up (show wind from top of map) -currentFilterSelection=Current filter selection notCapableOfGeneratingACodeForIdentifier=I''m not capable of generating a code for this identifier. serverUrl=Server URL rotatedFromTrueNorth=Rotated {0} degrees from true north. clickToToggleWindUp=Tap/click to toggle between wind-up and north-up map display clickToToggleWindStreamlets=Tap/click to show or hide the wind streamlets startLineToFirstMarkTriangle=Start to first mark ({0}m) -dataMiningComponentsHaveBeenUpdated=The Data-Mining components have been updated -dataMiningComponentsNeedReloadDialogMessage=Click Reload to reload the components now. This will discard the current displayed data and run a default query.\nClick Close to do nothing. The Data-Mining won''t work correctly, until the components have been reloaded. noDataForEvent=There isn''t any data for the event yet. countriesCount={0,number} countries countriesCount[one]={0,number} country @@ -1459,14 +1432,7 @@ noFinishedRaces=There are no finished races yet racesOverview=Races overview listFormatLabel=List format competitionFormatLabel=Competition format -runAQuery=Run a Query latestRegattaStandings=Latest Regatta Standings -plainText=Plain Text -columnChart=Column Chart -columnChartWithErrorBars=Column Chart with Error Bars -choosePresentation=Choose Presentation -cantDisplayDataOfType=Can''t display data of type {0} -shownDecimals=Shown Decimals openFullscreenView=Open fullscreen view closeFullscreenView=Close fullscreen view videosCount={0,number} videos @@ -1476,14 +1442,8 @@ photosCount[one]={0,number} photo eventsHaveTakenPlace={0} events have taken place eventsHaveTakenPlace[one]= One event has taken place raceOffice=Race Office -dataMiningSettings=Data Mining Settings -multiResultsPresenter=Multi Results Presenter -plainResultsPresenter=Plain Results Presenter -resultsChart=Results Chart -tabbedResultsPresenter=Tabbed Results Presenter polarResultsPresenter=Polar Results Presenter maneuverSpeedDetailsResultsPresenter=Maneuver Speed Details Results Presenter -dataMiningRetrieval=Data Retrieval actionWatch=Watch actionAnalyze=Analyze denoteAllRacesForRaceLogTrackingShorctut=Shortcut to denote all races for racelog tracking @@ -1499,24 +1459,8 @@ defaultName=Default exampleTextForName=Your name looks like: flightsCount={0,number} flights flightsCount[one]={0,number} flight -viewQueryDefinition=View Query Definition -queryDefinitionViewer=Query Definition Viewer -groupAverageAscending=Group Average (Ascending) -groupAverageDescending=Group Average (Descending) -groupMedianAscending=Group Median (Ascending) -groupMedianDescending=Group Median (Descending) resultsFoundForSearch= {0,number} results found for ''{1}'' resultsFoundForSearch[one]= {0,number} result found for ''{1}'' -runPredefinedQuery=Run Predefined Query -selectPredefinedQuery=Select Predefined Query -predefinedQueryRunner=Predefined Query Runner -developerOptions=Developer Options -copyToClipboard=Copy to Clipboard -code=Code -useClassGetName=Use Class.getName() for type names -useClassGetNameTooltip=More robust against changes in the code base, but the code snippet can only be used in the scope where the classes are available. -useStringLiterals=Use string literals for type names -useStringLiteralsTooltip=The code snippet can be used anywhere, but it will break if the code base changes. errorLoadingDataWithTryAgain=Error loading data. Trying again in a few moments. addGalleryPhoto=Add gallery photo addStageImage=Add stage image @@ -1815,12 +1759,6 @@ eventRegattaHeaderLegendGpsNo=No tracking data eventRegattaHeaderLegendWindNo=No wind data eventRegattaHeaderLegendVideoNo=No video streams eventRegattaHeaderLegendAudioNo=No audio streams -angleInDegree=Angle in degree -angleInRadian=Angle in radian -centralAngleInRadian=Central angle in radian -centralAngleInDegree=Central angle in degree -floatNumber=Float -integer=Integer appendResult=Append result sampleColor=Color Sample leaderboardPage=LeaderboardPage @@ -1873,7 +1811,6 @@ errorFetchingDimensionData=Error fetching the dimension values of {0} : {1} errorFetchingStatistics=Error fetching the available statistics from the server: {0} errorFetchingAggregators=Error fetching the available aggregators from the server: {0} errorLoadingDataRetrieverChainDefinitions=Error retrieving the available DataRetrieverChainDefinitions: {0} -errorFetchingComponentsChangedTimepoint=Error fetching components changed timepoint from the server: {0} errorRunningQuery=Error running Query: {0} errorReadingWindFixes=Error reading windfixes {0} errorAddingWindFixForRace=Error adding a wind fix for race {0}: {1} @@ -1947,11 +1884,6 @@ minimumRideHeightInMetersTooltip=The minimum ride height in meters required for minimumDurationBetweenAdjacentFoilingSegmentsInSeconds=Minimum duration between adjacent foiling segments (s) minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip=If not empty and the time between two adjacent foiling segments is less than this, those adjacent foiling segments will be merged into one. needToProvideValidMinimumRideHeight=You need to provide a valid minimum ride height value in meters. -dataMiningErrorMargins=Error Margins -elements={0} elements -chooseDifferentDimensionTitle=Choose different dimension -chooseDifferentDimensionMessage=Choose a different dimension for grouping results -pleaseSelectADimension=Please select a dimension currentPortDaggerboardRake=Port db rake currentPortDaggerboardRakeTooltip=The current port daggerboard rake currentStbdDaggerboardRake=Stb db rake diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index f48504936f4..49b8e63b547 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -876,12 +876,9 @@ legType=Art des Schenkels sailID=Segelnummer seriesLeaderboard=Rangliste der Serie regattaLeaderboards=Ranglisten der Regatta -clearSelection=Auswahl leeren running=Läuft -runAsSubstantive=Durchlauf done=Fertig lastFinished=Zuletzt fertig -run=Ausführen times=mal dataAmount=Anzahl der Daten averageCleanedServerTime=\u2205 Bereinigte Server-Zeit @@ -905,12 +902,8 @@ selectSheet=Diagramm selektieren cleanedServerTime=Bereinigte Server-Zeit overallTime=Gesamt-Zeit cleanedOverallTime=Bereinigte Gesamt-Zeit -dataMiningResult=Data Mining Ergebnis -groupBy=Gruppieren nach statisticToCalculate=Berechne Kennzahl -queryResultsChartSubtitle=Es wurden {0} Datensätze in {1} Sekunden verarbeitet noQuerySelected=Keine Abfrage ausgewählt -runAutomatically=Automatisch ausführen windImport_Upload=Abschicken windImport_Title=Expedition Wind Import windImport_BoatId=Boot Id: @@ -939,14 +932,9 @@ raceTimeTooltip=Die für dieses Rennen benötigte Zeit, beginnend mit dem Passie raceTimeDownwindTooltip=Die in diesem Rennen auf Vorwind gesegelte Zeit raceTimeReachingTooltip=Die in diesem Rennen auf Holeschlage gesegelte Zeit raceTimeUpwindTooltip=Die in diesem Rennen auf der Kreuz gesegelte Zeit -noStatisticSelectedError=Keine zu berechnende Kennzahl ausgewählt ist noCustomGrouperScriptTextError=Das Grouper-Skript leer ist -noDimensionToGroupBySelectedError=Keine Gruppierungs-Dimension ausgewählt ist noGrouperSelectedError=Kein Gruppierungs-Typ ausgewählt ist -noDataRetrieverChainDefinitonSelectedError=Kein Datenbeschaffer ausgewählt ist -queryNotValidBecause=Keine Datenabfrage möglich, da dataMining=Data Mining -errorRunningDataMiningQuery=Es ist ein Felher bei der Datenabfrage aufgetreten hideToolbar=Toolbar ausblenden showSeriesLeaderboards=Ranglisten der Serie anzeigen showOverallLeaderboard=Gesamtrangliste anzeigen @@ -969,7 +957,6 @@ allowReload=Aktualisierung ermöglichen raceTimeUpwindTooltip=Diw in diesem Rennen auf Kreuz gesegelte Zeit compress=Komprimieren compressTooltip=Nur nutzbar ab commit 0fbf6071dea125bec4a56dee55d61c99def4a62e\nauf dem exportierenden Server. -queryRunner=Abfrageverarbeiter rerunQueryAfterRefresh=Wiederhole Abfrage nach Aktualisierung refreshIntervalMustntBeEmpty=Die Wiederholungsrate darf nicht leer sein selectionTables=Selektions-Tabellen @@ -1054,12 +1041,7 @@ TWATooltip=Der Winkel zwischen wahrer Windrichtung und Fahrtrichtung des Teilneh TWA=Winkel zum wahren Wind showBoatClassChartsLabel=Im folgenden können außerdem auch die existierenden Diagramme für die vorhandenen Bootsklassen angezeigt werden. showDiagram=Diagramm anzeigen -runAutomaticallyTooltip=Führe die Anfrage automatisch durch, wenn zum Beispiel die Statistik oder die Gruppierung geändert wurde. rerunQueryAfterRefreshTooltip=Wiederholt die Anfrage nachdem die Tabellen aktualisiert wurden. -queryDefinitionProvider=Anfragen-Definitions-Versorger -statisticProvider=Statistik-Versorger -calculateThe=Berechne die -groupingProvider=Gruppierungs-Versorger releaseNotes=Neuigkeiten und Änderungshistorie hasSplitFleetContiguousScoring=Gruppen durchgängig bepunkten addRaceLogTracker=RaceLog Tracker hinzufügen @@ -1291,7 +1273,6 @@ showCompetitorFullNameColumn=Vollständigen Teilnehmernamen anzeigen alwaysShowCompetitorNationalityColumn=Immer Nationalität des Teilnehmers anzeigen alwaysShowCompetitorNationalityColumnTooltip=Sowohl Nationalität des Teilnehmers als auch Teilnehmerbild anzeigen, sofern beides verfügbar ist loadingDimensionValues=Lade Dimensionswerte -runningQuery=Datenabfrage läuft inviteBuoyTenders=Tonnenleger einladen orMultipleEmails=oder mehrere E-Mails (Komma-separiert) courseOverGroundTrueDegreesTooltip=Rechtweisender Kurs über Grund in Grad @@ -1299,10 +1280,6 @@ courseOverGroundTrueDegrees=KüG distanceIncludingGateStartInMeters=Distanz (m. Torstart) distanceTraveledIncludingGateStartTooltip=Die zurückgelegt Strecke vom Start des Schenkels bis zum Ende\noder bis zum aktuellen Zeitpunkt, falls der Schenkel noch nicht beendet ist.\nEnthält der Schenkel einen Torstart, so wird die Distanz vom Pin End bis zur Startposition des Teilnehmers hinzugezählt,\num so vergleichbare Distanzen auch für Teilneher zu erhalten, die zu verschiedenen Zeiten gestartet sind. raceDistanceTraveledIncludingGateStartTooltip=Die zurückgelegte Strecke vom Start des Rennens, bis zum Ende\noder bis zum aktuellen Zeitpunkt, falls das Rennen noch nicht beendet ist. Bei einem Torstart wird die Distanz vom Pin End bis zur Startposition des Teilnehmers hinzugezählt,\num so vergleichbare Distanzen auch für Teilneher zu erhalten, die zu verschiedenen Zeiten gestartet sind. -groupName=Gruppename -valueAscending=Wert (Aufsteigend) -valueDescending=Wert (Absteigend) -sortBy=Sortiert nach dashboardHeader=Dashboard dashboardNoWindBotAvailableHeader=Wind Bot nicht verfügbar. dashboardNoWindBotAvailableMessage=Um live Daten von Wind Messgeräten zu empfangen, muss der Wind Bot mit der SAP Sailing Analytics verknüpft sein. @@ -1338,15 +1315,12 @@ dashboardRCBoat=Startboot fixedMarkPassing=(fest) suppressedMarkPassing=(unterdrückt) windUp=Wind von oben anzeigen -currentFilterSelection=Aktuelle Filter-Selektion notCapableOfGeneratingACodeForIdentifier=Für diesen Identifier kann kein Barcode generiert werden. serverUrl=Server URL rotatedFromTrueNorth={0}° gegenüber rechtweisend Nord rotiert. clickToToggleWindUp=Klick wechselt zwischen Kartenanzeige "Wind oben" und "Nord oben" clickToToggleWindStreamlets=Klick wechselt der Anzeige der Windstreamlets startLineToFirstMarkTriangle=Vom Start zur nächsten Bahnmarke ({0}m) -dataMiningComponentsHaveBeenUpdated=Die Data-Mining Komponenten wurden aktualisiert -dataMiningComponentsNeedReloadDialogMessage=Klicke auf Neu Laden, um die Komponenten jetzt neu zu laden. Die aktuell angezeigten Daten gehen dabei verloren und eine Standard-Query wird ausgeführt.\nKlicke auf Schließen, um nichts zu tun. Das Data-Mining wird nicht korrekt funktionieren, bis die Komponenten neu geladen wurden. noDataForEvent=Es existieren noch keine Daten für dieses Event. countriesCount={0,number} Länder countriesCount[one]={0,number} Land @@ -1443,14 +1417,7 @@ noFinishedRaces=Es wurden noch keine Wettfahrten beendet. racesOverview=Wettfahrtübersicht listFormatLabel=Listenansicht competitionFormatLabel=Wettbewerbsansicht -runAQuery=Führe eine Anfrage aus latestRegattaStandings=Aktuelle Plazierungen -plainText=Einfacher Text -columnChart=Säulendiagramm -columnChartWithErrorBars=Säulendiagramm mit Fehlerbalken -choosePresentation=Wähle Präsentation -cantDisplayDataOfType=Daten des Typs {0} können nicht dargestellt werden -shownDecimals=Angezeigte Nachkommastellen openFullscreenView=Vollbildansicht öffnen closeFullscreenView=Vollbildansicht schließen videosCount={0,number} Videos @@ -1460,14 +1427,8 @@ photosCount[one]={0,number} Bild eventsHaveTakenPlace={0} Veranstaltungen haben stattgefunden eventsHaveTakenPlace[one]= Eine Veranstaltung hat stattgefunden raceOffice=Wettfahrtleitung -dataMiningSettings=Data Mining Einstellungen -multiResultsPresenter=Multi Ergebnis-Darsteller -plainResultsPresenter=Einfacher Ergebnis-Darsteller -resultsChart=Ergebnis-Diagramm -tabbedResultsPresenter=Tab Ergebnis-Darsteller polarResultsPresenter=Polar Ergebnis-Darsteller maneuverSpeedDetailsResultsPresenter=Manöver Geschwindigkeitsdetails Ergebnis-Darsteller -dataMiningRetrieval=Datenbeschaffung actionWatch=Verfolgen actionAnalyze=Analysieren denoteAllRacesForRaceLogTrackingShorctut=Alle rennen für racelog tracking markieren @@ -1483,24 +1444,8 @@ defaultName=Standard exampleTextForName=Namen werden in dieser Form erstellt: flightsCount={0,number} Läufe flightsCount[one]={0,number} Lauf -viewQueryDefinition=Query Definition anzeigen -queryDefinitionViewer=Query Definition Anzeiger -groupAverageAscending=Gruppe Durchschnitt (Aufsteigend) -groupAverageDescending=Gruppe Durchschnitt (Absteigend) -groupMedianAscending=Gruppe Median (Aufsteigend) -groupMedianDescending=Gruppe Median (Absteigend) resultsFoundForSearch= {0,number} Ergebnisse gefunden für ''{1}'' resultsFoundForSearch[one]= {0,number} Ergebnis gefunden für ''{1}'' -runPredefinedQuery=Vordefinierte Abfrage ausführen -selectPredefinedQuery=Vordefinierte Abfrage auswählen -predefinedQueryRunner=Vordefinierte Abfrageverarbeiter -developerOptions=Entwickleroptionen -copyToClipboard=In die Zwischenablage kopieren -code=Code -useClassGetName=Verwende Class.getName() für Typnamen -useClassGetNameTooltip=Robuster gegnüber Änderungen im Code, aber der Code Snippet kann nur in dem Scope verwendet werden in dem die Klassen verfügbar sind. -useStringLiterals=Verwende String-Literale für Typnamen -useStringLiteralsTooltip=Der Code Snippet kann überall verwendet werden, wird aber nicht mehr funktionieren, wenn sich der Code ändert. errorLoadingDataWithTryAgain=Ladefehler - ein neuer Versuch erfolgt in wenigen Augenblicken. addGalleryPhoto=Galeriebild hinzufügen addStageImage=Startseiten-Bild hinzufügen @@ -1801,12 +1746,6 @@ eventRegattaHeaderLegendGpsNo=Keine Trackinginformationen eventRegattaHeaderLegendWindNo=Keine Winddaten eventRegattaHeaderLegendVideoNo=Keine Videostreams eventRegattaHeaderLegendAudioNo=Keine Audiostreams -angleInDegree=Winkel in Grad -angleInRadian=Winkel in Radiant -centralAngleInRadian=Kreiswinkel in Radiant -centralAngleInDegree=Kreiswinkel in Grad -floatNumber=Gleitkommazahl -integer=Ganzzahl appendResult=Ergebnis anhängen sampleColor=Farbbeispiel leaderboardPage=Ranglisten-Seite @@ -1851,7 +1790,6 @@ errorFetchingDimensionData=Fehler beim Laden der Dimension von {0} {1} errorFetchingStatistics=Fehler beim Laden der verfügbaren Statistiken: {0} errorFetchingAggregators=Fehler beim Laden der verfügbaren Aggregatoren vom Server: {0} errorLoadingDataRetrieverChainDefinitions=Error retrieving the available DataRetrieverChainDefinitions: {0} -errorFetchingComponentsChangedTimepoint=Error fetching components changed timepoint from the server: {0} errorRunningQuery=Fehler beim Query ausführen: {0} errorReadingWindFixes=Fehler beim lesen der WindFixes {0} errorAddingWindFixForRace=Fehler beim Hinzufügen eines Windfixes {0}: {1} @@ -1887,7 +1825,6 @@ firstRaceIsNonDiscardableCarryForward=Started mit nicht streichbarem Übertrag couldNotFindRaceInRegatta=Konnte ein Rennen mit den Namen {0} für die Regatta mit den Namen {1} nicht finden confidence=Konfidenz boatSpeed=Bootsgeschwindigkeit -basedOn=basierend auf asLink=Als Link algorithmTimeOutText=ausserhalb der Limits activeFilters=Aktive Filter: {0} @@ -1954,12 +1891,7 @@ minimumRideHeightInMetersTooltip=Die minimale Foiling-Höhe, die laut Sensor err minimumDurationBetweenAdjacentFoilingSegmentsInSeconds=Mindestabstand zweier benachbarter Foiling-Abschnitte (s) minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip=Fall gesetzt, werden zwei benachbarte Foiling-Abschnitte miteinander verschmolzen, falls ihr zeitlicher Abstand weniger als dieser Wert in Sekunden beträgt. needToProvideValidMinimumRideHeight=Es muss ein gültiger Wert für die minimale Foiling-Höhe in Metern angegeben werden. -dataMiningErrorMargins=Fehlerintervall -elements={0} Elemente -chooseDifferentDimensionTitle=Andere Dimension auswählen -chooseDifferentDimensionMessage=Zum Gruppieren eine andere Dimension auswählen mainCurveAnalysis=Nur Hauptkurve untersuchen -pleaseSelectADimension=Bitte eine Dimension auswählen finishingTime=Zieleinlaufzeit finishTimeString=Endzeitpunkt setFinishingAndFinishTime=Setzte Zieleinlaufzeit und Endzeitpunkt diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties index 753bbe63d7f..d30deae53d2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties @@ -874,12 +874,9 @@ legType=Tipo de tramo sailID=Número de vela seriesLeaderboard=Tabla de clasificación de serie regattaLeaderboards=Clasificaciones de regata -clearSelection=Borrar selección running=En ejecución -runAsSubstantive=Ejecutar done=Hecho lastFinished=Último que ha terminado -run=Ejecutar times=tiempos dataAmount=Cantidad de datos averageCleanedServerTime=∅ Tiempo de servidor limpio @@ -903,12 +900,8 @@ selectSheet=Seleccionar hoja cleanedServerTime=Tiempo de servidor limpio overallTime=Tiempo total cleanedOverallTime=Tiempo global limpio -dataMiningResult=Resultado de minería de datos -groupBy=Agrupar por statisticToCalculate=Calcular estadística -queryResultsChartSubtitle=Se ha trabajado en {0} entradas de datos en {1} segundos noQuerySelected=Ninguna consulta seleccionada -runAutomatically=Ejecutar automáticamente windImport_Upload=Cargar windImport_Title=Importar viento desde expedición windImport_BoatId=ID de embarcación: @@ -938,14 +931,9 @@ raceTimeTooltip=Tiempo total recorrido en esta carrera, se empieza a medir cuand raceTimeDownwindTooltip=Tiempo total de empopada recorrido en esta carrera raceTimeReachingTooltip=Tiempo total de alcance recorrido en esta carrera raceTimeUpwindTooltip=Tiempo total de ceñida recorrido en esta carrera -noStatisticSelectedError=No se ha seleccionado ninguna estadística para calcular noCustomGrouperScriptTextError=El script de grupo está vacío -noDimensionToGroupBySelectedError=No se ha seleccionado ninguna dimensión para agrupar noGrouperSelectedError=No se ha seleccionado ningún tipo de agrupador -noDataRetrieverChainDefinitonSelectedError=No se ha seleccionado ningún recuperador de datos -queryNotValidBecause=No se puede hacer ninguna consulta porque dataMining=Minería de datos -errorRunningDataMiningQuery=Se ha producido un error al ejecutar la consulta hideToolbar=Ocultar barra de herramientas showSeriesLeaderboards=Mostrar tablas de clasificación de las series showOverallLeaderboard=Mostrar tabla de clasificación general @@ -965,7 +953,6 @@ id=ID allowReload=Permitir recarga compress=Comprimir compressTooltip=Utilizar solamente si la instancia del servidor de exportación funciona al menos con la confirmación 0fbf6071dea125bec4a56dee55d61c99def4a62e. -queryRunner=Ejecutor de la consulta rerunQueryAfterRefresh=Volver a ejecutar la consulta después de actualizar refreshIntervalMustntBeEmpty=El intervalo de actualización no debe estar en blanco selectionTables=Tablas de selección @@ -1050,12 +1037,7 @@ TWATooltip=Ángulo entre la dirección de los competidores y el viento TWA=Ángulo real del viento showBoatClassChartsLabel=También puede visualizar el diagrama global para las clases de embarcación disponibles. showDiagram=Mostrar diagrama -runAutomaticallyTooltip=Ejecute la consulta automáticamente después de modificar, por ejemplo, la estadística o la agrupación. rerunQueryAfterRefreshTooltip=Vuelve a ejecutar la consulta después de que se hayan refrescado las tablas. -queryDefinitionProvider=Proveedor de definición de consultas -statisticProvider=Proveedor de estadísticas -calculateThe=Calcular -groupingProvider=Proveedor de agrupación releaseNotes=Historial de noticias y lanzamientos hasSplitFleetContiguousScoring=Dividir flotas puntuadas de forma contigua addRaceLogTracker=Añadir rastreador de registro de carrera @@ -1207,7 +1189,6 @@ showAll=Mostrar todo raceVisibilityColumn=Visibilidad enterCarryValueFor=Introducir puntos acumulados para el competidor {0} advanced=Avanzado -basedOn=Basado en retrieveWith=Recuperar con mappingDetails=Detalles de asignación deviceMappingQrCodeExplanation=Si utiliza la aplicación de rastreo, también puede añadir la asignación de dispositivos seleccionando un competidor/marca, definiendo las fechas de inicio y fin y escaneando este código QR @@ -1283,7 +1264,6 @@ showCompetitorFullNameColumn=Nombre completo del competidor alwaysShowCompetitorNationalityColumn=Siempre muestra la nacionalidad del competidor alwaysShowCompetitorNationalityColumnTooltip=Muestra ambos, las banderas de país así como las imágenes de competidor, si están disponibles. loadingDimensionValues=Cargando valores de dimensión -runningQuery=Ejecutando consulta inviteBuoyTenders=Invitar a balizadores orMultipleEmails=o varios correos electrónicos separados por una coma courseOverGroundTrueDegreesTooltip=Regata sobre el fondo (Course Over Ground) en grados @@ -1291,10 +1271,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=Distancia (con inicio de puerta de salida) distanceTraveledIncludingGateStartTooltip=Distancia recorrida desde el inicio hasta el final del tramo\o hasta la fecha y hora actual si no se ha acabado el tramo.\nSi el tramo incluye un inicio de puerta de salida, la distancia desde el extremo hasta la posición inicial se incluye\n para que puedan compararse los competidores aunque hayan empezado en tiempos diferentes. raceDistanceTraveledIncludingGateStartTooltip=Distancia recorrida desde el inicio hasta el final de la carrera\o hasta la fecha y hora actual si no se ha acabado la carrera. Para el inicio de la puerta de salida, la distancia desde el extremo hasta la posición inicial se incluye\n para que puedan compararse los competidores aunque hayan empezado en tiempos diferentes. -groupName=Nombre de grupo -valueAscending=Valor (ascendente) -valueDescending=Valor (descendente) -sortBy=Ordenado por dashboardHeader=Dashboard dashboardNoWindBotAvailableHeader=Wind Bot no está disponible dashboardNoWindBotAvailableMessage=Para obtener los datos de viento en directo a partir de unidades de medida de viento, asegúrese de que Wind Bot está activado y contectado con SAP Sailing Analytics. @@ -1330,15 +1306,12 @@ dashboardRCBoat=Barco RC fixedMarkPassing=(fijado) suppressedMarkPassing=(suprimido) windUp=Viento al norte (mostrar viento de la parte superior del mapa) -currentFilterSelection=Seleccion de filtro actual notCapableOfGeneratingACodeForIdentifier=No sé generar un código para este identificador. serverUrl=URL del servidor rotatedFromTrueNorth=Ha rotado {0} grados desde el norte real. clickToToggleWindUp=Golpe/clic para alternar entre visualización mapa viento al norte y norte arriba clickToToggleWindStreamlets=Golpe/clic para mostrar u ocultar corrientes de viento startLineToFirstMarkTriangle=Inicio a la primera marca ({0} m) -dataMiningComponentsHaveBeenUpdated=Los componentes de minería de datos se han actualizado -dataMiningComponentsNeedReloadDialogMessage=Pulse Recargar para volver a cargar los componentes ahora. De este modo, se descartarán los datos visualizados en ese momento y se ejecutará una consulta por defecto.\nHaga clic en «Cerrar» para no hacer nada. La minería de datos no funcionará correctamente hasta que se hayan vuelto a cargar los componentes. noDataForEvent=Todavía no hay datos para el evento. countriesCount={0,number} países countriesCount[one]={0,number} país @@ -1436,14 +1409,7 @@ noFinishedRaces=Todavía no ha finalizado ninguna carrera racesOverview=Resumen de carreras listFormatLabel=Formato de lista competitionFormatLabel=Formato de competición -runAQuery=Realice una consulta latestRegattaStandings=Últimas posiciones de la regata -plainText=Texto sin formato -columnChart=Gráfico de columnas -columnChartWithErrorBars=Gráfico de columnas con barras de error -choosePresentation=Seleccionar presentación -cantDisplayDataOfType=No se pueden mostrar datos del tipo {0} -shownDecimals=Decimales mostrados openFullscreenView=Abrir vista de pantalla completa closeFullscreenView=Cerrar vista de pantalla completa videosCount={0,number} vídeos @@ -1453,14 +1419,8 @@ photosCount[one]={0,number} foto eventsHaveTakenPlace=Han tenido lugar {0} eventos eventsHaveTakenPlace[one]=Ha tenido lugar un evento raceOffice=Oficina de carrera -dataMiningSettings=Opciones de minería de datos -multiResultsPresenter=Presentador de resultados múltiples -plainResultsPresenter=Presentador de resultados simples -resultsChart=Gráfico de resultados -tabbedResultsPresenter=Presentador de resultados por pestañas polarResultsPresenter=Presentador de resultados de coordenadas polares maneuverSpeedDetailsResultsPresenter=Presentador de resultados detallados de velocidad de maniobra -dataMiningRetrieval=Recuperación de datos actionWatch=Observar actionAnalyze=Analizar denoteAllRacesForRaceLogTrackingShorctut=Acceso directo para indicar todas las carreras para un rastreo de registro de carrera @@ -1475,24 +1435,8 @@ defaultName=Por defecto exampleTextForName=Su nombre aparece como: flightsCount={0,number} flights flightsCount[one]={0,number} flight -viewQueryDefinition=Ver definición de consulta -queryDefinitionViewer=Visor de definición de consulta -groupAverageAscending=Promedio de grupo (ascendente) -groupAverageDescending=Promedio de grupo (descendente) -groupMedianAscending=Mediana de grupo (ascendente) -groupMedianDescending=Mediana de grupo (descendente) resultsFoundForSearch={0,number} resultados encontrados para ''''{1}'''' resultsFoundForSearch[one]={0,number} resultado encontrado para ''''{1}'''' -runPredefinedQuery=Ejecutar consulta predefinida -selectPredefinedQuery=Seleccionar consulta predefinida -predefinedQueryRunner=Programa de ejecución de consulta predefinida -developerOptions=Opciones de desarrollador -copyToClipboard=Copiar a portapapeles -code=Código -useClassGetName=Utilizar Class.getName() para nombres de tipo -useClassGetNameTooltip=Más resistente frente a modificaciones en la base de código, pero el fragmento de código se puede utilizar solamente en el ámbito donde estén disponibles las clases. -useStringLiterals=Utilizar literales de cadena para los nombres de tipo -useStringLiteralsTooltip=El fragmento de código puede utilizarse en todas las ubicaciones, pero se romperá si se modifica la base de código. errorLoadingDataWithTryAgain=Error al cargar los datos. Inténtelo de nuevo más tarde. addGalleryPhoto=Añadir foto de galería addStageImage=Añadir imagen de etapa @@ -1789,12 +1733,6 @@ eventRegattaHeaderLegendGpsNo=No hay datos de rastreo eventRegattaHeaderLegendWindNo=No hay datos de viento eventRegattaHeaderLegendVideoNo=No hay transmisiones de vídeo eventRegattaHeaderLegendAudioNo=No hay transmisiones de audio -angleInDegree=Ángulo en grado -angleInRadian=Ángulo en radián -centralAngleInRadian=Ángulo central en radián -centralAngleInDegree=Ángulo central en grado -floatNumber=Flotador -integer=Entero sampleColor=Muestra de color leaderboardPage=Página de clasificación showLiveNow=Mostrar "En directo ahora" @@ -1845,7 +1783,6 @@ errorFetchingDimensionData=Error al obtener los valores de dimensión de {0} : { errorFetchingStatistics=Error al obtener las estadísticas disponibles desde el servidor: {0} errorFetchingAggregators=Error al obtener los agregadores disponibles desde el servidor: {0} errorLoadingDataRetrieverChainDefinitions=Error al recuperar las DataRetrieverChainDefinitions disponibles: {0} -errorFetchingComponentsChangedTimepoint=Error al obtener la fecha modificada de los componentes a partir del servidor: {0} errorRunningQuery=Error al ejecutar la consulta: {0} errorReadingWindFixes=Error al leer las correcciones de viento {0} errorAddingWindFixForRace=Error al añadir una corrección de viento para la carrera {0}: {1} @@ -1913,11 +1850,6 @@ minimumRideHeightInMetersTooltip=La altura de marcha mínima en metros requerida minimumDurationBetweenAdjacentFoilingSegmentsInSeconds=Duración mínima entre apéndice(s) de foil minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip=Si no está en blanco y el tiempo entre dos apéndices de foil adyacentes es inferior, aquellos apéndices de foil adyacentes se fusionarán en uno solo. needToProvideValidMinimumRideHeight=Requiere proporcionar un valor de altura de marcha mínimo válido en metros. -dataMiningErrorMargins=Márgenes de error -elements={0} elementos -chooseDifferentDimensionTitle=Seleccione una dimensión diferente -chooseDifferentDimensionMessage=Seleccione una dimensión diferente para agrupar resultados -pleaseSelectADimension=Seleccione una dimensión currentPortDaggerboardRake=Inclinación de la orza de babor currentPortDaggerboardRakeTooltip=La inclinación actual de la orza de babor currentStbdDaggerboardRake=Inclinación de la orza de estribor diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties index 05f1a93fb47..5a031d7c703 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties @@ -874,12 +874,9 @@ legType=Type de portion de parcours sailID=Numéro de voile seriesLeaderboard=Palmarès de la série regattaLeaderboards=Palmarès de la régate -clearSelection=Effacer la sélection running=En cours d''exécution -runAsSubstantive=Exécuter done=Terminé lastFinished=Fin de dernière exécution -run=Exécuter times=durées dataAmount=Volume de données averageCleanedServerTime=∅ Durée de nettoyage du serveur @@ -903,12 +900,8 @@ selectSheet=Sélectionner fiche cleanedServerTime=Durée de nettoyage du serveur overallTime=Durée globale cleanedOverallTime=Durée globale de nettoyage -dataMiningResult=Résultat d''exploration de données -groupBy=Regrouper par statisticToCalculate=Calculer statistiques -queryResultsChartSubtitle={0} entrées de données analysées en {1} secondes noQuerySelected=Aucune requête sélectionnée -runAutomatically=Exécuter automatiquement windImport_Upload=Charger windImport_Title=Importer vent à partir de Expedition windImport_BoatId=N° du bateau : @@ -938,14 +931,9 @@ raceTimeTooltip=Durée de navigation totale dans cette course, chronométrée à raceTimeDownwindTooltip=Durée totale de navigation vent arrière dans cette course raceTimeReachingTooltip=Durée totale de navigation jusqu''à l''arrivée dans cette course raceTimeUpwindTooltip=Durée totale de navigation dans le lit du vent dans cette course -noStatisticSelectedError=Aucune statistique à calculer sélectionnée noCustomGrouperScriptTextError=Script de regroupement vide -noDimensionToGroupBySelectedError=Aucune dimension sélectionnée pour le regroupement noGrouperSelectedError=Aucun type de regroupement sélectionné -noDataRetrieverChainDefinitonSelectedError=Aucun récupérateur de données sélectionné -queryNotValidBecause=Aucune requête possible dû à dataMining=Exploration de données -errorRunningDataMiningQuery=Une erreur s''est produite lors de l''exécution de la requête. hideToolbar=Masquer barre d''outils showSeriesLeaderboards=Afficher palmarès de la série showOverallLeaderboard=Afficher palmarès général @@ -965,7 +953,6 @@ id=ID allowReload=Autoriser rechargement compress=Comprimer compressTooltip=Utiliser seulement si l''instance de serveur d''exportation \ns''exécute au moins avec le commit 0fbf6071dea125bec4a56dee55d61c99def4a62e. -queryRunner=Outil d''exécution de requêtes rerunQueryAfterRefresh=Exécuter la requête de nouveau après l''actualisation refreshIntervalMustntBeEmpty=L''intervalle d''actualisation ne doit pas être vide. selectionTables=Tables de sélection @@ -1050,12 +1037,7 @@ TWATooltip=L''angle entre la direction du concurrent et le vent. TWA=Angle du vent réel showBoatClassChartsLabel=Vous pouvez également afficher le diagramme global pour les catégories de bateau disponibles. showDiagram=Afficher diagramme -runAutomaticallyTooltip=Exécutez la requête automatiquement, par exemple après avoir modifié les statistiques ou le regroupement. rerunQueryAfterRefreshTooltip=Réexécute la requête après l''actualisation des tables. -queryDefinitionProvider=Fournisseur de définitions de requêtes -statisticProvider=Fournisseur de statistiques -calculateThe=Calculer le/la -groupingProvider=Fournisseur de regroupements releaseNotes=Historique de versions et nouveautés hasSplitFleetContiguousScoring=Les flottes divisées ont obtenu des scores contigus. addRaceLogTracker=Ajouter tracker de journal de course @@ -1207,7 +1189,6 @@ showAll=Afficher tout raceVisibilityColumn=Visibilité enterCarryValueFor=Saisissez les points accumulés par le concurrent {0}. advanced=Avancé -basedOn=basé sur retrieveWith=Récupérer avec mappingDetails=Détails du mappage deviceMappingQrCodeExplanation=Si vous utilisez l''application de suivi, vous pouvez également ajouter le mappage de l''appareil en sélectionnant un concurrent/une marque, en définissant des heures de départ et d''arrivée et en scannant ce code QR. @@ -1283,7 +1264,6 @@ showCompetitorFullNameColumn=Nom complet du concurrent alwaysShowCompetitorNationalityColumn=Afficher toujours la nationalité du concurrent alwaysShowCompetitorNationalityColumnTooltip=Si disponibles, afficher les deux : le drapeau national ainsi que l''image du concurrent loadingDimensionValues=Chargement des valeurs de dimension -runningQuery=Requête en cours inviteBuoyTenders=Inviter navire baliseur orMultipleEmails=ou plusieurs adresses e-mails séparées par des virgules courseOverGroundTrueDegreesTooltip=Route fond vraie en degrés @@ -1291,10 +1271,6 @@ courseOverGroundTrueDegrees=Route fond distanceIncludingGateStartInMeters=Distance (si départ au lièvre) distanceTraveledIncludingGateStartTooltip=La distance naviguée du départ de la portion de parcours jusqu''à sa fin\nou jusqu''à l''heure actuelle (si la portion de parcours n''est pas terminée).\nSi la portion de parcours inclut un départ au lièvre, la distance de la bouée de ligne jusqu''à la position de départ est incluse \npour permettre de comparer les concurrents même si leur départ ne s''est pas fait à la même heure. raceDistanceTraveledIncludingGateStartTooltip=La distance naviguée du départ de la course jusqu''à sa fin\nou jusqu''à l''heure actuelle (si la course n''est pas terminée).\nEn cas de départ au lièvre, la distance de la bouée de ligne jusqu''à la position de départ est incluse \npour permettre de comparer les concurrents même si leur départ ne s''est pas fait à la même heure. -groupName=Nom du groupe -valueAscending=Valeur (ascendant) -valueDescending=Valeur (descendant) -sortBy=Trier par dashboardHeader=Tableau de bord dashboardNoWindBotAvailableHeader=Le bot du vent n''est pas disponible. dashboardNoWindBotAvailableMessage=Pour pouvoir recevoir des données de vent depuis des unités de mesure du vent, assurez-vous que le bot du vent est allumé et connecté à SAP Sailing Analytics. @@ -1330,15 +1306,12 @@ dashboardRCBoat=Bateau du comité de course fixedMarkPassing=(fixé) suppressedMarkPassing=(supprimé) windUp=Orienté par rapport au sens du vent (le vent vient du haut de la carte) -currentFilterSelection=Sélection du filtre actuel notCapableOfGeneratingACodeForIdentifier=Je ne suis pas capable de générer un code pour cet identifiant. serverUrl=URL du serveur rotatedFromTrueNorth=Pivoté de {0} degrés à partir du vrai Nord. clickToToggleWindUp=Touchez/Cliquez pour basculer entre l''affichage orienté nord et l''affichage par rapport au sens du vent clickToToggleWindStreamlets=Touchez/cliquez pour afficher ou masquer les couloirs de vent. startLineToFirstMarkTriangle=Distance entre le départ et la première marque ({0} m) -dataMiningComponentsHaveBeenUpdated=Les composants d''exploration de données ont été mis à jour. -dataMiningComponentsNeedReloadDialogMessage=Cliquez sur Recharger pour recharger les composants maintenant. Les données actuellement affichées seront ignorées et une requête par défaut sera exécutée.n\Cliquez sur Fermer pour ne rien faire. L''exploration de données ne fonctionnera pas correctement tant que les composants n''auront pas été rechargés. noDataForEvent=Il n''y a pas encore de données pour cette manifestation. countriesCount={0,number} pays countriesCount[one]={0,number} pays @@ -1436,14 +1409,7 @@ noFinishedRaces=Aucune course terminée pour l''instant. racesOverview=Synthèse des courses listFormatLabel=Format de liste competitionFormatLabel=Format de compétition -runAQuery=Exécuter une requête latestRegattaStandings=Classement de régate le plus récent -plainText=Texte brut -columnChart=Diagramme à colonnes -columnChartWithErrorBars=Diagramme à colonnes avec barres d''erreur -choosePresentation=Sélectionner la présentation -cantDisplayDataOfType=Affichage des données du type {0} impossible -shownDecimals=Nombre de décimales openFullscreenView=Ouvrir le mode Plein écran closeFullscreenView=Fermer le mode Plein écran videosCount={0,number} vidéos @@ -1453,14 +1419,8 @@ photosCount[one]={0,number} photo eventsHaveTakenPlace={0} manifestations ont eu lieu. eventsHaveTakenPlace[one]=Une manifestation a eu lieu. raceOffice=Bureau de course -dataMiningSettings=Options de l''exploration de données -multiResultsPresenter=Visualiseur de résultats multiples -plainResultsPresenter=Visualiseur de résultats bruts -resultsChart=Graphique des résultats -tabbedResultsPresenter=Visualiseur de résultats avec onglets polarResultsPresenter=Visualiseur de résultats polaires maneuverSpeedDetailsResultsPresenter=Visualiseur des résultats : détails sur la vitesse lors de la manœuvre -dataMiningRetrieval=Récupération de données actionWatch=Regarder actionAnalyze=Analyser denoteAllRacesForRaceLogTrackingShorctut=Raccourci pour marquer toutes les courses pour le suivi par journaux de course @@ -1475,24 +1435,8 @@ defaultName=Par défaut exampleTextForName=Votre nom apparaît de la manière suivante : flightsCount={0,number} départs de deux équipages flightsCount[one]={0,number} départ de deux équipages -viewQueryDefinition=Afficher la définition de la requête -queryDefinitionViewer=Visualiseur de définitions de requête -groupAverageAscending=Moyenne du groupe (ascendant) -groupAverageDescending=Moyenne du groupe (descendant) -groupMedianAscending=Médiane du groupe (ascendant) -groupMedianDescending=Médiane du groupe (descendant) resultsFoundForSearch={0,number} résultats trouvés pour "{1}" resultsFoundForSearch[one]={0,number} résultat trouvé pour "{1}" -runPredefinedQuery=Exécuter requête prédéfinie -selectPredefinedQuery=Sélectionner requête prédéfinie -predefinedQueryRunner=Outil d''exécution de requêtes prédéfinies -developerOptions=Options développeur -copyToClipboard=Copier dans le presse-papiers -code=Code -useClassGetName=Utilisez Class.getName() pour les noms des types. -useClassGetNameTooltip=Plus stable face aux modifications dans la base de code, mais le fichier de script peut uniquement être utilisé dans l''étendue où les classes sont disponibles. -useStringLiterals=Utiliser littéraux de chaîne pour les noms de types -useStringLiteralsTooltip=Le fichier de script peut être utilisé partout, mais sera corrompu si la base de code change. errorLoadingDataWithTryAgain=Erreur lors du chargement des données. Nouvel essai dans quelques minutes. addGalleryPhoto=Ajouter photo de la galerie addStageImage=Ajouter image d''étape @@ -1789,12 +1733,6 @@ eventRegattaHeaderLegendGpsNo=Aucune donnée de suivi eventRegattaHeaderLegendWindNo=Aucune donnée de vent eventRegattaHeaderLegendVideoNo=Aucun flux vidéo eventRegattaHeaderLegendAudioNo=Aucun flux audio -angleInDegree=Angle en degrés -angleInRadian=Angle en radians -centralAngleInRadian=Angle au centre en radians -centralAngleInDegree=Angle au centre en degrés -floatNumber=Flottant -integer=Entier sampleColor=Échantillon de couleur leaderboardPage=Page du palmarès showLiveNow=Afficher "En direct" @@ -1845,7 +1783,6 @@ errorFetchingDimensionData=Erreur lors de l''accès aux valeurs de dimension de errorFetchingStatistics=Erreur lors de l''accès aux statistiques disponibles du serveur : {0} errorFetchingAggregators=Erreur lors de l''accès aux agrégateurs disponibles du serveur : {0} errorLoadingDataRetrieverChainDefinitions=Erreur lors de la récupération des définitions DataRetrieverChainDefinitions disponibles : {0} -errorFetchingComponentsChangedTimepoint=Erreur lors de la récupération de l''heure modifiée du composant du serveur : {0} errorRunningQuery=Erreur lors de l''exécution de la requête : {0} errorReadingWindFixes=Erreur lors de la lecture des points vent {0} errorAddingWindFixForRace=Erreur lors de l''ajout d''un point vent pour la course {0} : {1} @@ -1913,11 +1850,6 @@ minimumRideHeightInMetersTooltip=Hauteur de planing minimale requise en mètres minimumDurationBetweenAdjacentFoilingSegmentsInSeconds=Durée minimum (s) entre deux tronçons en planing adjacents minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip=Si cette valeur est renseignée et que la durée entre deux tronçons de planing adjacents est inférieure à celle-ci, ces tronçons de planing adjacents seront combinés en un seul. needToProvideValidMinimumRideHeight=Vous devez fournir une valeur de hauteur de planing minimale valide en mètres. -dataMiningErrorMargins=Marges d''erreur -elements={0} éléments -chooseDifferentDimensionTitle=Sélectionnez une dimension différente. -chooseDifferentDimensionMessage=Sélectionnez une dimension différente pour regrouper les résultats. -pleaseSelectADimension=Sélectionnez une dimension. currentPortDaggerboardRake=Inclinaison de la dérive bâbord currentPortDaggerboardRakeTooltip=Inclinaison actuelle de la dérive bâbord currentStbdDaggerboardRake=Inclinaison de la dérive tribord diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties index b5080b41640..799b8d1cad8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties @@ -877,12 +877,9 @@ legType=レグタイプ sailID=セールナンバー seriesLeaderboard=シリーズリーダーボード regattaLeaderboards=レガッタリーダーボード -clearSelection=選択のクリア running=実行中 -runAsSubstantive=実行 done=実行済 lastFinished=最終フィニッシュ -run=実行 times=回 dataAmount=データ量 averageCleanedServerTime=∅ サーバ時間のクリア @@ -906,12 +903,8 @@ selectSheet=シート選択 cleanedServerTime=サーバ時間のクリア overallTime=全体時間 cleanedOverallTime=全体時間のクリア -dataMiningResult=データマイニング結果 -groupBy=グループキー statisticToCalculate=統計の計算 -queryResultsChartSubtitle={0} データエントリを {1} 秒で処理済 noQuerySelected=クエリ未選択 -runAutomatically=自動的に実行 windImport_Upload=アップロード windImport_Title=Expedition から風をインポート windImport_BoatId=艇 ID: @@ -941,14 +934,9 @@ raceTimeTooltip=競技者がスタート変針点を通過したときに計測 raceTimeDownwindTooltip=このレースでダウンウィンドで移動した合計時間 raceTimeReachingTooltip=このレースでリーチングで移動した合計時間 raceTimeUpwindTooltip=このレースでアップウィンドで移動した合計時間 -noStatisticSelectedError=計算する統計が選択されていません noCustomGrouperScriptTextError=分類スクリプトが空です -noDimensionToGroupBySelectedError=グループ別にする次元が選択されていません noGrouperSelectedError=分類タイプが選択されていません -noDataRetrieverChainDefinitonSelectedError=データリトリーバが選択されていません -queryNotValidBecause=クエリが可能でありません。理由: dataMining=データマイニング -errorRunningDataMiningQuery=クエリ実行でエラーが発生しました hideToolbar=ツールバー非表示 showSeriesLeaderboards=シリーズリーダーボード表示 showOverallLeaderboard=全体リーダーボード表示 @@ -968,7 +956,6 @@ id=ID allowReload=リロード許可 compress=圧縮 compressTooltip=エクスポートサーバインスタンスが少なくとも\nコミット 0fbf6071dea125bec4a56dee55d61c99def4a62e で実行中の場合にのみ使用してください。 -queryRunner=クエリランナー rerunQueryAfterRefresh=リフレッシュ後にクエリを再実行 refreshIntervalMustntBeEmpty=リフレッシュ間隔は空であってはなりません selectionTables=選択テーブル @@ -1053,12 +1040,7 @@ TWATooltip=競技者の方向と風の間のアングル TWA=真の風角度 showBoatClassChartsLabel=利用可能な艇種の全体図も表示することができます。 showDiagram=ダイアグラム表示 -runAutomaticallyTooltip=統計やグルーピングなどを変更した後にクエリを自動的に実行します。 rerunQueryAfterRefreshTooltip=テーブルがリフレッシュされた後にクエリを再実行します。 -queryDefinitionProvider=クエリ定義プロバイダ -statisticProvider=統計プロバイダ -calculateThe=計算: -groupingProvider=グルーピングプロバイダ releaseNotes=新規およびリリース履歴 hasSplitFleetContiguousScoring=連続的に得点するフリートの分割 addRaceLogTracker=RaceLog トラッカー追加 @@ -1210,7 +1192,6 @@ showAll=全表示 raceVisibilityColumn=可視性 enterCarryValueFor=競技者 {0} の持ち越し得点を入力 advanced=予選通過 -basedOn=基準 retrieveWith=検索キー mappingDetails=マッピング詳細 deviceMappingQrCodeExplanation=追跡アプリを使用している場合は、競技者/マークを選択し、開始時刻と終了時刻を設定してから、この QRCode をスキャンすることによってデバイスマッピングも追加することができます。 @@ -1286,7 +1267,6 @@ showCompetitorFullNameColumn=競技者氏名 alwaysShowCompetitorNationalityColumn=競技者国籍を常に表示 alwaysShowCompetitorNationalityColumnTooltip=国旗と競技者画像 (利用可能な場合) の両方を表示 loadingDimensionValues=次元値ロード中 -runningQuery=クエリ実行中 inviteBuoyTenders=ブイ入札の招待 orMultipleEmails=または複数の電子メールをカンマで区切り courseOverGroundTrueDegreesTooltip=真の対地方位角度 (度) @@ -1294,10 +1274,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=距離 (ゲートスタートでの) distanceTraveledIncludingGateStartTooltip=レグ始点からレグ終点まで、またはレグをフィニッシュ\nしていない場合は現時点までに移動した距離です。\nレグにゲートスタートが含まれる場合は、異なる時刻にスタートしたときでも\n競技者を比較するためにピンエンドからスタート位置までの距離が含まれます。 raceDistanceTraveledIncludingGateStartTooltip=レース開始からレース終了まで、またはレースがフィニッシュ\nしていない場合は現時点までに移動した距離です。ゲートスタートの場合は、異なる時刻にスタートしたときでも\n競技者を比較するためにピンエンドからスタート位置までの距離が含まれます。 -groupName=グループ名 -valueAscending=値 (昇順) -valueDescending=値 (降順) -sortBy=ソートキー dashboardHeader=ダッシュボード dashboardNoWindBotAvailableHeader=ウィンドボットは利用できません。 dashboardNoWindBotAvailableMessage=風計測ユニットからライブ風データを受信するには、ウィンドボットがオンになっていて、SAP Sailing Analytics に接続されていることを確認してください。 @@ -1333,15 +1309,12 @@ dashboardRCBoat=RC 艇 fixedMarkPassing=(固定) suppressedMarkPassing=(非表示) windUp=ウィンドアップ (マップの最上部から風を表示) -currentFilterSelection=現在のフィルタ選択 notCapableOfGeneratingACodeForIdentifier=この ID のコードを生成することができません。 serverUrl=サーバ URL rotatedFromTrueNorth=真北から {0} 度回転しました。 clickToToggleWindUp=タップ/クリックして、風上が上のマップと北が上のマップとで表示を切り替えます clickToToggleWindStreamlets=タップ/クリックして風細流を表示または非表示にします startLineToFirstMarkTriangle=スタートから第一マークまで ({0}m) -dataMiningComponentsHaveBeenUpdated=データマイニングコンポーネントが更新されました -dataMiningComponentsNeedReloadDialogMessage=リロードをクリックして、コンポーネントをリロードします。これにより、現在表示されているデータが破棄され、デフォルトクエリが実行されます。\n何も行わない場合は閉じるをクリックします。データマイニングは、コンポーネントがリロードされるまでは正しく機能しません。 noDataForEvent=このイベントにまだデータが何もありません。 countriesCount={0,number} カ国 countriesCount[one]={0,number} カ国 @@ -1441,12 +1414,6 @@ listFormatLabel=レース一覧 competitionFormatLabel=競技日 runAQuery=クエリを実行 latestRegattaStandings=レガッタ最新順位表 -plainText=プレーンテキスト -columnChart=縦棒グラフ -columnChartWithErrorBars=縦棒グラフ (エラーバーあり) -choosePresentation=プレゼンテーション選択 -cantDisplayDataOfType={0} タイプのデータは表示できません。 -shownDecimals=小数点表示 openFullscreenView=全画面ビューを開く closeFullscreenView=全画面ビューを閉じる videosCount={0,number} 動画 @@ -1456,14 +1423,8 @@ photosCount[one]={0,number} 写真 eventsHaveTakenPlace={0} イベントが行われました eventsHaveTakenPlace[one]=1 つのイベントが行われました raceOffice=レース事務所 -dataMiningSettings=データマイニング設定 -multiResultsPresenter=複数結果表示 -plainResultsPresenter=プレーン結果表示ツール -resultsChart=結果チャート -tabbedResultsPresenter=タブ結果表示ツール polarResultsPresenter=ポーラー結果表示ツール maneuverSpeedDetailsResultsPresenter=マニューバー速度詳細結果表示ツール -dataMiningRetrieval=データ取得 actionWatch=視聴 actionAnalyze=分析 denoteAllRacesForRaceLogTrackingShorctut=レースログ追跡の全レース表示へのショートカット @@ -1478,24 +1439,8 @@ defaultName=デフォルト exampleTextForName=名前は次のようになります: flightsCount={0,number} フライト flightsCount[one]={0,number} フライト -viewQueryDefinition=クエリ定義の表示 -queryDefinitionViewer=クエリ定義ビューア -groupAverageAscending=グループ平均 (昇順) -groupAverageDescending=グループ平均 (降順) -groupMedianAscending=グループ中央値 (昇順) -groupMedianDescending=グループ中央値 (降順) resultsFoundForSearch={0,number} 結果が ''{1}’ に見つかりました resultsFoundForSearch[one]={0,number} 結果が ''{1}’ に見つかりました -runPredefinedQuery=事前定義クエリを実行 -selectPredefinedQuery=事前定義クエリを選択 -predefinedQueryRunner=事前定義クエリランナー -developerOptions=開発者オプション -copyToClipboard=クリップボードにコピー -code=コード -useClassGetName=タイプ名に class.getName() を使用 -useClassGetNameTooltip=コードベースでの変更に対してより堅牢ですが、コードスニペットはクラスが利用できる範囲でのみ使用できます。 -useStringLiterals=タイプ名に文字列リテラルを使用 -useStringLiteralsTooltip=このコードスニペットはどこでも使用できますが、コードベースが変更される場合は中断します。 errorLoadingDataWithTryAgain=データのロードでエラーが発生しました。しばらくしてから再試行してください。 addGalleryPhoto=ギャラリーフォト追加 addStageImage=ステージ画像追加 @@ -1792,12 +1737,6 @@ eventRegattaHeaderLegendGpsNo=航跡データなし eventRegattaHeaderLegendWindNo=風向風速データなし eventRegattaHeaderLegendVideoNo=動画ストリームなし eventRegattaHeaderLegendAudioNo=音声ストリームなし -angleInDegree=角度 (度) -angleInRadian=角度 (ラジアン) -centralAngleInRadian=中心角 (度) -centralAngleInDegree=中心角 (ラジアン) -floatNumber=浮動小数点型 -integer=整数 sampleColor=色サンプル leaderboardPage=リーダーボードページ showLiveNow="実況中" を表示 @@ -1848,7 +1787,6 @@ errorFetchingDimensionData={0} の次元値のフェッチでエラーが発生: errorFetchingStatistics=サーバからの利用可能な統計のフェッチでエラーが発生: {0} errorFetchingAggregators=サーバからの利用可能な集計のフェッチでエラーが発生: {0} errorLoadingDataRetrieverChainDefinitions=利用可能な DataRetrieverChainDefinitions の取得でエラーが発生: {0} -errorFetchingComponentsChangedTimepoint=サーバからのコンポーネント変更済タイムポイントのフェッチでエラーが発生: {0} errorRunningQuery=クエリの実行でエラーが発生: {0} errorReadingWindFixes=風フィックス {0} の読込でエラーが発生しました errorAddingWindFixForRace=レース {0} に対する風フィックスの追加でエラーが発生: {1} @@ -1916,11 +1854,6 @@ minimumRideHeightInMetersTooltip=艇がフォイリング状態にあるとみ minimumDurationBetweenAdjacentFoilingSegmentsInSeconds=隣り合ったフォイリングセグメント間の最小時間 (秒) minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip=空白でなく、隣り合った 2 つのフォイリングセグメント間の時間がこの値より小さい場合、隣り合ったこれらのフォイリングセグメントは 1 つにマージされます。 needToProvideValidMinimumRideHeight=浮上高さの有効な値をメートル単位で指定する必要があります。 -dataMiningErrorMargins=エラーマージン -elements={0} 要素 -chooseDifferentDimensionTitle=異なる次元の選択 -chooseDifferentDimensionMessage=結果をグルーピングするための異なる次元を選択してください -pleaseSelectADimension=次元を選択してください currentPortDaggerboardRake=左舷ダガーボード傾斜角 currentPortDaggerboardRakeTooltip=現在の左舷ダガーボード傾斜角 currentStbdDaggerboardRake=右舷ダガーボード傾斜角 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties index e88b70ccebf..652242b8a99 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties @@ -874,12 +874,9 @@ legType=Tipo de perna sailID=Número da vela seriesLeaderboard=Painel de classificação da série regattaLeaderboards=Painéis de classificação de regata -clearSelection=Anular seleção running=Em competição -runAsSubstantive=Competir done=Concluído lastFinished=Último a concluir -run=Competir times=vezes dataAmount=Quantidade de dados averageCleanedServerTime=∅ tempo de servidor anulado @@ -903,12 +900,8 @@ selectSheet=Selecionar folha cleanedServerTime=Tempo de servidor anulado overallTime=Tempo geral cleanedOverallTime=Tempo geral anulado -dataMiningResult=Resultado de data mining -groupBy=Agrupar por statisticToCalculate=Calcular estatística -queryResultsChartSubtitle=Percorreu {0} entradas de dados em {1} segundos noQuerySelected=Nenhuma consulta selecionada -runAutomatically=Executar automaticamente windImport_Upload=Carregar windImport_Title=Importar vento de Expedition windImport_BoatId=ID do barco: @@ -938,14 +931,9 @@ raceTimeTooltip=Tempo total navegado nesta corrida, começando a contagem quando raceTimeDownwindTooltip=Tempo total navegado a sotavento nesta corrida raceTimeReachingTooltip=Tempo total navegado a través nesta corrida raceTimeUpwindTooltip=Tempo total navegado a barlavento nesta corrida -noStatisticSelectedError=Não foi selecionada uma estatística para calcular noCustomGrouperScriptTextError=O script do sistema de agrupamento está vazio -noDimensionToGroupBySelectedError=Nenhuma dimensão pela qual efetuar o agrupamento selecionada noGrouperSelectedError=Nenhum tipo de sistema de agrupamento selecionado -noDataRetrieverChainDefinitonSelectedError=Nenhum recuperador de dados selecionado -queryNotValidBecause=Nenhuma consulta possível, pois dataMining=Data mining -errorRunningDataMiningQuery=Ocorreu um erro ao executar a consulta hideToolbar=Ocultar barra de ferramentas showSeriesLeaderboards=Visualizar painéis de classificação da série showOverallLeaderboard=Visualizar painel de classificação geral @@ -965,7 +953,6 @@ id=ID allowReload=Permitir recarregamento compress=Comprimir compressTooltip=Utilizar somente se a instância do servidor de exportação estiver sendo executada pelo menos\ncom o commit 0fbf6071dea125bec4a56dee55d61c99def4a62e. -queryRunner=Executor de consulta rerunQueryAfterRefresh=Executar consulta novamente após atualização refreshIntervalMustntBeEmpty=O intervalo de atualização não deve estar em branco selectionTables=Tabelas de seleção @@ -1050,12 +1037,7 @@ TWATooltip=O ângulo entre a direção dos competidores e o vento TWA=Ângulo do vento verdadeiro showBoatClassChartsLabel=Você também pode ver o diagrama geral para as classes de barcos disponíveis. showDiagram=Visualizar diagrama -runAutomaticallyTooltip=Execute a consulta automaticamente, após modificar, por exemplo, a estatística ou o agrupamento. rerunQueryAfterRefreshTooltip=Executa novamente a consulta após a atualização das tabelas. -queryDefinitionProvider=Fornecedor da definição da consulta -statisticProvider=Fornecedor da estatística -calculateThe=Calcular -groupingProvider=Fornecedor do agrupamento releaseNotes=Novidades e histórico de releases hasSplitFleetContiguousScoring=Flotilhas divididas com pontuação contínua addRaceLogTracker=Adicionar rastreador RaceLog @@ -1207,7 +1189,6 @@ showAll=Visualizar tudo raceVisibilityColumn=Visibilidade enterCarryValueFor=Inserir pontos transferidos para competidor {0} advanced=Avançado -basedOn=com base em retrieveWith=Recuperar com mappingDetails=Detalhes de mapeamento deviceMappingQrCodeExplanation=Se você estiver utilizando o app de rastreamento, você também pode adicionar o mapeamento do dispositivo selecionando um competidor/marca, definindo as horas de partida e chegada e digitalizando depois este código QR. @@ -1283,7 +1264,6 @@ showCompetitorFullNameColumn=Nome completo do competidor alwaysShowCompetitorNationalityColumn=Exibir sempre a nacionalidade do competidor alwaysShowCompetitorNationalityColumnTooltip=Exibir ambos, códigos de nacionalidade e imagens do competidor, se disponíveis loadingDimensionValues=Carregando valores de dimensão -runningQuery=Executando consulta inviteBuoyTenders=Convidar navios-balizadores orMultipleEmails=ou vários e-mails separados por vírgula courseOverGroundTrueDegreesTooltip=Percurso verdadeiro no fundo em graus @@ -1291,10 +1271,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=Distância (com início do portão) distanceTraveledIncludingGateStartTooltip=A distância navegada desde o início até o fim da perna\nou até a data/hora atual, se a perna não estiver concluída.\nSe a perna incluir o início de um portão, a distância desde o fim da marcação até a posição inicial é incluída\npara ser possível comparar os competidores mesmo quando começam em horas diferentes. raceDistanceTraveledIncludingGateStartTooltip=A distância navegada desde o início até o fim da corrida\nou até a data/hora atual, se a corrida não estiver concluída.\nPara o início de um portão, a distância desde o fim da marcação até a posição inicial é incluída\npara ser possível comparar os competidores mesmo quando começam em horas diferentes. -groupName=Nome do grupo -valueAscending=Valor (crescente) -valueDescending=Valor (decrescente) -sortBy=Ordenar por dashboardHeader=Painel dashboardNoWindBotAvailableHeader=O Wind Bot não está disponível. dashboardNoWindBotAvailableMessage=Para receber dados do vento em tempo real de unidades de medida do vento, certifique-se de que o Wind Bot está ativado e conectado ao SAP Sailing Analytics. @@ -1330,15 +1306,12 @@ dashboardRCBoat=Barco de rádio-controle fixedMarkPassing=(fixo) suppressedMarkPassing=(suprimido) windUp=Orientação pelo vento (visualizar vento no topo do mapa) -currentFilterSelection=Seleção de filtro atual notCapableOfGeneratingACodeForIdentifier=Não é possível gerar um código para este identificador. serverUrl=URL de servidor rotatedFromTrueNorth=Efetuou a rotação de {0} graus desde o norte verdadeiro. clickToToggleWindUp=Tocar/clicar para comutar entre exibição do mapa com orientação pelo vento e pelo norte clickToToggleWindStreamlets=Tocar/clicar para visualizar ou ocultar os cursos do vento startLineToFirstMarkTriangle=Partida para primeira marca ({0}m) -dataMiningComponentsHaveBeenUpdated=Os componentes de data mining foram atualizados -dataMiningComponentsNeedReloadDialogMessage=Clicar em Recarregar para recarregar os componentes agora. Isto irá descartar os dados exibidos atualmente e executar uma consulta padrão.\nClicar em Fechar para não efetuar nada. O data mining não irá funcionar corretamente até ser efetuado o recarregamento dos componentes. noDataForEvent=Ainda não existem dados para o evento. countriesCount={0,number} países countriesCount[one]={0,number} país @@ -1436,14 +1409,7 @@ noFinishedRaces=Ainda não existem corridas concluídas. racesOverview=Síntese de corridas listFormatLabel=Formato de lista competitionFormatLabel=Formato da competição -runAQuery=Executar uma consulta latestRegattaStandings=Posições da última regata -plainText=Texto simples -columnChart=Diagrama de colunas -columnChartWithErrorBars=Diagrama de colunas com barras de erros -choosePresentation=Selecionar apresentação -cantDisplayDataOfType=Não é possível exibir dados do tipo {0} -shownDecimals=Decimais exibidos openFullscreenView=Abrir visão de tela inteira closeFullscreenView=Fechar visão de tela inteira videosCount={0,number} vídeos @@ -1453,14 +1419,8 @@ photosCount[one]={0,number} foto eventsHaveTakenPlace=Foram realizados {0} eventos eventsHaveTakenPlace[one]=Foi realizado um evento raceOffice=Secretaria do evento -dataMiningSettings=Configurações de data mining -multiResultsPresenter=Apresentador de vários resultados -plainResultsPresenter=Apresentador de resultados simples -resultsChart=Diagrama de resultados -tabbedResultsPresenter=Apresentador de resultados por fichas polarResultsPresenter=Apresentador de resultados da carta polar maneuverSpeedDetailsResultsPresenter=Apresentador de resultados detalhados da velocidade da manobra -dataMiningRetrieval=Obtenção de dados actionWatch=Ver actionAnalyze=Analisar denoteAllRacesForRaceLogTrackingShorctut=Atalho para denotar todas as corridas para rastreamento do registro de corridas @@ -1475,24 +1435,8 @@ defaultName=Padrão exampleTextForName=Seu nome é parecido com: flightsCount={0,number} voos flightsCount[one]={0,number} voo -viewQueryDefinition=Ver definição da consulta -queryDefinitionViewer=Visualizador de definição da consulta -groupAverageAscending=Média do grupo (crescente) -groupAverageDescending=Média do grupo (decrescente) -groupMedianAscending=Mediana do grupo (crescente) -groupMedianDescending=Mediana do grupo (decrescente) resultsFoundForSearch={0,number} resultados encontrados para ''{1}'' resultsFoundForSearch[one]={0,number} resultado encontrado para ''{1}'' -runPredefinedQuery=Executar consulta predefinida -selectPredefinedQuery=Selecionar consulta predefinida -predefinedQueryRunner=Executor de consulta predefinida -developerOptions=Opções do desenvolvedor -copyToClipboard=Copiar para o clipboard -code=Código -useClassGetName=Utilizar Class.getName() para nomes de tipo -useClassGetNameTooltip=Mais robusto em relação às modificações na base do código, mas o trecho do código só pode ser utilizado no âmbito em que as classes estão disponíveis. -useStringLiterals=Utilizar literais de cadeia para nomes de tipo -useStringLiteralsTooltip=O trecho do código pode ser utilizado em qualquer local, mas será quebrado se a base do código for modificada. errorLoadingDataWithTryAgain=Erro ao carregar dados. Tentar novamente dentro de momentos. addGalleryPhoto=Adicionar foto da galeria addStageImage=Adicionar imagem da etapa @@ -1789,12 +1733,6 @@ eventRegattaHeaderLegendGpsNo=Sem dados de rastreamento eventRegattaHeaderLegendWindNo=Sem dados de vento eventRegattaHeaderLegendVideoNo=Sem fluxos de vídeo eventRegattaHeaderLegendAudioNo=Sem fluxos de áudio -angleInDegree=Ângulo em graus -angleInRadian=Ângulo em radianos -centralAngleInRadian=Ângulo central em radianos -centralAngleInDegree=Ângulo central em graus -floatNumber=Margem -integer=Número inteiro sampleColor=Amostra de cor leaderboardPage=Página do painel de classificação showLiveNow=Exibir "Ao vivo agora" @@ -1845,7 +1783,6 @@ errorFetchingDimensionData=Erro ao chamar os valores de dimensão de {0}: {1} errorFetchingStatistics=Erro ao chamar as estatísticas disponíveis do servidor: {0} errorFetchingAggregators=Erro ao chamar os agregadores disponíveis do servidor: {0} errorLoadingDataRetrieverChainDefinitions=Erro ao recuperar as definições da cadeia do recuperador de dados disponíveis: {0} -errorFetchingComponentsChangedTimepoint=Erro ao chamar data/hora modificada de componentes do servidor: {0} errorRunningQuery=Erro ao executar consulta: {0} errorReadingWindFixes=Erro ao ler pontos fixos de vento {0} errorAddingWindFixForRace=Erro ao adicionar um ponto fixo de vento para corrida {0}: {1} @@ -1913,11 +1850,6 @@ minimumRideHeightInMetersTooltip=A altura mínima de flutuação em metros neces minimumDurationBetweenAdjacentFoilingSegmentsInSeconds=Duração mínima entre segmentos adjacentes de navegação com hidrofólio (s) minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip=Se não estiver em branco e o tempo entre dois segmentos adjacentes de navegação com hidrofólio for inferior a este, esses segmentos adjacentes de navegação com hidrofólio serão consolidados em um. needToProvideValidMinimumRideHeight=Você precisa fornecer um valor válido da altura mínima de flutuação em metros. -dataMiningErrorMargins=Margens de erro -elements={0} elementos -chooseDifferentDimensionTitle=Selecionar dimensão diferente -chooseDifferentDimensionMessage=Selecionar uma dimensão diferente para os resultados do agrupamento -pleaseSelectADimension=Selecione uma dimensão currentPortDaggerboardRake=Inclinação bolina bombordo currentPortDaggerboardRakeTooltip=A inclinação atual da bolina para bombordo currentStbdDaggerboardRake=Inclinação bolina boreste diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties index a56ad094a80..16e201e0df8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties @@ -84,7 +84,7 @@ sapSailingAnalytics=Sailing Analytics leaderboard=Таблица лидеров leaderboards=Таблицы лидеров leaderboardSettings=Параметры таблицы лидеров -settings=Параметры +settingsId=Ид. настроек selectAtLeastOneLegDetail=Выберите подробности минимум одного отрезка currentSpeedOverGroundInKnots=SOG currentSpeedOverGroundInKnotsTooltip=Текущая скорость относительно грунта. @@ -328,7 +328,6 @@ degreesShort=град. untracked=Не отслеживается delayForLiveMode=Задержка для оперативного режима: notAvailable=Недоступно -details=Подробности noGroupSelected=Не выбрана группа combinedWindSourceTypeName=Объединено legMiddleWindSourceTypeName=Середина отрезка @@ -411,7 +410,6 @@ simulateAsLiveRace=Симулировать как текущую гонку simulateWithOffset=Сдвиг перед стартом в минутах: boatClassDoesNotMatchSelectedRegatta=Выбранные гонки содержат классы лодок, не совпадающие с классом лодок ''{0}'' выбранной регаты. Гонки не будут загружены. regattaExistForSelectedBoatClass=Для выбранных классов лодок имеется минимум одна регата. Создать регаты по умолчанию для соответствующих гонок? -reload=Перезагрузить addRegatta=Добавить регату... importRegattas=Импортировать регаты... exchangeName=Имя Exchange @@ -633,7 +631,6 @@ totalNetPointsColumnTooltip=Общая чистая сумма баллов уч windData=Данные о ветре gpsData=Данные GPS status=Статус -noDataFound=Данные не найдены displayName=Отображаемое имя histogram=Гистограмма numberOfDataPoints=Число точек данных @@ -881,12 +878,9 @@ legType=Тип отрезка sailID=Номер на парусе seriesLeaderboard=Таблица лидеров серии regattaLeaderboards=Таблицы лидеров регаты -clearSelection=Очистить выбор running=Выполнение -runAsSubstantive=Выполнить done=Готово lastFinished=Последний финиш -run=Выполнить times=раз dataAmount=Объем данных averageCleanedServerTime=∅ Очищенное время сервера @@ -910,12 +904,8 @@ selectSheet=Выбрать лист cleanedServerTime=Очищенное время сервера overallTime=Общее время cleanedOverallTime=Очищенное общее время -dataMiningResult=Результат добычи данных -groupBy=Группировать по statisticToCalculate=Рассчитать статистику -queryResultsChartSubtitle=Обработано {0} зап. данных за {1} с noQuerySelected=Не выбран запрос -runAutomatically=Выполнить автоматически windImport_Upload=Отправить windImport_Title=Импортировать ветер из Expedition windImport_BoatId=Ид. лодки: @@ -945,14 +935,9 @@ raceTimeTooltip=Общее время хода в данной гонке, от raceTimeDownwindTooltip=Общее время хода по ветру в данной гонке raceTimeReachingTooltip=Общее время хода полным ветром в данной гонке raceTimeUpwindTooltip=Общее время хода против ветра в данной гонке -noStatisticSelectedError=Не выбрана статистика для расчета noCustomGrouperScriptTextError=Скрипт группирования пуст -noDimensionToGroupBySelectedError=Не выбрано базовое измерение для группировки noGrouperSelectedError=Не выбран тип группирования -noDataRetrieverChainDefinitonSelectedError=Не выбрано средство извлечения данных -queryNotValidBecause=Запрос невозможен, так как dataMining=Добыча данных -errorRunningDataMiningQuery=При выполнении запроса возникла ошибка hideToolbar=Скрыть панель инструментов showSeriesLeaderboards=Показать таблицы лидеров серии showOverallLeaderboard=Показать итоговую таблицу лидеров @@ -972,7 +957,6 @@ id=Ид. allowReload=Разрешить перезагрузку compress=Сжать compressTooltip=Используйте только при выполнении экспортирующего экземпляра\nсервера с commit 0fbf6071dea125bec4a56dee55d61c99def4a62e. -queryRunner=Выполнение запроса rerunQueryAfterRefresh=Повторить запрос после обновления refreshIntervalMustntBeEmpty=Интервал обновления не должен быть пустым selectionTables=Таблица выбора @@ -1057,12 +1041,7 @@ TWATooltip=Угол между направлением участников и TWA=Угол истинного ветра showBoatClassChartsLabel=Также можно просмотреть общую диаграмму для доступных классов лодок. showDiagram=Показать диаграмму -runAutomaticallyTooltip=Автоматически выполнять запрос после изменения, например, статистики или группирования. rerunQueryAfterRefreshTooltip=Повторно выполняет запрос после обновления таблиц. -queryDefinitionProvider=Поставщик определения запроса -statisticProvider=Поставщик статистики -calculateThe=Рассчитать -groupingProvider=Поставщик группирования releaseNotes=Новости и история выпусков hasSplitFleetContiguousScoring=Разделенные флоты получили сходные оценки addRaceLogTracker=Добавить средство отслеживания журнала гонки @@ -1214,7 +1193,6 @@ showAll=Показать все raceVisibilityColumn=Видимость enterCarryValueFor=Введите перенесенные баллы для участника {0} advanced=Дополнительно -basedOn=на базе retrieveWith=Получить с помощью mappingDetails=Подробности сопоставления deviceMappingQrCodeExplanation=Если используется приложение отслеживания, можно добавить также сопоставление устройства, выбрав участника/отметку, установив интервал времени, а затем отсканировав этот QR-код. @@ -1290,7 +1268,6 @@ showCompetitorFullNameColumn=Полное имя участника alwaysShowCompetitorNationalityColumn=Всегда показывать государственную принадлежность участника alwaysShowCompetitorNationalityColumnTooltip=Показывать и флаги государств, и изображения участников (при наличии) loadingDimensionValues=Загрузка значений измерения -runningQuery=Выполнение запроса inviteBuoyTenders=Пригласить лоцманов orMultipleEmails=или несколько адресов эл. почты через запятую courseOverGroundTrueDegreesTooltip=Истинный курс относительно грунта в градусах @@ -1298,11 +1275,6 @@ courseOverGroundTrueDegrees=COG distanceIncludingGateStartInMeters=Дистанция (при старте через ворота) distanceTraveledIncludingGateStartTooltip=Дистанция, пройденная от начала отрезка до конца\nили до текущего момента времени, если отрезок не завершен.\nЕсли отрезок включает старт через ворота, дистанция от отметки до стартовой позиции включается,\nчтобы обеспечить сравнение участников даже при старте в разное время. raceDistanceTraveledIncludingGateStartTooltip=Дистанция, пройденная от начала гонки до конца\nили до текущего момента времени, если гонка не завершена.\nДля старта через ворота включается дистанция от привязки до стартовой позиции,\nчтобы обеспечить сравнение участников даже при старте в разное время. -results=Результаты -groupName=Название группы -valueAscending=Значение (по возрастанию) -valueDescending=Значение (по убыванию) -sortBy=Сортировать по dashboardHeader=Панель dashboardNoWindBotAvailableHeader=WindBot недоступен. dashboardNoWindBotAvailableMessage=Чтобы получать оперативные данные от устройств измерения ветра, убедитесь, что WindBot включен и подключен к SAP Sailing Analytics. @@ -1338,16 +1310,12 @@ dashboardRCBoat=Лодка ГК fixedMarkPassing=(фиксировано) suppressedMarkPassing=(подавляется) windUp=На ветер (показать ветер сверху карты) -filterBy=Фильтровать по -currentFilterSelection=Текущий выбор фильтра notCapableOfGeneratingACodeForIdentifier=Я не могу сгенерировать код для этого идентификатора. serverUrl=URL-адрес сервера rotatedFromTrueNorth=Повернуто на {0} град. от истинного севера. clickToToggleWindUp=Коснитесь/щелкните для переключения между отображением карты с ветром или севером вверху clickToToggleWindStreamlets=Коснитесь/щелкните для отображения или скрытия потоков ветра startLineToFirstMarkTriangle=От старта до первой отметки ({0} м) -dataMiningComponentsHaveBeenUpdated=Компоненты добычи данных обновлены. -dataMiningComponentsNeedReloadDialogMessage=Щелкните ''Перезагрузить'', чтобы перезагрузить компоненты сейчас. Текущее отображение данных будет сброшено с выполнением запроса по умолчанию. Добыча данных не будет работать правильно до перезагрузки компонентов. noDataForEvent=Данных для данного события еще нет. countriesCount={0,number} стран countriesCount[one]={0,number} страна @@ -1445,14 +1413,7 @@ noFinishedRaces=Завершенных гонок еще нет racesOverview=Обзор гонок listFormatLabel=Формат списка competitionFormatLabel=Формат соревнования -runAQuery=Выполнить запрос latestRegattaStandings=Позиции в последней регате -plainText=Простой текст -columnChart=Столбчатая диаграмма -columnChartWithErrorBars=Столбчатая диаграмма с планками погрешностей -choosePresentation=Выберите представление -cantDisplayDataOfType=Невозможно отобразить данные типа {0} -shownDecimals=Отображаемые десятичные разряды openFullscreenView=Открыть полноэкранный режим closeFullscreenView=Закрыть полноэкранный режим videosCount={0,number} видео @@ -1462,15 +1423,8 @@ photosCount[one]={0,number} фото eventsHaveTakenPlace=Имело место {0} событий eventsHaveTakenPlace[one]=Имело место одно событие raceOffice=Служба гонки -analyze=Анализировать -dataMiningSettings=Параметры добычи данных -multiResultsPresenter=Презентатор множества результатов -plainResultsPresenter=Презентатор простых результатов -resultsChart=Диаграмма результатов -tabbedResultsPresenter=Презентатор результатов со вкладками polarResultsPresenter=Полярный презентатор результатов maneuverSpeedDetailsResultsPresenter=Демонстратор результатов детализации скорости маневра -dataMiningRetrieval=Извлечение данных actionWatch=Смотреть actionAnalyze=Анализировать denoteAllRacesForRaceLogTrackingShorctut=Ярлык для отмены отслеживания журналов всех гонок @@ -1485,24 +1439,8 @@ defaultName=По умолчанию exampleTextForName=Выше имя выглядит так: flightsCount={0,number} полетов flightsCount[one]={0,number} полет -viewQueryDefinition=Просмотреть определение запроса -queryDefinitionViewer=Средство просмотра определения запроса -groupAverageAscending=Среднее группы (по возрастанию) -groupAverageDescending=Среднее группы (по убыванию) -groupMedianAscending=Медиана группы (по возрастанию) -groupMedianDescending=Медиана группы (по убыванию) resultsFoundForSearch=Найдено {0,number} результатов для ''{1}'' resultsFoundForSearch[one]=Найден {0,number} результат для ''{1}'' -runPredefinedQuery=Выполнить готовый запрос -selectPredefinedQuery=Выбрать готовый запрос -predefinedQueryRunner=Средство выполнения готовых запросов -developerOptions=Параметры разработчика -copyToClipboard=Копировать в буфер обмена -code=Код -useClassGetName=Использовать Class.getName() для имен типов -useClassGetNameTooltip=Более надежно по сравнению с изменениями в основании кода, но фрагмент кода может быть использован только в области с доступными классами. -useStringLiterals=Использовать строковые литералы для имен типов -useStringLiteralsTooltip=Фрагмент кода может использоваться где угодно, но будет нарушен в случае изменения основания кода. errorLoadingDataWithTryAgain=Ошибка при загрузке данных. Повтор попытки через несколько секунд. addGalleryPhoto=Добавить фото галереи addStageImage=Добавить изображение этапа @@ -1799,12 +1737,6 @@ eventRegattaHeaderLegendGpsNo=Нет данных отслеживания eventRegattaHeaderLegendWindNo=Нет данных о ветре eventRegattaHeaderLegendVideoNo=Нет видеопотоков eventRegattaHeaderLegendAudioNo=Нет аудиопотоков -angleInDegree=Угол в градусах -angleInRadian=Угол в радианах -centralAngleInRadian=Центральный угол в градусах -centralAngleInDegree=Центральный угол в радианах -floatNumber=Плавающее -integer=Целое sampleColor=Образец цвета leaderboardPage=Страница таблицы лидеров showLiveNow=Показать "Оперативные данные" @@ -1823,7 +1755,6 @@ reallyRemoveSeries=Действительно удалить серии ''{0}''? documentSettingsId=Ид. настроек документа settingsForId=Настройки для ид. ''{0}'' userProfileSettingsTabDescription=Пользовательские настройки генерируются диалогами настроек, расположенными во многих местах страницы. Здесь отображено техническое представление всех собранных настроек для ключевых пользователей. Соблюдайте осторожность, так как восстановить удаленные записи невозможно. -resetToDefaultInProgress=Выполняется сброс... userSettingsFilter=Фильтр настроек requiresRegattaRaceAndLeaderboard=Для этой страницы требуются действительные названия регаты, гонки и таблицы лидеров. couldNotFindRaceInRegatta=Не удалось получить гонку с названием {0} для регаты с названием {1} @@ -1855,7 +1786,6 @@ errorFetchingDimensionData=Ошибка при вызове значений и errorFetchingStatistics=Ошибка при вызове доступной статистики с сервера: {0} errorFetchingAggregators=Ошибка при вызове доступных агрегаторов с сервера: {0} errorLoadingDataRetrieverChainDefinitions=Ошибка при вызове доступных определений цепочек извлечения данных: {0} -errorFetchingComponentsChangedTimepoint=Ошибка при вызове отметки времени изменения компонентов с сервера: {0} errorRunningQuery=Ошибка при выполнении запроса: {0} errorReadingWindFixes=Ошибка при считывании замеров ветра {0} errorAddingWindFixForRace=Ошибка при добавлении замера ветра для гонки {0}: {1} @@ -1923,11 +1853,6 @@ minimumRideHeightInMetersTooltip=Минимальная высота просв minimumDurationBetweenAdjacentFoilingSegmentsInSeconds=Минимальная продолжительность между двумя сегментами в крыльевом режиме (сек) minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip=Если поле не является пустым, и время между двумя смежными сегментами в крыльевом режиме не превышает указанное значение, смежные сегменты в крыльевом режиме считаются одним сегментом. needToProvideValidMinimumRideHeight=Укажите действительное значение минимальной высоты просвета в метрах. -dataMiningErrorMargins=Пределы погрешности -elements={0} элем. -chooseDifferentDimensionTitle=Выберите другое измерение -chooseDifferentDimensionMessage=Выберите другое измерение для группирования результатов -pleaseSelectADimension=Выберите измерение currentPortDaggerboardRake=Скос киля на левый борт currentPortDaggerboardRakeTooltip=Текущий скос выдвижного киля на левый борт currentStbdDaggerboardRake=Скос киля на правый борт diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties index f5f603a9ec9..23148b7622d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties @@ -877,12 +877,9 @@ legType=航段形式 sailID=帆号 seriesLeaderboard=系列积分榜 regattaLeaderboards=比赛积分榜 -clearSelection=清除选择 running=运行 -runAsSubstantive=运行 done=完成 lastFinished=最后完成 -run=运行 times=次数 dataAmount=数据量 averageCleanedServerTime=∅ 清理服务器时间 @@ -906,12 +903,8 @@ selectSheet=选择工作表 cleanedServerTime=清理服务器时间 overallTime=总时间 cleanedOverallTime=清理总时间 -dataMiningResult=数据挖掘结果 -groupBy=分组方式 statisticToCalculate=计算统计 -queryResultsChartSubtitle={1}秒内处理{0}个数据条目 noQuerySelected=没有查询选择 -runAutomatically=自动运行 windImport_Upload=上传 windImport_Title=从导航图导入风力 windImport_BoatId=船只编号： @@ -941,14 +934,9 @@ raceTimeTooltip=参赛队在本比赛轮次中越过开始航路点\n（不是 raceTimeDownwindTooltip=本轮次比赛顺风航行的总时间 raceTimeReachingTooltip=本轮次比赛横风航行的总时间 raceTimeUpwindTooltip=本轮次比赛迎风航行的总时间 -noStatisticSelectedError=未选择待计算的统计 noCustomGrouperScriptTextError=群集器脚本为空 -noDimensionToGroupBySelectedError=未选择分组方式尺寸 noGrouperSelectedError=未选择群集器类型 -noDataRetrieverChainDefinitonSelectedError=未选择数据检索器 -queryNotValidBecause=无法查询，原因： dataMining=数据挖掘 -errorRunningDataMiningQuery=运行查询期间出错 hideToolbar=隐藏工具栏 showSeriesLeaderboards=显示系列积分榜 showOverallLeaderboard=显示总积分榜 @@ -968,7 +956,6 @@ id=编号 allowReload=允许重新加载 compress=压缩 compressTooltip=仅在导出服务器实例至少通过\n任务 0fbf6071dea125bec4a56dee55d61c99def4a62e 运行时使用。 -queryRunner=查询执行器 rerunQueryAfterRefresh=在刷新后重新运行查询 refreshIntervalMustntBeEmpty=刷新间隔不得为空 selectionTables=选择表 @@ -1053,12 +1040,7 @@ TWATooltip=赛队航行的方向和风的夹角 TWA=实际风向角 showBoatClassChartsLabel=还可以查看可用船只级别的总直直方图。 showDiagram=显示直方图 -runAutomaticallyTooltip=在更改统计或分组后，自动运行查询。 rerunQueryAfterRefreshTooltip=在刷新表后，重新运行查询。 -queryDefinitionProvider=查询定义提供方 -statisticProvider=统计提供方 -calculateThe=计算 -groupingProvider=分组提供方 releaseNotes=消息和版本历史 hasSplitFleetContiguousScoring=区分连续得分的船队 addRaceLogTracker=添加比赛轮次日志跟踪器 @@ -1210,7 +1192,6 @@ showAll=显示全部 raceVisibilityColumn=可见性 enterCarryValueFor=输入参赛队{0}的得分 advanced=高级 -basedOn=基于 retrieveWith=检索依据 mappingDetails=映射详情 deviceMappingQrCodeExplanation=如果使用跟踪应用，可以通过选择参赛队/标志、设置开始和结束时间，然后扫描此二维码添加设备映射。 @@ -1286,7 +1267,6 @@ showCompetitorFullNameColumn=参赛队全名 alwaysShowCompetitorNationalityColumn=始终显示参赛队国籍 alwaysShowCompetitorNationalityColumnTooltip=如果可用，显示两者：国籍旗帜和参赛队图像 loadingDimensionValues=正在加载尺寸值 -runningQuery=运行查询 inviteBuoyTenders=邀请浮标供应船 orMultipleEmails=或使用逗号隔开的多个电子邮件 courseOverGroundTrueDegreesTooltip=实在对地航向角度 @@ -1294,10 +1274,6 @@ courseOverGroundTrueDegrees=对地航向 distanceIncludingGateStartInMeters=距离（起航门标） distanceTraveledIncludingGateStartTooltip=如果航段没有结束，从航段起点到终点\n或当前时间点航行的距离。\n如果航段包括起航门标，则包括尾销到起航位置的距离，\n这样，即便在不同时间起航，也可以比较参赛队。 raceDistanceTraveledIncludingGateStartTooltip=如果比赛轮次没有结束，从比赛轮次开始到结束\n或当前时间点航行的距离。对于起航门标，包括尾销到起航位置的距离，\n这样，即便在不同时间起航，也可以比较参赛队。 -groupName=分组名称 -valueAscending=值（递增） -valueDescending=值（递减） -sortBy=排序方式 dashboardHeader=仪表盘 dashboardNoWindBotAvailableHeader=风力机器人程序不可用。 dashboardNoWindBotAvailableMessage=要从风力测量装置接收实况风力数据，请确保开启风力机器人程序，并与 SAP Sailing Analytics 相连。 @@ -1333,15 +1309,12 @@ dashboardRCBoat=RC 船只 fixedMarkPassing=（固定） suppressedMarkPassing=（禁止） windUp=风向向上（从地图的顶部显示风力） -currentFilterSelection=当前筛选器选择 notCapableOfGeneratingACodeForIdentifier=无法为此标识符生成代码。 serverUrl=服务器 URL rotatedFromTrueNorth=自真北方向旋转{0}度。 clickToToggleWindUp=点按/点击在风向向上和北向上地图显示之间切换 clickToToggleWindStreamlets=点按/点击显示或隐藏风流 startLineToFirstMarkTriangle=开始经过第一个标志 ({0}m) -dataMiningComponentsHaveBeenUpdated=数据挖掘组件已更新 -dataMiningComponentsNeedReloadDialogMessage=点击“重新加载”，立即重新加载组件。这将放弃当前显示的数据，并运行默认查询。\n点击“关闭”不执行任何操作。在重新加载组件前，数据挖掘不能正常工作。 noDataForEvent=活动暂无任何数据。 countriesCount={0,number} 个国家/地区 countriesCount[one]={0,number} 个国家/地区 @@ -1439,14 +1412,7 @@ noFinishedRaces=没有结束的比赛轮次 racesOverview=比赛轮次总览 listFormatLabel=清单格式 competitionFormatLabel=赛制 -runAQuery=运行查询 latestRegattaStandings=最新比赛排名 -plainText=纯文本 -columnChart=柱状图 -columnChartWithErrorBars=含误差线的柱状图 -choosePresentation=选择介绍 -cantDisplayDataOfType=无法显示类型为{0}的数据 -shownDecimals=显示小数 openFullscreenView=打开全屏视图 closeFullscreenView=关闭全屏视图 videosCount={0,number} 个视频 @@ -1456,14 +1422,8 @@ photosCount[one]={0,number} 张照片 eventsHaveTakenPlace={0}个活动已举行 eventsHaveTakenPlace[one]=已举行一场活动 raceOffice=竞赛办公室 -dataMiningSettings=数据挖掘设置 -multiResultsPresenter=多结果展示区 -plainResultsPresenter=纯结果展示区 -resultsChart=结果记录 -tabbedResultsPresenter=选项卡式结果展示区 polarResultsPresenter=极坐标结果展示区 maneuverSpeedDetailsResultsPresenter=操作速度详细结果展示区 -dataMiningRetrieval=数据检索 actionWatch=观看 actionAnalyze=分析 denoteAllRacesForRaceLogTrackingShorctut=为比赛轮次日志跟踪描述所有比赛轮次的快捷方式 @@ -1478,24 +1438,8 @@ defaultName=默认值 exampleTextForName=名称如下所示： flightsCount={0,number} 个航程 flightsCount[one]={0,number} 个航程 -viewQueryDefinition=查看查询定义 -queryDefinitionViewer=查询定义查看器 -groupAverageAscending=分组平均值（递增） -groupAverageDescending=分组平均值（递减） -groupMedianAscending=分组中值（递增） -groupMedianDescending=分组中值（递减） resultsFoundForSearch=找到 "{1}" 的 {0,number} 个结果 resultsFoundForSearch[one]=找到 "{1}" 的 {0,number} 个结果 -runPredefinedQuery=运行预定义的查询 -selectPredefinedQuery=选择预定义的查询 -predefinedQueryRunner=预定义的查询执行器 -developerOptions=开发人员选项 -copyToClipboard=复制到剪贴板 -code=代码 -useClassGetName=将 Class.getName() 用于类型名称 -useClassGetNameTooltip=更灵活应对代码库的更改，但是代码片段只能在级别可用的范围内使用。 -useStringLiterals=将字符串文本用于类型名称 -useStringLiteralsTooltip=代码片段可在任意位置使用，当如果基本代码更改，其将中断。 errorLoadingDataWithTryAgain=加载数据出错。请稍后重试。 addGalleryPhoto=添加图库照片 addStageImage=添加阶段图像 @@ -1792,12 +1736,6 @@ eventRegattaHeaderLegendGpsNo=无跟踪数据 eventRegattaHeaderLegendWindNo=无风力数据 eventRegattaHeaderLegendVideoNo=无视频流 eventRegattaHeaderLegendAudioNo=无音频流 -angleInDegree=角度（度） -angleInRadian=角度（弧度） -centralAngleInRadian=圆心角（弧度） -centralAngleInDegree=圆心角（度） -floatNumber=浮点数 -integer=整数 sampleColor=颜色样本 leaderboardPage=积分榜页面 showLiveNow=显示“现在直播” @@ -1848,7 +1786,6 @@ errorFetchingDimensionData=获取{0}的维度值出错：{1} errorFetchingStatistics=从服务器获取可用统计出错：{0} errorFetchingAggregators=从服务器获取可用聚合器出错：{0} errorLoadingDataRetrieverChainDefinitions=检索可用 DataRetrieverChainDefinitions　出错：{0} -errorFetchingComponentsChangedTimepoint=从服务器获取组件更改的时间点出错：{0} errorRunningQuery=运行查询出错：{0} errorReadingWindFixes=读取风力修复{0}出错 errorAddingWindFixForRace=添加比赛轮次{0}的风力修复出错：{1} @@ -1916,11 +1853,6 @@ minimumRideHeightInMetersTooltip=将船只视为处于水翼腾空状态所需 minimumDurationBetweenAdjacentFoilingSegmentsInSeconds=相邻水翼腾空段之间的最短持续时间 (s) minimumDurationBetweenAdjacentFoilingSegmentsInSecondsTooltip=如果不为空，并且两个相邻水翼腾空段之间的时间短于此值，会将这些相邻的水翼腾空段合并成一个。 needToProvideValidMinimumRideHeight=您需要提供有效的最小行驶高度值（米）。 -dataMiningErrorMargins=误差容限 -elements={0}元素 -chooseDifferentDimensionTitle=选择不同的维度 -chooseDifferentDimensionMessage=为分组结果选择不同的维度 -pleaseSelectADimension=请选择维度 currentPortDaggerboardRake=左舷活动披水板倾斜度 currentPortDaggerboardRakeTooltip=当前左舷活动披水板倾斜度 currentStbdDaggerboardRake=右舷活动披水板倾斜度 diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..79ca0d863f7 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +encoding//src/com/sap/sse/datamining/ui/StringMessages.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/StringMessages_de.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/StringMessages_es.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/StringMessages_fr.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/StringMessages_ja.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/StringMessages_pt.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/StringMessages_ru.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/StringMessages_zh.properties=UTF-8 diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java index 9d1c7505d1c..ece28bfe25d 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java @@ -20,38 +20,18 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String selectPredefinedQuery(); String errorRunningDataMiningQuery(); String predefinedQueryRunner(); - String run(); String useClassGetNameTooltip(); String useClassGetName(); - String useStringLiterals(); String useStringLiteralsTooltip(); - String copyToClipboard(); - String code(); String queryDefinitionViewer(); String runAsSubstantive(); String queryNotValidBecause(); String queryRunner(); - String floatNumber(); - String integer(); String runAQuery(); String runningQuery(); - String choosePresentation(); - String plainText(); - String groupName(); - String valueAscending(); - String valueDescending(); - String groupAverageAscending(); - String groupAverageDescending(); - String groupMedianAscending(); - String groupMedianDescending(); - String shownDecimals(); String queryResultsChartSubtitle(int retrievedDataAmount, double calculationTime); - String elements(long count); String dataMiningErrorMargins(); String dataMiningResult(); - String resultsChart(); - String cantDisplayDataOfType(String resultType); - String sortBy(); String developerOptions(); String runAutomatically(); String runAutomaticallyTooltip(); @@ -68,7 +48,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String noStatisticSelectedError(); String calculateThe(); String statisticProvider(); - String groupBy(); String groupingProvider(); String clearSelection(); String basedOn(); @@ -78,8 +57,5 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String queryDefinitionProvider(); String dataMiningRetrieval(); String tabbedResultsPresenter(); - String angleInDegree(); - String angleInRadian(); - String centralAngleInRadian(); - String centralAngleInDegree(); + String useStringLiterals(); } diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.properties new file mode 100644 index 00000000000..a13b65ec0f3 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.properties @@ -0,0 +1,44 @@ +dataMiningSettings=Data Mining Settings +runPredefinedQuery=Run Predefined Query +viewQueryDefinition=View Query Definition +selectPredefinedQuery=Select Predefined Query +errorRunningDataMiningQuery=An error occured running the query +predefinedQueryRunner=Predefined Query Runner +useClassGetNameTooltip=More robust against changes in the code base, but the code snippet can only be used in the scope where the classes are available. +useClassGetName=Use Class.getName() for type names +useStringLiteralsTooltip=The code snippet can be used anywhere, but it will break if the code base changes. +queryDefinitionViewer=Query Definition Viewer +runAsSubstantive=Run +queryNotValidBecause=No query possible, because +queryRunner=Query Runner +runAQuery=Run a Query +runningQuery=Running Query +queryResultsChartSubtitle=Worked through {0} data entries in {1} seconds +dataMiningErrorMargins=Error Margins +dataMiningResult=Data Mining Result +developerOptions=Developer Options +runAutomatically=Run automatically +runAutomaticallyTooltip=Run the query automatically, after you changed e.g. the statistic or the grouping. +currentFilterSelection=Current filter selection +plainResultsPresenter=Plain Results Presenter +multiResultsPresenter=Multi Results Presenter +columnChart=Column Chart +columnChartWithErrorBars=Column Chart with Error Bars +errorFetchingComponentsChangedTimepoint=Error fetching components changed timepoint from the server: {0} +dataMiningComponentsHaveBeenUpdated=The Data-Mining components have been updated +dataMiningComponentsNeedReloadDialogMessage=Click Reload to reload the components now. This will discard the current displayed data and run a default query.\nClick Close to do nothing. The Data-Mining won''t work correctly, until the components have been reloaded. +noDimensionToGroupBySelectedError=No dimension to group by is selected +noDataRetrieverChainDefinitonSelectedError=No data retriever is selected +noStatisticSelectedError=No statistic to calculate is selected +calculateThe=Calculate the +statisticProvider=Statistic Provider +groupingProvider=Grouping Provider +clearSelection=Clear Selection +basedOn=based on +chooseDifferentDimensionTitle=Choose different dimension +chooseDifferentDimensionMessage=Choose a different dimension for grouping results +pleaseSelectADimension=Please select a dimension +queryDefinitionProvider=Query Definition Provider +dataMiningRetrieval=Data Retrieval +tabbedResultsPresenter=Tabbed Results Presenter +useStringLiterals=Use string literals for type names diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_de.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_de.properties new file mode 100644 index 00000000000..58e61c37ea6 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_de.properties @@ -0,0 +1,44 @@ +dataMiningSettings=Data Mining Einstellungen +runPredefinedQuery=Vordefinierte Abfrage ausführen +viewQueryDefinition=Query Definition anzeigen +selectPredefinedQuery=Vordefinierte Abfrage auswählen +errorRunningDataMiningQuery=Es ist ein Felher bei der Datenabfrage aufgetreten +predefinedQueryRunner=Vordefinierte Abfrageverarbeiter +useClassGetNameTooltip=Robuster gegnüber Änderungen im Code, aber der Code Snippet kann nur in dem Scope verwendet werden in dem die Klassen verfügbar sind. +useClassGetName=Verwende Class.getName() für Typnamen +useStringLiteralsTooltip=Der Code Snippet kann überall verwendet werden, wird aber nicht mehr funktionieren, wenn sich der Code ändert. +queryDefinitionViewer=Query Definition Anzeiger +runAsSubstantive=Durchlauf +queryNotValidBecause=Keine Datenabfrage möglich, da +queryRunner=Abfrageverarbeiter +runAQuery=Führe eine Anfrage aus +runningQuery=Datenabfrage läuft +queryResultsChartSubtitle=Es wurden {0} Datensätze in {1} Sekunden verarbeitet +dataMiningErrorMargins=Fehlerintervall +dataMiningResult=Data Mining Ergebnis +developerOptions=Entwickleroptionen +runAutomatically=Automatisch ausführen +runAutomaticallyTooltip=Führe die Anfrage automatisch durch, wenn zum Beispiel die Statistik oder die Gruppierung geändert wurde. +currentFilterSelection=Aktuelle Filter-Selektion +plainResultsPresenter=Einfacher Ergebnis-Darsteller +multiResultsPresenter=Multi Ergebnis-Darsteller +columnChart=Säulendiagramm +columnChartWithErrorBars=Säulendiagramm mit Fehlerbalken +errorFetchingComponentsChangedTimepoint=Error fetching components changed timepoint from the server: {0} +dataMiningComponentsHaveBeenUpdated=Die Data-Mining Komponenten wurden aktualisiert +dataMiningComponentsNeedReloadDialogMessage=Klicke auf Neu Laden, um die Komponenten jetzt neu zu laden. Die aktuell angezeigten Daten gehen dabei verloren und eine Standard-Query wird ausgeführt.\nKlicke auf Schließen, um nichts zu tun. Das Data-Mining wird nicht korrekt funktionieren, bis die Komponenten neu geladen wurden. +noDimensionToGroupBySelectedError=Keine Gruppierungs-Dimension ausgewählt ist +noDataRetrieverChainDefinitonSelectedError=Kein Datenbeschaffer ausgewählt ist +noStatisticSelectedError=Keine zu berechnende Kennzahl ausgewählt ist +calculateThe=Berechne die +statisticProvider=Statistik-Versorger +groupingProvider=Gruppierungs-Versorger +clearSelection=Auswahl leeren +basedOn=basierend auf +chooseDifferentDimensionTitle=Andere Dimension auswählen +chooseDifferentDimensionMessage=Zum Gruppieren eine andere Dimension auswählen +pleaseSelectADimension=Bitte eine Dimension auswählen +queryDefinitionProvider=Anfragen-Definitions-Versorger +dataMiningRetrieval=Datenbeschaffung +tabbedResultsPresenter=Tab Ergebnis-Darsteller +useStringLiterals=Verwende String-Literale für Typnamen diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_es.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_es.properties new file mode 100644 index 00000000000..fe5a1199dbf --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_es.properties @@ -0,0 +1,44 @@ +dataMiningSettings=Opciones de minería de datos +runPredefinedQuery=Ejecutar consulta predefinida +viewQueryDefinition=Ver definición de consulta +selectPredefinedQuery=Seleccionar consulta predefinida +errorRunningDataMiningQuery=Se ha producido un error al ejecutar la consulta +predefinedQueryRunner=Programa de ejecución de consulta predefinida +useClassGetNameTooltip=Más resistente frente a modificaciones en la base de código, pero el fragmento de código se puede utilizar solamente en el ámbito donde estén disponibles las clases. +useClassGetName=Utilizar Class.getName() para nombres de tipo +useStringLiteralsTooltip=El fragmento de código puede utilizarse en todas las ubicaciones, pero se romperá si se modifica la base de código. +queryDefinitionViewer=Visor de definición de consulta +runAsSubstantive=Ejecutar +queryNotValidBecause=No se puede hacer ninguna consulta porque +queryRunner=Ejecutor de la consulta +runAQuery=Realice una consulta +runningQuery=Ejecutando consulta +queryResultsChartSubtitle=Se ha trabajado en {0} entradas de datos en {1} segundos +dataMiningErrorMargins=Márgenes de error +dataMiningResult=Resultado de minería de datos +developerOptions=Opciones de desarrollador +runAutomatically=Ejecutar automáticamente +runAutomaticallyTooltip=Ejecute la consulta automáticamente después de modificar, por ejemplo, la estadística o la agrupación. +currentFilterSelection=Seleccion de filtro actual +plainResultsPresenter=Presentador de resultados simples +multiResultsPresenter=Presentador de resultados múltiples +columnChart=Gráfico de columnas +columnChartWithErrorBars=Gráfico de columnas con barras de error +errorFetchingComponentsChangedTimepoint=Error al obtener la fecha modificada de los componentes a partir del servidor: {0} +dataMiningComponentsHaveBeenUpdated=Los componentes de minería de datos se han actualizado +dataMiningComponentsNeedReloadDialogMessage=Pulse Recargar para volver a cargar los componentes ahora. De este modo, se descartarán los datos visualizados en ese momento y se ejecutará una consulta por defecto.\nHaga clic en «Cerrar» para no hacer nada. La minería de datos no funcionará correctamente hasta que se hayan vuelto a cargar los componentes. +noDimensionToGroupBySelectedError=No se ha seleccionado ninguna dimensión para agrupar +noDataRetrieverChainDefinitonSelectedError=No se ha seleccionado ningún recuperador de datos +noStatisticSelectedError=No se ha seleccionado ninguna estadística para calcular +calculateThe=Calcular +statisticProvider=Proveedor de estadísticas +groupingProvider=Proveedor de agrupación +clearSelection=Borrar selección +basedOn=Basado en +chooseDifferentDimensionTitle=Seleccione una dimensión diferente +chooseDifferentDimensionMessage=Seleccione una dimensión diferente para agrupar resultados +pleaseSelectADimension=Seleccione una dimensión +queryDefinitionProvider=Proveedor de definición de consultas +dataMiningRetrieval=Recuperación de datos +tabbedResultsPresenter=Presentador de resultados por pestañas +useStringLiterals=Utilizar literales de cadena para los nombres de tipo diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_fr.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_fr.properties new file mode 100644 index 00000000000..d0535a8123a --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_fr.properties @@ -0,0 +1,44 @@ +dataMiningSettings=Options de l''exploration de données +runPredefinedQuery=Exécuter requête prédéfinie +viewQueryDefinition=Afficher la définition de la requête +selectPredefinedQuery=Sélectionner requête prédéfinie +errorRunningDataMiningQuery=Une erreur s''est produite lors de l''exécution de la requête. +predefinedQueryRunner=Outil d''exécution de requêtes prédéfinies +useClassGetNameTooltip=Plus stable face aux modifications dans la base de code, mais le fichier de script peut uniquement être utilisé dans l''étendue où les classes sont disponibles. +useClassGetName=Utilisez Class.getName() pour les noms des types. +useStringLiteralsTooltip=Le fichier de script peut être utilisé partout, mais sera corrompu si la base de code change. +queryDefinitionViewer=Visualiseur de définitions de requête +runAsSubstantive=Exécuter +queryNotValidBecause=Aucune requête possible dû à +queryRunner=Outil d''exécution de requêtes +runAQuery=Exécuter une requête +runningQuery=Requête en cours +queryResultsChartSubtitle={0} entrées de données analysées en {1} secondes +dataMiningErrorMargins=Marges d''erreur +dataMiningResult=Résultat d''exploration de données +developerOptions=Options développeur +runAutomatically=Exécuter automatiquement +runAutomaticallyTooltip=Exécutez la requête automatiquement, par exemple après avoir modifié les statistiques ou le regroupement. +currentFilterSelection=Sélection du filtre actuel +plainResultsPresenter=Visualiseur de résultats bruts +multiResultsPresenter=Visualiseur de résultats multiples +columnChart=Diagramme à colonnes +columnChartWithErrorBars=Diagramme à colonnes avec barres d''erreur +errorFetchingComponentsChangedTimepoint=Erreur lors de la récupération de l''heure modifiée du composant du serveur : {0} +dataMiningComponentsHaveBeenUpdated=Les composants d''exploration de données ont été mis à jour. +dataMiningComponentsNeedReloadDialogMessage=Cliquez sur Recharger pour recharger les composants maintenant. Les données actuellement affichées seront ignorées et une requête par défaut sera exécutée.n\Cliquez sur Fermer pour ne rien faire. L''exploration de données ne fonctionnera pas correctement tant que les composants n''auront pas été rechargés. +noDimensionToGroupBySelectedError=Aucune dimension sélectionnée pour le regroupement +noDataRetrieverChainDefinitonSelectedError=Aucun récupérateur de données sélectionné +noStatisticSelectedError=Aucune statistique à calculer sélectionnée +calculateThe=Calculer le/la +statisticProvider=Fournisseur de statistiques +groupingProvider=Fournisseur de regroupements +clearSelection=Effacer la sélection +basedOn=basé sur +chooseDifferentDimensionTitle=Sélectionnez une dimension différente. +chooseDifferentDimensionMessage=Sélectionnez une dimension différente pour regrouper les résultats. +pleaseSelectADimension=Sélectionnez une dimension. +queryDefinitionProvider=Fournisseur de définitions de requêtes +dataMiningRetrieval=Récupération de données +tabbedResultsPresenter=Visualiseur de résultats avec onglets +useStringLiterals=Utiliser littéraux de chaîne pour les noms de types diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ja.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ja.properties new file mode 100644 index 00000000000..9485c61b942 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ja.properties @@ -0,0 +1,44 @@ +dataMiningSettings=データマイニング設定 +runPredefinedQuery=事前定義クエリを実行 +viewQueryDefinition=クエリ定義の表示 +selectPredefinedQuery=事前定義クエリを選択 +errorRunningDataMiningQuery=クエリ実行でエラーが発生しました +predefinedQueryRunner=事前定義クエリランナー +useClassGetNameTooltip=コードベースでの変更に対してより堅牢ですが、コードスニペットはクラスが利用できる範囲でのみ使用できます。 +useClassGetName=タイプ名に class.getName() を使用 +useStringLiteralsTooltip=このコードスニペットはどこでも使用できますが、コードベースが変更される場合は中断します。 +queryDefinitionViewer=クエリ定義ビューア +runAsSubstantive=実行 +queryNotValidBecause=クエリが可能でありません。理由: +queryRunner=クエリランナー +runningQuery=クエリ実行中 +queryResultsChartSubtitle={0} データエントリを {1} 秒で処理済 +dataMiningErrorMargins=エラーマージン +dataMiningResult=データマイニング結果 +developerOptions=開発者オプション +runAutomatically=自動的に実行 +runAutomaticallyTooltip=統計やグルーピングなどを変更した後にクエリを自動的に実行します。 +currentFilterSelection=現在のフィルタ選択 +plainResultsPresenter=プレーン結果表示ツール +multiResultsPresenter=複数結果表示 +columnChart=縦棒グラフ +columnChartWithErrorBars=縦棒グラフ (エラーバーあり) +errorFetchingComponentsChangedTimepoint=サーバからのコンポーネント変更済タイムポイントのフェッチでエラーが発生: {0} +dataMiningComponentsHaveBeenUpdated=データマイニングコンポーネントが更新されました +dataMiningComponentsNeedReloadDialogMessage=リロードをクリックして、コンポーネントをリロードします。これにより、現在表示されているデータが破棄され、デフォルトクエリが実行されます。\n何も行わない場合は閉じるをクリックします。データマイニングは、コンポーネントがリロードされるまでは正しく機能しません。 +noDimensionToGroupBySelectedError=グループ別にする次元が選択されていません +noDataRetrieverChainDefinitonSelectedError=データリトリーバが選択されていません +noStatisticSelectedError=計算する統計が選択されていません +calculateThe=計算: +statisticProvider=統計プロバイダ +groupingProvider=グルーピングプロバイダ +clearSelection=選択のクリア +basedOn=基準 +chooseDifferentDimensionTitle=異なる次元の選択 +chooseDifferentDimensionMessage=結果をグルーピングするための異なる次元を選択してください +pleaseSelectADimension=次元を選択してください +queryDefinitionProvider=クエリ定義プロバイダ +dataMiningRetrieval=データ取得 +tabbedResultsPresenter=タブ結果表示ツール +useStringLiterals=タイプ名に文字列リテラルを使用 + diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_pt.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_pt.properties new file mode 100644 index 00000000000..11bf7091546 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_pt.properties @@ -0,0 +1,44 @@ +dataMiningSettings=Configurações de data mining +runPredefinedQuery=Executar consulta predefinida +viewQueryDefinition=Ver definição da consulta +selectPredefinedQuery=Selecionar consulta predefinida +errorRunningDataMiningQuery=Ocorreu um erro ao executar a consulta +predefinedQueryRunner=Executor de consulta predefinida +useClassGetNameTooltip=Mais robusto em relação às modificações na base do código, mas o trecho do código só pode ser utilizado no âmbito em que as classes estão disponíveis. +useClassGetName=Utilizar Class.getName() para nomes de tipo +useStringLiteralsTooltip=O trecho do código pode ser utilizado em qualquer local, mas será quebrado se a base do código for modificada. +queryDefinitionViewer=Visualizador de definição da consulta +runAsSubstantive=Competir +queryNotValidBecause=Nenhuma consulta possível, pois +queryRunner=Executor de consulta +runAQuery=Executar uma consulta +runningQuery=Executando consulta +queryResultsChartSubtitle=Percorreu {0} entradas de dados em {1} segundos +dataMiningErrorMargins=Margens de erro +dataMiningResult=Resultado de data mining +developerOptions=Opções do desenvolvedor +runAutomatically=Executar automaticamente +runAutomaticallyTooltip=Execute a consulta automaticamente, após modificar, por exemplo, a estatística ou o agrupamento. +currentFilterSelection=Seleção de filtro atual +plainResultsPresenter=Apresentador de resultados simples +multiResultsPresenter=Apresentador de vários resultados +columnChart=Diagrama de colunas +columnChartWithErrorBars=Diagrama de colunas com barras de erros +errorFetchingComponentsChangedTimepoint=Erro ao chamar data/hora modificada de componentes do servidor: {0} +dataMiningComponentsHaveBeenUpdated=Os componentes de data mining foram atualizados +dataMiningComponentsNeedReloadDialogMessage=Clicar em Recarregar para recarregar os componentes agora. Isto irá descartar os dados exibidos atualmente e executar uma consulta padrão.\nClicar em Fechar para não efetuar nada. O data mining não irá funcionar corretamente até ser efetuado o recarregamento dos componentes. +noDimensionToGroupBySelectedError=Nenhuma dimensão pela qual efetuar o agrupamento selecionada +noDataRetrieverChainDefinitonSelectedError=Nenhum recuperador de dados selecionado +noStatisticSelectedError=Não foi selecionada uma estatística para calcular +calculateThe=Calcular +statisticProvider=Fornecedor da estatística +groupingProvider=Fornecedor do agrupamento +clearSelection=Anular seleção +basedOn=com base em +chooseDifferentDimensionTitle=Selecionar dimensão diferente +chooseDifferentDimensionMessage=Selecionar uma dimensão diferente para os resultados do agrupamento +pleaseSelectADimension=Selecione uma dimensão +queryDefinitionProvider=Fornecedor da definição da consulta +dataMiningRetrieval=Obtenção de dados +tabbedResultsPresenter=Apresentador de resultados por fichas +useStringLiterals=Utilizar literais de cadeia para nomes de tipo diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ru.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ru.properties new file mode 100644 index 00000000000..6a127569369 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ru.properties @@ -0,0 +1,44 @@ +dataMiningSettings=Параметры добычи данных +runPredefinedQuery=Выполнить готовый запрос +viewQueryDefinition=Просмотреть определение запроса +selectPredefinedQuery=Выбрать готовый запрос +errorRunningDataMiningQuery=При выполнении запроса возникла ошибка +predefinedQueryRunner=Средство выполнения готовых запросов +useClassGetNameTooltip=Более надежно по сравнению с изменениями в основании кода, но фрагмент кода может быть использован только в области с доступными классами. +useClassGetName=Использовать Class.getName() для имен типов +useStringLiteralsTooltip=Фрагмент кода может использоваться где угодно, но будет нарушен в случае изменения основания кода. +queryDefinitionViewer=Средство просмотра определения запроса +runAsSubstantive=Выполнить +queryNotValidBecause=Запрос невозможен, так как +queryRunner=Выполнение запроса +runAQuery=Выполнить запрос +runningQuery=Выполнение запроса +queryResultsChartSubtitle=Обработано {0} зап. данных за {1} с +dataMiningErrorMargins=Пределы погрешности +dataMiningResult=Результат добычи данных +developerOptions=Параметры разработчика +runAutomatically=Выполнить автоматически +runAutomaticallyTooltip=Автоматически выполнять запрос после изменения, например, статистики или группирования. +currentFilterSelection=Текущий выбор фильтра +plainResultsPresenter=Презентатор простых результатов +multiResultsPresenter=Презентатор множества результатов +columnChart=Столбчатая диаграмма +columnChartWithErrorBars=Столбчатая диаграмма с планками погрешностей +errorFetchingComponentsChangedTimepoint=Ошибка при вызове отметки времени изменения компонентов с сервера: {0} +dataMiningComponentsHaveBeenUpdated=Компоненты добычи данных обновлены. +dataMiningComponentsNeedReloadDialogMessage=Щелкните ''Перезагрузить'', чтобы перезагрузить компоненты сейчас. Текущее отображение данных будет сброшено с выполнением запроса по умолчанию. Добыча данных не будет работать правильно до перезагрузки компонентов. +noDimensionToGroupBySelectedError=Не выбрано базовое измерение для группировки +noDataRetrieverChainDefinitonSelectedError=Не выбрано средство извлечения данных +noStatisticSelectedError=Не выбрана статистика для расчета +calculateThe=Рассчитать +statisticProvider=Поставщик статистики +groupingProvider=Поставщик группирования +clearSelection=Очистить выбор +basedOn=на базе +chooseDifferentDimensionTitle=Выберите другое измерение +chooseDifferentDimensionMessage=Выберите другое измерение для группирования результатов +pleaseSelectADimension=Выберите измерение +queryDefinitionProvider=Поставщик определения запроса +dataMiningRetrieval=Извлечение данных +tabbedResultsPresenter=Презентатор результатов со вкладками +useStringLiterals=Использовать строковые литералы для имен типов diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_zh.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_zh.properties new file mode 100644 index 00000000000..678a3f30f3f --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_zh.properties @@ -0,0 +1,44 @@ +dataMiningSettings=数据挖掘设置 +runPredefinedQuery=运行预定义的查询 +viewQueryDefinition=查看查询定义 +selectPredefinedQuery=选择预定义的查询 +errorRunningDataMiningQuery=运行查询期间出错 +predefinedQueryRunner=预定义的查询执行器 +useClassGetNameTooltip=更灵活应对代码库的更改，但是代码片段只能在级别可用的范围内使用。 +useClassGetName=将 Class.getName() 用于类型名称 +useStringLiteralsTooltip=代码片段可在任意位置使用，当如果基本代码更改，其将中断。 +queryDefinitionViewer=查询定义查看器 +runAsSubstantive=运行 +queryNotValidBecause=无法查询，原因： +queryRunner=查询执行器 +runAQuery=运行查询 +runningQuery=运行查询 +queryResultsChartSubtitle={1}秒内处理{0}个数据条目 +dataMiningErrorMargins=误差容限 +dataMiningResult=数据挖掘结果 +developerOptions=开发人员选项 +runAutomatically=自动运行 +runAutomaticallyTooltip=在更改统计或分组后，自动运行查询。 +currentFilterSelection=当前筛选器选择 +plainResultsPresenter=纯结果展示区 +multiResultsPresenter=多结果展示区 +columnChart=柱状图 +columnChartWithErrorBars=含误差线的柱状图 +errorFetchingComponentsChangedTimepoint=从服务器获取组件更改的时间点出错：{0} +dataMiningComponentsHaveBeenUpdated=数据挖掘组件已更新 +dataMiningComponentsNeedReloadDialogMessage=点击“重新加载”，立即重新加载组件。这将放弃当前显示的数据，并运行默认查询。\n点击“关闭”不执行任何操作。在重新加载组件前，数据挖掘不能正常工作。 +noDimensionToGroupBySelectedError=未选择分组方式尺寸 +noDataRetrieverChainDefinitonSelectedError=未选择数据检索器 +noStatisticSelectedError=未选择待计算的统计 +calculateThe=计算 +statisticProvider=统计提供方 +groupingProvider=分组提供方 +clearSelection=清除选择 +basedOn=基于 +chooseDifferentDimensionTitle=选择不同的维度 +chooseDifferentDimensionMessage=为分组结果选择不同的维度 +pleaseSelectADimension=请选择维度 +queryDefinitionProvider=查询定义提供方 +dataMiningRetrieval=数据检索 +tabbedResultsPresenter=选项卡式结果展示区 +useStringLiterals=将字符串文本用于类型名称 diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java index f3d503aec33..da78d2ee15f 100755 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java @@ -47,7 +47,6 @@ public interface StringMessages extends Messages { String reload(); String empty(); String error(); - String kilometers(); String meters(); String nauticalMiles(); @@ -58,4 +57,30 @@ public interface StringMessages extends Messages { String minutes(); String seconds(); String milliseconds(); + + String run(); + String copyToClipboard(); + String code(); + String floatNumber(); + String integer(); + String plainText(); + String groupName(); + String valueAscending(); + String valueDescending(); + String sortBy(); + String groupAverageAscending(); + String groupAverageDescending(); + String groupMedianAscending(); + String groupMedianDescending(); + String choosePresentation(); + String shownDecimals(); + String elements(long count); + String resultsChart(); + String cantDisplayDataOfType(String resultType); + String groupBy(); + String angleInDegree(); + String angleInRadian(); + String centralAngleInRadian(); + String centralAngleInDegree(); + } diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties index 915b3157ef3..4e6fbe98602 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties @@ -40,3 +40,28 @@ hours=Hours minutes=Minutes seconds=Seconds milliseconds=Milliseconds +run=Run +copyToClipboard=Copy to Clipboard +code=Code +floatNumber=Float +integer=Integer +plainText=Plain Text +groupName=Group Name +valueAscending=Value (Ascending) +valueDescending=Value (Descending) +sortBy=Sort by +groupAverageAscending=Group Average (Ascending) +groupAverageDescending=Group Average (Descending) +groupMedianAscending=Group Median (Ascending) +groupMedianDescending=Group Median (Descending) +choosePresentation=Choose Presentation +shownDecimals=Shown Decimals +elements={0} elements +resultsChart=Results Chart +cantDisplayDataOfType=Can''t display data of type {0} +groupBy=Group by +angleInDegree=Angle in degree +angleInRadian=Angle in radian +centralAngleInRadian=Central angle in radian +centralAngleInDegree=Central angle in degree + diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties index 0a101c08348..83c0f65ef98 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties @@ -40,3 +40,27 @@ hours=Stunden minutes=Minuten seconds=Sekunden milliseconds=Millisekunden +run=Ausführen +copyToClipboard=In die Zwischenablage kopieren +code=Code +floatNumber=Gleitkommazahl +integer=Ganzzahl +plainText=Einfacher Text +groupName=Gruppename +valueAscending=Wert (Aufsteigend) +valueDescending=Wert (Absteigend) +groupAverageAscending=Gruppe Durchschnitt (Aufsteigend) +groupAverageDescending=Gruppe Durchschnitt (Absteigend) +groupMedianAscending=Gruppe Median (Aufsteigend) +groupMedianDescending=Gruppe Median (Absteigend) +choosePresentation=Wähle Präsentation +shownDecimals=Angezeigte Nachkommastellen +elements={0} Elemente +resultsChart=Ergebnis-Diagramm +cantDisplayDataOfType=Daten des Typs {0} können nicht dargestellt werden +sortBy=Sortiert nach +groupBy=Gruppieren nach +angleInDegree=Winkel in Grad +angleInRadian=Winkel in Radiant +centralAngleInRadian=Kreiswinkel in Radiant +centralAngleInDegree=Kreiswinkel in Grad diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_es.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_es.properties index 166e9f80aef..2a55e39d9f8 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_es.properties +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_es.properties @@ -40,3 +40,27 @@ hours=Horas minutes=Minutos seconds=Segundos milliseconds=Milisegundos +run=Ejecutar +copyToClipboard=Copiar a portapapeles +code=Código +floatNumber=Flotador +integer=Entero +plainText=Texto sin formato +groupName=Nombre de grupo +valueAscending=Valor (ascendente) +valueDescending=Valor (descendente) +groupAverageAscending=Promedio de grupo (ascendente) +groupAverageDescending=Promedio de grupo (descendente) +groupMedianAscending=Mediana de grupo (ascendente) +groupMedianDescending=Mediana de grupo (descendente) +choosePresentation=Seleccionar presentación +shownDecimals=Decimales mostrados +elements={0} elementos +resultsChart=Gráfico de resultados +cantDisplayDataOfType=No se pueden mostrar datos del tipo {0} +sortBy=Ordenado por +groupBy=Agrupar por +angleInDegree=Ángulo en grado +angleInRadian=Ángulo en radián +centralAngleInRadian=Ángulo central en radián +centralAngleInDegree=Ángulo central en grado diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_fr.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_fr.properties index 0ff0cc7bc75..92ba0b4433f 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_fr.properties +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_fr.properties @@ -40,3 +40,27 @@ hours=Heures minutes=Minutes seconds=Secondes milliseconds=Millisecondes +run=Exécuter +copyToClipboard=Copier dans le presse-papiers +code=Code +floatNumber=Flottant +integer=Entier +plainText=Texte brut +groupName=Nom du groupe +valueAscending=Valeur (ascendant) +valueDescending=Valeur (descendant) +sortBy=Trier par +groupAverageAscending=Moyenne du groupe (ascendant) +groupAverageDescending=Moyenne du groupe (descendant) +groupMedianAscending=Médiane du groupe (ascendant) +groupMedianDescending=Médiane du groupe (descendant) +choosePresentation=Sélectionner la présentation +shownDecimals=Nombre de décimales +elements={0} éléments +resultsChart=Graphique des résultats +cantDisplayDataOfType=Affichage des données du type {0} impossible +groupBy=Regrouper par +angleInDegree=Angle en degrés +angleInRadian=Angle en radians +centralAngleInRadian=Angle au centre en radians +centralAngleInDegree=Angle au centre en degrés diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ja.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ja.properties index d807631b022..6aae64b2d0b 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ja.properties +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ja.properties @@ -40,3 +40,29 @@ hours=時間 minutes=分 seconds=秒 milliseconds=ミリ秒 +run=実行 +copyToClipboard=クリップボードにコピー +code=コード +floatNumber=浮動小数点型 +integer=整数 +plainText=プレーンテキスト +groupName=グループ名 +valueAscending=値 (昇順) +valueDescending=値 (降順) +sortBy=ソートキー +groupAverageAscending=グループ平均 (昇順) +groupAverageDescending=グループ平均 (降順) +groupMedianAscending=グループ中央値 (昇順) +groupMedianDescending=グループ中央値 (降順) +choosePresentation=プレゼンテーション選択 +shownDecimals=小数点表示 +elements={0} 要素 +resultsChart=結果チャート +cantDisplayDataOfType={0} タイプのデータは表示できません。 +groupBy=グループキー +angleInDegree=角度 (度) +angleInRadian=角度 (ラジアン) +centralAngleInRadian=中心角 (度) +centralAngleInDegree=中心角 (ラジアン) + + diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_pt.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_pt.properties index 5fff1652bbe..ef5161b0356 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_pt.properties +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_pt.properties @@ -40,3 +40,27 @@ hours=Horas minutes=Minutos seconds=Segundos milliseconds=Milissegundos +run=Competir +copyToClipboard=Copiar para o clipboard +code=Código +floatNumber=Margem +integer=Número inteiro +plainText=Texto simples +groupName=Nome do grupo +valueAscending=Valor (crescente) +valueDescending=Valor (decrescente) +sortBy=Ordenar por +groupAverageAscending=Média do grupo (crescente) +groupAverageDescending=Média do grupo (decrescente) +groupMedianAscending=Mediana do grupo (crescente) +groupMedianDescending=Mediana do grupo (decrescente) +choosePresentation=Selecionar apresentação +shownDecimals=Decimais exibidos +elements={0} elementos +resultsChart=Diagrama de resultados +cantDisplayDataOfType=Não é possível exibir dados do tipo {0} +groupBy=Agrupar por +angleInDegree=Ângulo em graus +angleInRadian=Ângulo em radianos +centralAngleInRadian=Ângulo central em radianos +centralAngleInDegree=Ângulo central em graus diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ru.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ru.properties index fc39bd04a95..cbc55195bed 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ru.properties +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_ru.properties @@ -14,13 +14,20 @@ remoteProcedureCall=Удаленный вызов процедуры serverReplies=Ответы сервера errorCommunicatingWithServer=Ошибка связи с сервером configuration=Конфигурация -settingsId=Ид. настроек +settings=Параметры settingsForComponent={0} — параметры pleaseSelect=Выберите sharedSettingsLink=Связать с настройками resetToDefault=Восстановить настройки по умолчанию +resetToDefaultInProgress=Выполняется сброс... settingsRemoved=Восстановлены настройки по умолчанию settingsRemovedError=Не удалось восстановить настройки по умолчанию +details=Подробности +filterBy=Фильтровать по +noDataFound=Данные не найдены +results=Результаты +analyze=Анализировать +reload=Перезагрузить empty=Пусто error=Ошибка kilometers=Километры @@ -32,4 +39,28 @@ days=Дни hours=Часы minutes=Минуты seconds=Секунды -milliseconds=Миллисекунды \ No newline at end of file +milliseconds=Миллисекунды +run=Выполнить +copyToClipboard=Копировать в буфер обмена +code=Код +floatNumber=Плавающее +integer=Целое +plainText=Простой текст +groupName=Название группы +valueAscending=Значение (по возрастанию) +valueDescending=Значение (по убыванию) +sortBy=Сортировать по +groupAverageAscending=Среднее группы (по возрастанию) +groupAverageDescending=Среднее группы (по убыванию) +groupMedianAscending=Медиана группы (по возрастанию) +groupMedianDescending=Медиана группы (по убыванию) +choosePresentation=Выберите представление +shownDecimals=Отображаемые десятичные разряды +elements={0} элем. +resultsChart=Диаграмма результатов +cantDisplayDataOfType=Невозможно отобразить данные типа {0} +groupBy=Группировать по +angleInDegree=Угол в градусах +angleInRadian=Угол в радианах +centralAngleInRadian=Центральный угол в градусах +centralAngleInDegree=Центральный угол в радианах diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_zh.properties b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_zh.properties index 97522149320..7391a53ac11 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_zh.properties +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_zh.properties @@ -39,4 +39,28 @@ days=天 hours=小时 minutes=分钟 seconds=秒 -milliseconds=毫秒 \ No newline at end of file +milliseconds=毫秒 +run=运行 +copyToClipboard=复制到剪贴板 +code=代码 +floatNumber=浮点数 +integer=整数 +plainText=纯文本 +groupName=分组名称 +valueAscending=值（递增） +valueDescending=值（递减） +sortBy=排序方式 +groupAverageAscending=分组平均值（递增） +groupAverageDescending=分组平均值（递减） +groupMedianAscending=分组中值（递增） +groupMedianDescending=分组中值（递减） +choosePresentation=选择介绍 +shownDecimals=显示小数 +elements={0}元素 +resultsChart=结果记录 +cantDisplayDataOfType=无法显示类型为{0}的数据 +groupBy=分组方式 +angleInDegree=角度（度） +angleInRadian=角度（弧度） +centralAngleInRadian=圆心角（弧度） +centralAngleInDegree=圆心角（度） From 959041a757ff00751fcff26943381e895d5a42db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Wed, 18 Apr 2018 17:13:54 +0200 Subject: [PATCH 08/63] added GWT support and extracted resources --- java/com.sap.sse.datamining.ui/.classpath | 1 + java/com.sap.sse.datamining.ui/.project | 11 +++++++++++ .../com.google.appengine.eclipse.core.prefs | 3 +++ .../.settings/com.google.gwt.eclipse.core.prefs | 2 ++ .../sap/sse/datamining/ui/images/arrow_left.png | Bin 0 -> 330 bytes .../sap/sse/datamining/ui/images/arrow_right.png | Bin 0 -> 353 bytes .../com/sap/sse/datamining/ui/images/close.png | Bin 0 -> 304 bytes .../sse/datamining/ui/images/magnifier_small.png | Bin 0 -> 438 bytes .../sse/datamining/ui/images/plusicon_small.png | Bin 0 -> 337 bytes .../sse/datamining/ui/DataMiningResources.java | 10 +++++----- 10 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 java/com.sap.sse.datamining.ui/.settings/com.google.appengine.eclipse.core.prefs create mode 100644 java/com.sap.sse.datamining.ui/.settings/com.google.gwt.eclipse.core.prefs create mode 100644 java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_left.png create mode 100644 java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_right.png create mode 100644 java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/close.png create mode 100644 java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/magnifier_small.png create mode 100644 java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/plusicon_small.png diff --git a/java/com.sap.sse.datamining.ui/.classpath b/java/com.sap.sse.datamining.ui/.classpath index ab3cb64a076..a9e09244c3f 100644 --- a/java/com.sap.sse.datamining.ui/.classpath +++ b/java/com.sap.sse.datamining.ui/.classpath @@ -3,6 +3,7 @@ + diff --git a/java/com.sap.sse.datamining.ui/.project b/java/com.sap.sse.datamining.ui/.project index 75e565d8fe7..6d2dc52604f 100644 --- a/java/com.sap.sse.datamining.ui/.project +++ b/java/com.sap.sse.datamining.ui/.project @@ -20,9 +20,20 @@ + + com.google.gdt.eclipse.core.webAppProjectValidator + + + + + com.google.gwt.eclipse.core.gwtProjectValidator + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + com.google.gwt.eclipse.core.gwtNature diff --git a/java/com.sap.sse.datamining.ui/.settings/com.google.appengine.eclipse.core.prefs b/java/com.sap.sse.datamining.ui/.settings/com.google.appengine.eclipse.core.prefs new file mode 100644 index 00000000000..bbc4057855b --- /dev/null +++ b/java/com.sap.sse.datamining.ui/.settings/com.google.appengine.eclipse.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +googleCloudSqlEnabled=false +localDevMySqlEnabled=true diff --git a/java/com.sap.sse.datamining.ui/.settings/com.google.gwt.eclipse.core.prefs b/java/com.sap.sse.datamining.ui/.settings/com.google.gwt.eclipse.core.prefs new file mode 100644 index 00000000000..f23a7529805 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/.settings/com.google.gwt.eclipse.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +entryPointModules= diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_left.png b/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_left.png new file mode 100644 index 0000000000000000000000000000000000000000..9b14c51b2f72f94dca058fc4efa02cd41d967396 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X-gvq=hFF|lI{7p=W1vX;-~Za&lTs8FkIl|7n8(?h?xL2g zn5CoB(R#Iir{P?~euM7y=l+(S5C2{m^Df|KDsx=KyN$VeTb|W(PpCKZKK?tN>4}u_ z8b0%mPpwzw-4|v{%-Z}_Q*5_!)oWqrwW&{639oovzAXD3hwzzg>Lp@bj9Lq3UYoP7 z*Kktb3jeZY0gPuOCamEzjCgmD-)tI)C!qT^@XflMg-o+D-8q)sI$@K4hYP6Zoe*;j zb7xlum*|BvAA0`nXzq?{ikO^!XJ~DFh8}XWG#QmS?@51Nl;#H{s0$v*Y@g%`g0d}v)+8akf7YN zH-HON#+iP(q%|f13ChjM3UGnS&UssGsZ<~PU6hUCC*T5=g)y9cQ=v9OALX*?04`8j z6q(B4B+w2gtOZZm&%#I)yTMn;y;^_^RCdlozIAzs>9Ps9KxLf!$42;Pj9R3-Y>kq7 z8+dcnB8jV<$k!>JHpEpH1-B{rkGv|7ZuZy%9x$Lp7c2Lm00000NkvXXu0mjf=AV=e literal 0 HcmV?d00001 diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/close.png b/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/close.png new file mode 100644 index 0000000000000000000000000000000000000000..af73b332739f3b30bbc8061f19eec825afb59ee8 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?slj7I;J!GcfQS24TkI`72U@f)XXJ5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66 zdZwwZMyWtG3q4&NLp08pPTVMZM1jXSHpqZy@~Wi^P8diwJ-a75ooU+-O%9cqNzd6P zOh`SwA&jf*l#_tN(P;g<~ zwlJ~1*oAdpO+%Gd%Ie*@A-Px#32;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0VhdBK~yNuV_<-TdZz!34A?KoPHYP=8%nt=AUA>3cjQoR=F zB7`M1g+K-K5iSS%=tTARngF4w=rMxwVfo5E)4y{(M z(X7p=ehK1r@*;awuKGgtznUM_@2fuob^igt}>}U zR{ghTS}BStO!XY~eDyrJ>>&SCidP>3nlh=Fn*kT7m#aArG-YNlCr%|*($$A*o>eO| g;0BeVm3nEc0ECT)^X=kb%707*qoM6N<$g3y4u2><{9 literal 0 HcmV?d00001 diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/plusicon_small.png b/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/plusicon_small.png new file mode 100644 index 0000000000000000000000000000000000000000..bcc17669bb05c63713c20b7daa8753daa9adc975 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;x#X;^) zj5kl})B`yR$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a z5n0T@z%2;EjP)t;6M=#fC9V-A!TD(=<%vb93~dIox?sjWt-KsD1m zT^vI+&YzuR$aO?PfZ_B1M@>=(`G2r@Ys)9h)aaPIKyj%U*TZQ`c*~>i`YLX+Xg%z= z-f@{c=jlxfEmf>e9_K7uE@&t8WUtj+8rK+fOEqI{ui@)mRqvy-mx^S+-Ii+*;$_S6 zd*A%$H}zf}t!-ae{LXR4bIE<&>d$53 Date: Thu, 19 Apr 2018 12:07:22 +0200 Subject: [PATCH 09/63] renamed to client module --- .../META-INF/MANIFEST.MF | 4 +- .../SailingGWT sdm.launch | 1 + .../AbstractSailingResultsPresenter.java | 2 +- .../ui/datamining/DataMiningEntryPoint.java | 16 +++---- .../DataMiningSettingsInfoManagerImpl.java | 4 +- .../TabbedSailingResultsPresenter.java | 6 +-- .../gwt/ui/server/DataMiningServiceImpl.java | 2 +- .../com/sap/sailing/gwt/ui/DataMining.gwt.xml | 3 +- .../org.eclipse.core.resources.prefs | 16 +++---- .../META-INF/MANIFEST.MF | 13 +++--- .../build.properties | 5 ++- .../sap/sse/datamining/SSEDataMining.gwt.xml | 15 +++++++ .../AbstractDataMiningComponent.java | 2 +- .../AggregatorDefinitionChangedListener.java | 2 +- .../AggregatorDefinitionProvider.java | 2 +- .../AnchorDataMiningSettingsControl.java | 2 +- .../DataMiningComponentProvider.java | 2 +- .../ui/{ => client}/DataMiningResources.java | 2 +- .../ui/{ => client}/DataMiningService.java | 2 +- .../{ => client}/DataMiningServiceAsync.java | 2 +- .../DataMiningSettingsControl.java | 2 +- .../{ => client}/DataMiningSettingsInfo.java | 2 +- .../DataMiningSettingsInfoManager.java | 2 +- ...trieverChainDefinitionChangedListener.java | 2 +- .../DataRetrieverChainDefinitionProvider.java | 2 +- .../ExtractionFunctionChangedListener.java | 2 +- .../ExtractionFunctionProvider.java | 2 +- .../FilterSelectionChangedListener.java | 2 +- .../FilterSelectionPresenter.java | 2 +- .../{ => client}/FilterSelectionProvider.java | 2 +- .../{ => client}/GroupingChangedListener.java | 2 +- .../ui/{ => client}/GroupingProvider.java | 2 +- .../ManagedDataMiningQueriesCounter.java | 2 +- .../QueryDefinitionChangedListener.java | 2 +- .../{ => client}/QueryDefinitionProvider.java | 2 +- .../ui/{ => client}/QueryRunner.java | 4 +- .../ui/{ => client}/ResultsPresenter.java | 2 +- .../ResultsPresenterWithControls.java | 2 +- .../StatisticChangedListener.java | 2 +- .../ui/{ => client}/StatisticProvider.java | 2 +- .../ui/{ => client}/StringMessages.java | 2 +- .../ui/{ => client}/StringMessages.properties | 0 .../{ => client}/StringMessages_de.properties | 0 .../{ => client}/StringMessages_es.properties | 0 .../{ => client}/StringMessages_fr.properties | 0 .../{ => client}/StringMessages_ja.properties | 0 .../{ => client}/StringMessages_pt.properties | 0 .../{ => client}/StringMessages_ru.properties | 0 .../{ => client}/StringMessages_zh.properties | 0 .../ui/{ => client}/WithControls.java | 2 +- .../developer/PredefinedQueryRunner.java | 8 ++-- .../developer/QueryDefinitionParser.java | 2 +- .../developer/QueryDefinitionViewer.java | 8 ++-- .../ManagedDataMiningQueryCallback.java | 4 +- ...SimpleManagedDataMiningQueriesCounter.java | 4 +- .../execution/SimpleQueryRunner.java | 20 ++++----- .../AbstractNumericResultsPresenter.java | 16 +++---- .../AbstractResultsPresenter.java | 6 +-- .../AbstractTabbedResultsPresenter.java | 12 ++--- .../presentation/MultiResultsPresenter.java | 8 ++-- .../PlainFilterSelectionPresenter.java | 14 +++--- .../presentation/PlainResultsPresenter.java | 2 +- .../presentation/ResultsChart.java | 2 +- .../AbstractNumericDataProvider.java | 4 +- ...NumericDataProviderWithStaticMappings.java | 2 +- .../AverageWithStatsDataProvider.java | 4 +- .../dataproviders/BearingDataProvider.java | 4 +- .../DataProvidersPrecedenceList.java | 2 +- .../dataproviders/DistanceDataProvider.java | 4 +- .../dataproviders/DurationDataProvider.java | 4 +- .../dataproviders/NumberDataProvider.java | 4 +- .../AbstractQueryDefinitionProvider.java | 10 ++--- ...nctionAndAggregatorDefinitionProvider.java | 18 ++++---- .../MultiDimensionalGroupingProvider.java | 12 ++--- .../QueryDefinitionProviderWithControls.java | 44 +++++++++---------- .../RetrieverLevelSettingsComponent.java | 4 +- ...eDataRetrieverChainDefinitionProvider.java | 16 +++---- .../SuggestBoxStatisticProvider.java | 22 +++++----- .../ControllableMultiSelectionModel.java | 2 +- .../DimensionFilterSelectionProvider.java | 14 +++--- .../selection/filter/FilterTable.css | 0 .../filter/FilterTableResources.java | 2 +- .../filter/FilterableSelectionTable.java | 4 +- ...RetrieverChainFilterSelectionProvider.java | 16 +++---- ...RetrieverLevelFilterSelectionProvider.java | 6 +-- .../settings/AdvancedDataMiningSettings.java | 2 +- ...ncedDataMiningSettingsDialogComponent.java | 4 +- .../settings/QueryRunnerSettings.java | 2 +- .../QueryRunnerSettingsDialogComponent.java | 4 +- 89 files changed, 243 insertions(+), 222 deletions(-) create mode 100644 java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/AbstractDataMiningComponent.java (95%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/AggregatorDefinitionChangedListener.java (85%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/AggregatorDefinitionProvider.java (91%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/AnchorDataMiningSettingsControl.java (99%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataMiningComponentProvider.java (94%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataMiningResources.java (94%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataMiningService.java (98%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataMiningServiceAsync.java (98%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataMiningSettingsControl.java (88%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataMiningSettingsInfo.java (90%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataMiningSettingsInfoManager.java (74%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataRetrieverChainDefinitionChangedListener.java (86%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/DataRetrieverChainDefinitionProvider.java (95%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/ExtractionFunctionChangedListener.java (82%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/ExtractionFunctionProvider.java (90%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/FilterSelectionChangedListener.java (68%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/FilterSelectionPresenter.java (82%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/FilterSelectionProvider.java (94%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/GroupingChangedListener.java (66%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/GroupingProvider.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/ManagedDataMiningQueriesCounter.java (76%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/QueryDefinitionChangedListener.java (83%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/QueryDefinitionProvider.java (93%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/QueryRunner.java (73%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/ResultsPresenter.java (92%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/ResultsPresenterWithControls.java (81%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StatisticChangedListener.java (81%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StatisticProvider.java (88%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages.java (98%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages.properties (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages_de.properties (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages_es.properties (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages_fr.properties (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages_ja.properties (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages_pt.properties (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages_ru.properties (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/StringMessages_zh.properties (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/WithControls.java (81%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/developer/PredefinedQueryRunner.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/developer/QueryDefinitionParser.java (99%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/developer/QueryDefinitionViewer.java (95%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/execution/ManagedDataMiningQueryCallback.java (89%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/execution/SimpleManagedDataMiningQueriesCounter.java (77%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/execution/SimpleQueryRunner.java (90%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/AbstractNumericResultsPresenter.java (88%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/AbstractResultsPresenter.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/AbstractTabbedResultsPresenter.java (94%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/MultiResultsPresenter.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/PlainFilterSelectionPresenter.java (93%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/PlainResultsPresenter.java (99%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/ResultsChart.java (99%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/dataproviders/AbstractNumericDataProvider.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java (95%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/dataproviders/AverageWithStatsDataProvider.java (98%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/dataproviders/BearingDataProvider.java (91%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/dataproviders/DataProvidersPrecedenceList.java (92%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/dataproviders/DistanceDataProvider.java (95%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/dataproviders/DurationDataProvider.java (93%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/presentation/dataproviders/NumberDataProvider.java (94%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/AbstractQueryDefinitionProvider.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java (94%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/MultiDimensionalGroupingProvider.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/QueryDefinitionProviderWithControls.java (92%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/RetrieverLevelSettingsComponent.java (93%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/SimpleDataRetrieverChainDefinitionProvider.java (95%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/SuggestBoxStatisticProvider.java (97%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/filter/ControllableMultiSelectionModel.java (98%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/filter/DimensionFilterSelectionProvider.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/filter/FilterTable.css (100%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/filter/FilterTableResources.java (83%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/filter/FilterableSelectionTable.java (98%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/filter/ListRetrieverChainFilterSelectionProvider.java (96%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/selection/filter/RetrieverLevelFilterSelectionProvider.java (98%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/settings/AdvancedDataMiningSettings.java (93%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/settings/AdvancedDataMiningSettingsDialogComponent.java (93%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/settings/QueryRunnerSettings.java (92%) rename java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/{ => client}/settings/QueryRunnerSettingsDialogComponent.java (93%) diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF index 773d1172942..ed917794a7e 100644 --- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF @@ -36,7 +36,6 @@ Require-Bundle: com.sap.sailing.domain, com.sap.sse.common, com.sap.sse.datamining.shared, com.sap.sse.datamining, - com.sap.sse.datamining.ui, com.sap.sailing.xrr.schema, com.sap.sailing.xrr.structureimport, com.sap.sse.security, @@ -58,7 +57,8 @@ Require-Bundle: com.sap.sailing.domain, com.sap.sailing.expeditionconnector, com.sap.sailing.expeditionconnector.common, org.mp4parser.isoparser;bundle-version="1.9.31", - com.sap.sailing.domain.windfinderadapter + com.sap.sailing.domain.windfinderadapter, + com.sap.sse.datamining.ui;bundle-version="1.0.0" Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator Bundle-ActivationPolicy: lazy Import-Package: javax.servlet;version="3.1.0", diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index 91d87dbb354..ef5e302a8e1 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -56,6 +56,7 @@ + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java index b33f64e307b..387634395be 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java @@ -2,7 +2,7 @@ package com.sap.sailing.gwt.ui.datamining; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.settings.Settings; -import com.sap.sse.datamining.ui.presentation.AbstractResultsPresenter; +import com.sap.sse.datamining.ui.client.presentation.AbstractResultsPresenter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java index a75a1c970e6..d791f130425 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java @@ -18,14 +18,14 @@ import com.sap.sailing.gwt.ui.client.RemoteServiceMappingConstants; import com.sap.sailing.gwt.ui.datamining.presentation.TabbedSailingResultsPresenter; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.UUIDDataMiningSession; -import com.sap.sse.datamining.ui.AnchorDataMiningSettingsControl; -import com.sap.sse.datamining.ui.DataMiningService; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.DataMiningSettingsControl; -import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; -import com.sap.sse.datamining.ui.ResultsPresenter; -import com.sap.sse.datamining.ui.execution.SimpleQueryRunner; -import com.sap.sse.datamining.ui.selection.QueryDefinitionProviderWithControls; +import com.sap.sse.datamining.ui.client.AnchorDataMiningSettingsControl; +import com.sap.sse.datamining.ui.client.DataMiningService; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.client.DataMiningSettingsInfoManager; +import com.sap.sse.datamining.ui.client.ResultsPresenter; +import com.sap.sse.datamining.ui.client.execution.SimpleQueryRunner; +import com.sap.sse.datamining.ui.client.selection.QueryDefinitionProviderWithControls; import com.sap.sse.gwt.client.EntryPointHelper; import com.sap.sse.gwt.client.shared.components.ComponentResources; import com.sap.sse.gwt.resources.Highcharts; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java index 3c9417825ad..fbb65ea3c07 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManagerImpl.java @@ -16,8 +16,8 @@ import com.sap.sailing.gwt.ui.polarmining.PolarDataMiningSettingsDialogComponent import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettingsImpl; import com.sap.sse.common.settings.SerializableSettings; -import com.sap.sse.datamining.ui.DataMiningSettingsInfo; -import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; +import com.sap.sse.datamining.ui.client.DataMiningSettingsInfo; +import com.sap.sse.datamining.ui.client.DataMiningSettingsInfoManager; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; public class DataMiningSettingsInfoManagerImpl implements DataMiningSettingsInfoManager { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java index a33e8717d00..16ee7db3156 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java @@ -4,9 +4,9 @@ import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.polarmining.PolarBackendResultsPresenter; import com.sap.sailing.gwt.ui.polarmining.PolarResultsPresenter; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.presentation.AbstractTabbedResultsPresenter; -import com.sap.sse.datamining.ui.presentation.MultiResultsPresenter; -import com.sap.sse.datamining.ui.presentation.ResultsChart.DrillDownCallback; +import com.sap.sse.datamining.ui.client.presentation.AbstractTabbedResultsPresenter; +import com.sap.sse.datamining.ui.client.presentation.MultiResultsPresenter; +import com.sap.sse.datamining.ui.client.presentation.ResultsChart.DrillDownCallback; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java index c93bced603e..0b7c5f6f27e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java @@ -49,7 +49,7 @@ import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.datamining.shared.impl.dto.ReducedDimensionsDTO; -import com.sap.sse.datamining.ui.DataMiningService; +import com.sap.sse.datamining.ui.client.DataMiningService; import com.sap.sse.i18n.ResourceBundleStringMessages; public class DataMiningServiceImpl extends RemoteServiceServlet implements DataMiningService { diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml index 970d0428737..54c59cf7492 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml @@ -18,12 +18,13 @@ + - + diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs index 79ca0d863f7..1c1633b69eb 100644 --- a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -encoding//src/com/sap/sse/datamining/ui/StringMessages.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/StringMessages_de.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/StringMessages_es.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/StringMessages_fr.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/StringMessages_ja.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/StringMessages_pt.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/StringMessages_ru.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/StringMessages_zh.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/client/StringMessages.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/client/StringMessages_de.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/client/StringMessages_es.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties=UTF-8 +encoding//src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties=UTF-8 diff --git a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF index 879082d4d92..9e3e8f44a1c 100644 --- a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF @@ -6,11 +6,14 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Export-Package: com.sap.sse.datamining.ui, - com.sap.sse.datamining.ui.execution, - com.sap.sse.datamining.ui.presentation, - com.sap.sse.datamining.ui.presentation.dataproviders, - com.sap.sse.datamining.ui.selection +Export-Package: com.sap.sse.datamining.ui.client, + com.sap.sse.datamining.ui.client.developer, + com.sap.sse.datamining.ui.client.execution, + com.sap.sse.datamining.ui.client.presentation, + com.sap.sse.datamining.ui.client.presentation.dataproviders, + com.sap.sse.datamining.ui.client.selection, + com.sap.sse.datamining.ui.client.selection.filter, + com.sap.sse.datamining.ui.client.settings Require-Bundle: com.sap.sse.gwt;bundle-version="1.0.0", com.sap.sse.datamining.shared;bundle-version="1.0.0", com.sap.sse.common, diff --git a/java/com.sap.sse.datamining.ui/build.properties b/java/com.sap.sse.datamining.ui/build.properties index 34d2e4d2dad..1e6a0fbf26f 100644 --- a/java/com.sap.sse.datamining.ui/build.properties +++ b/java/com.sap.sse.datamining.ui/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + resources/ output.. = bin/ bin.includes = META-INF/,\ - . + diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml b/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml new file mode 100644 index 00000000000..ee8a1329ab7 --- /dev/null +++ b/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AbstractDataMiningComponent.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java similarity index 95% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AbstractDataMiningComponent.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java index 33c39a42cca..e41ab91c3e8 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AbstractDataMiningComponent.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; import com.sap.sse.gwt.client.shared.components.AbstractComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java similarity index 85% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java index 76140c7cf89..91b95645c63 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java similarity index 91% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java index 8889b384c17..cf691a7258a 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AggregatorDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java similarity index 99% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java index 91cee6e441d..a23f8eec00f 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/AnchorDataMiningSettingsControl.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import java.util.Collection; import java.util.HashMap; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningComponentProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java similarity index 94% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningComponentProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java index a091ef53a07..78c755f272d 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningComponentProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningResources.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningResources.java similarity index 94% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningResources.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningResources.java index 0c162f83b92..9ed3a2a1fe2 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningResources.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningService.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningService.java similarity index 98% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningService.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningService.java index 32b761628b5..dcfbe1ef7ff 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningService.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningService.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import java.io.Serializable; import java.util.ArrayList; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningServiceAsync.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java similarity index 98% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningServiceAsync.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java index 148c4517f24..64ca3ff13a0 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningServiceAsync.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import java.io.Serializable; import java.util.ArrayList; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java similarity index 88% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsControl.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java index 757d2402fc6..77ea4a5da60 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsControl.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.CompositeSettings; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfo.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java similarity index 90% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfo.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java index 11c5c6dcef0..bc04c87a6f4 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfo.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfoManager.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java similarity index 74% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfoManager.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java index ffe44865a7d..8d5956a322d 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataMiningSettingsInfoManager.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; public interface DataMiningSettingsInfoManager { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java similarity index 86% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java index 9d855f220f9..fe5e2c1bb31 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java similarity index 95% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java index 326b81024eb..d6e2fda05f9 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/DataRetrieverChainDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import java.util.HashMap; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java similarity index 82% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java index e5eb37e8d19..94e5ebba6b6 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java similarity index 90% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java index 293e704a291..49b03688efc 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ExtractionFunctionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java similarity index 68% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java index 80fac3abea8..259bf6bd8c3 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; public interface FilterSelectionChangedListener { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java similarity index 82% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java index d7ec19e21fa..88aa8787e8e 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.AbstractSettings; import com.sap.sse.gwt.client.shared.components.Component; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java similarity index 94% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java index 5ec363e1fed..3161015cb61 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/FilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import java.io.Serializable; import java.util.HashMap; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingChangedListener.java similarity index 66% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingChangedListener.java index f1eb05a69d3..f6519ed9ba8 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; public interface GroupingChangedListener { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingProvider.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingProvider.java index cfb74547d4d..88af5fadb97 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/GroupingProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import java.util.Collection; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ManagedDataMiningQueriesCounter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java similarity index 76% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ManagedDataMiningQueriesCounter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java index 0d4474a227f..888f0f66539 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ManagedDataMiningQueriesCounter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; public interface ManagedDataMiningQueriesCounter { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java similarity index 83% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java index 6dcebfcb6ff..b1060457430 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java similarity index 93% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java index 9c57fd31f24..54f1b5ad05b 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryRunner.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryRunner.java similarity index 73% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryRunner.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryRunner.java index b30b7258fda..8c2b55e3be0 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/QueryRunner.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryRunner.java @@ -1,7 +1,7 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; -import com.sap.sse.datamining.ui.settings.QueryRunnerSettings; +import com.sap.sse.datamining.ui.client.settings.QueryRunnerSettings; import com.sap.sse.gwt.client.shared.components.Component; public interface QueryRunner extends QueryDefinitionChangedListener, Component { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenter.java similarity index 92% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenter.java index 414b7405dce..8fdde3f5af2 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenterWithControls.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java similarity index 81% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenterWithControls.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java index f6e2a0c4c42..dfc2ae967b9 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/ResultsPresenterWithControls.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticChangedListener.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticChangedListener.java similarity index 81% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticChangedListener.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticChangedListener.java index cb52fa5465f..aed7d381c61 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticChangedListener.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; public interface StatisticChangedListener extends DataRetrieverChainDefinitionChangedListener, ExtractionFunctionChangedListener, AggregatorDefinitionChangedListener { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticProvider.java similarity index 88% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticProvider.java index c299e23a58d..0545577a5a6 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StatisticProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.sap.sse.gwt.client.shared.components.CompositeSettings; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.java similarity index 98% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.java index ece28bfe25d..610cd1e7785 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.google.gwt.core.client.GWT; import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages.properties rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_de.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_de.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_de.properties rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_de.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_es.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_es.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_es.properties rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_es.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_fr.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_fr.properties rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ja.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ja.properties rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_pt.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_pt.properties rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ru.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_ru.properties rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_zh.properties b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/StringMessages_zh.properties rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/WithControls.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/WithControls.java similarity index 81% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/WithControls.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/WithControls.java index a1727646fcc..7ec0680401b 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/WithControls.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/WithControls.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui; +package com.sap.sse.datamining.ui.client; import com.google.gwt.user.client.ui.Widget; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/PredefinedQueryRunner.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/PredefinedQueryRunner.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java index 7526fd2d0df..a35bfa98938 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/PredefinedQueryRunner.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.developer; +package com.sap.sse.datamining.ui.client.developer; import java.io.Serializable; import java.util.ArrayList; @@ -20,9 +20,9 @@ import com.sap.sse.common.Util; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.ResultsPresenter; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.ResultsPresenter; +import com.sap.sse.datamining.ui.client.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.controls.busyindicator.SimpleBusyIndicator; import com.sap.sse.gwt.client.shared.components.Component; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionParser.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java similarity index 99% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionParser.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java index d74531c445c..f7652eee787 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionParser.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.developer; +package com.sap.sse.datamining.ui.client.developer; import java.io.Serializable; import java.util.ArrayList; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionViewer.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java similarity index 95% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionViewer.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java index d9e973de784..c2553161ae3 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/developer/QueryDefinitionViewer.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.developer; +package com.sap.sse.datamining.ui.client.developer; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; @@ -14,9 +14,9 @@ import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.TabLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; -import com.sap.sse.datamining.ui.QueryDefinitionChangedListener; -import com.sap.sse.datamining.ui.StringMessages; -import com.sap.sse.datamining.ui.developer.QueryDefinitionParser.TypeToCodeStrategy; +import com.sap.sse.datamining.ui.client.QueryDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.StringMessages; +import com.sap.sse.datamining.ui.client.developer.QueryDefinitionParser.TypeToCodeStrategy; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.ComponentWithoutSettings; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/ManagedDataMiningQueryCallback.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java similarity index 89% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/ManagedDataMiningQueryCallback.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java index 7237d67cd22..e3f772f2e99 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/ManagedDataMiningQueryCallback.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java @@ -1,11 +1,11 @@ -package com.sap.sse.datamining.ui.execution; +package com.sap.sse.datamining.ui.client.execution; import java.io.Serializable; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sap.sse.datamining.shared.data.QueryResultState; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.ManagedDataMiningQueriesCounter; +import com.sap.sse.datamining.ui.client.ManagedDataMiningQueriesCounter; public abstract class ManagedDataMiningQueryCallback implements AsyncCallback> { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleManagedDataMiningQueriesCounter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java similarity index 77% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleManagedDataMiningQueriesCounter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java index 50732fdb717..64921b4ccee 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleManagedDataMiningQueriesCounter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java @@ -1,6 +1,6 @@ -package com.sap.sse.datamining.ui.execution; +package com.sap.sse.datamining.ui.client.execution; -import com.sap.sse.datamining.ui.ManagedDataMiningQueriesCounter; +import com.sap.sse.datamining.ui.client.ManagedDataMiningQueriesCounter; public class SimpleManagedDataMiningQueriesCounter implements ManagedDataMiningQueriesCounter { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java similarity index 90% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java index af76660c82e..52fb1c77137 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/execution/SimpleQueryRunner.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.execution; +package com.sap.sse.datamining.ui.client.execution; import java.io.Serializable; @@ -10,15 +10,15 @@ import com.google.gwt.user.client.ui.Widget; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.DataMiningService; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.ManagedDataMiningQueriesCounter; -import com.sap.sse.datamining.ui.QueryDefinitionProvider; -import com.sap.sse.datamining.ui.QueryRunner; -import com.sap.sse.datamining.ui.ResultsPresenter; -import com.sap.sse.datamining.ui.settings.QueryRunnerSettings; -import com.sap.sse.datamining.ui.settings.QueryRunnerSettingsDialogComponent; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.DataMiningService; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.ManagedDataMiningQueriesCounter; +import com.sap.sse.datamining.ui.client.QueryDefinitionProvider; +import com.sap.sse.datamining.ui.client.QueryRunner; +import com.sap.sse.datamining.ui.client.ResultsPresenter; +import com.sap.sse.datamining.ui.client.settings.QueryRunnerSettings; +import com.sap.sse.datamining.ui.client.settings.QueryRunnerSettingsDialogComponent; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java similarity index 88% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java index ae7995924fa..85ef859adb3 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractNumericResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation; +package com.sap.sse.datamining.ui.client.presentation; import java.io.Serializable; import java.util.ArrayList; @@ -17,13 +17,13 @@ import com.sap.sse.common.Util.Triple; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.presentation.dataproviders.AbstractNumericDataProvider; -import com.sap.sse.datamining.ui.presentation.dataproviders.AverageWithStatsDataProvider; -import com.sap.sse.datamining.ui.presentation.dataproviders.BearingDataProvider; -import com.sap.sse.datamining.ui.presentation.dataproviders.DataProvidersPrecedenceList; -import com.sap.sse.datamining.ui.presentation.dataproviders.DistanceDataProvider; -import com.sap.sse.datamining.ui.presentation.dataproviders.DurationDataProvider; -import com.sap.sse.datamining.ui.presentation.dataproviders.NumberDataProvider; +import com.sap.sse.datamining.ui.client.presentation.dataproviders.AbstractNumericDataProvider; +import com.sap.sse.datamining.ui.client.presentation.dataproviders.AverageWithStatsDataProvider; +import com.sap.sse.datamining.ui.client.presentation.dataproviders.BearingDataProvider; +import com.sap.sse.datamining.ui.client.presentation.dataproviders.DataProvidersPrecedenceList; +import com.sap.sse.datamining.ui.client.presentation.dataproviders.DistanceDataProvider; +import com.sap.sse.datamining.ui.client.presentation.dataproviders.DurationDataProvider; +import com.sap.sse.datamining.ui.client.presentation.dataproviders.NumberDataProvider; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java index b21c3b36ec3..5e354433def 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation; +package com.sap.sse.datamining.ui.client.presentation; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; @@ -13,8 +13,8 @@ import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.ResultsPresenterWithControls; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.ResultsPresenterWithControls; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java similarity index 94% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java index f3814ca6a27..76a7cd5d3d9 100755 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/AbstractTabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation; +package com.sap.sse.datamining.ui.client.presentation; import java.util.HashMap; import java.util.Map; @@ -16,10 +16,10 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.DataMiningResources; -import com.sap.sse.datamining.ui.ResultsPresenter; -import com.sap.sse.datamining.ui.presentation.ResultsChart.DrillDownCallback; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.DataMiningResources; +import com.sap.sse.datamining.ui.client.ResultsPresenter; +import com.sap.sse.datamining.ui.client.presentation.ResultsChart.DrillDownCallback; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.controls.ScrolledTabLayoutPanel; @@ -154,7 +154,7 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractDataMiningC return "tabbedResultsPresenters"; } - protected class CloseableTabHeader extends HorizontalPanel { + public class CloseableTabHeader extends HorizontalPanel { private final HTML label; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/MultiResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/MultiResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java index 68a03925946..8d8ed7ec120 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/MultiResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation; +package com.sap.sse.datamining.ui.client.presentation; import java.util.ArrayList; import java.util.List; @@ -14,9 +14,9 @@ import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.ResultsPresenter; -import com.sap.sse.datamining.ui.presentation.ResultsChart.DrillDownCallback; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.ResultsPresenter; +import com.sap.sse.datamining.ui.client.presentation.ResultsChart.DrillDownCallback; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainFilterSelectionPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java similarity index 93% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainFilterSelectionPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java index 2140b68ed54..8a178ce9a4f 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainFilterSelectionPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation; +package com.sap.sse.datamining.ui.client.presentation; import java.io.Serializable; import java.util.ArrayList; @@ -20,12 +20,12 @@ import com.sap.sse.common.settings.AbstractSettings; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; -import com.sap.sse.datamining.ui.FilterSelectionChangedListener; -import com.sap.sse.datamining.ui.FilterSelectionPresenter; -import com.sap.sse.datamining.ui.FilterSelectionProvider; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.client.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.client.FilterSelectionPresenter; +import com.sap.sse.datamining.ui.client.FilterSelectionProvider; +import com.sap.sse.datamining.ui.client.StringMessages; import com.sap.sse.gwt.client.shared.components.AbstractComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java similarity index 99% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java index 085a30b16c0..a65e1942aa7 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/PlainResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation; +package com.sap.sse.datamining.ui.client.presentation; import java.util.ArrayList; import java.util.Collections; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/ResultsChart.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java similarity index 99% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/ResultsChart.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java index 724474ad0f6..bf0331b7245 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/ResultsChart.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation; +package com.sap.sse.datamining.ui.client.presentation; import java.util.ArrayList; import java.util.Arrays; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java index ced9dd88b63..7e851a0f388 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation.dataproviders; +package com.sap.sse.datamining.ui.client.presentation.dataproviders; import java.io.Serializable; import java.util.Collection; @@ -9,7 +9,7 @@ import java.util.function.Function; import com.sap.sse.common.Util.Triple; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.StringMessages; /** * Maps a value of type {@code T} to a numeric value for display in a chart. The mapping is parameterized by a "data diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java similarity index 95% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java index 73ad5c1aefd..5cb65ae6b86 100755 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation.dataproviders; +package com.sap.sse.datamining.ui.client.presentation.dataproviders; import java.io.Serializable; import java.util.Collection; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AverageWithStatsDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java similarity index 98% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AverageWithStatsDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java index 151ebb39d7a..7649e22708f 100755 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/AverageWithStatsDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation.dataproviders; +package com.sap.sse.datamining.ui.client.presentation.dataproviders; import java.io.Serializable; import java.util.Collection; @@ -12,7 +12,7 @@ import com.sap.sse.common.Util.Triple; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.data.AverageWithStats; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.StringMessages; /** * An {@link AverageWithStats} object can be mapped to the {@link AverageWithStats#getAverage() average} value. diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/BearingDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java similarity index 91% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/BearingDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java index 29a62c5c4c4..7a4576b4bb7 100755 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/BearingDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java @@ -1,11 +1,11 @@ -package com.sap.sse.datamining.ui.presentation.dataproviders; +package com.sap.sse.datamining.ui.client.presentation.dataproviders; import java.util.LinkedHashMap; import java.util.function.Function; import com.sap.sse.common.Bearing; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.StringMessages; public class BearingDataProvider extends AbstractNumericDataProviderWithStaticMappings { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DataProvidersPrecedenceList.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java similarity index 92% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DataProvidersPrecedenceList.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java index ddaf6170049..f7d89491fd9 100755 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DataProvidersPrecedenceList.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.presentation.dataproviders; +package com.sap.sse.datamining.ui.client.presentation.dataproviders; import java.io.Serializable; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DistanceDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java similarity index 95% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DistanceDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java index dfd4edf5e97..246d8af65e6 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DistanceDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java @@ -1,11 +1,11 @@ -package com.sap.sse.datamining.ui.presentation.dataproviders; +package com.sap.sse.datamining.ui.client.presentation.dataproviders; import java.util.LinkedHashMap; import java.util.function.Function; import com.sap.sse.common.Distance; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.StringMessages; public class DistanceDataProvider extends AbstractNumericDataProviderWithStaticMappings { diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DurationDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java similarity index 93% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DurationDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java index 601b40c1c6b..3295f97c7d5 100755 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/DurationDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java @@ -1,11 +1,11 @@ -package com.sap.sse.datamining.ui.presentation.dataproviders; +package com.sap.sse.datamining.ui.client.presentation.dataproviders; import java.util.LinkedHashMap; import java.util.function.Function; import com.sap.sse.common.Duration; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.StringMessages; public class DurationDataProvider extends AbstractNumericDataProviderWithStaticMappings { private static final String DAYS = "Days"; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/NumberDataProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java similarity index 94% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/NumberDataProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java index 8922f5841d3..9f2b62ab887 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/presentation/dataproviders/NumberDataProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java @@ -1,10 +1,10 @@ -package com.sap.sse.datamining.ui.presentation.dataproviders; +package com.sap.sse.datamining.ui.client.presentation.dataproviders; import java.util.LinkedHashMap; import java.util.function.Function; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.StringMessages; public class NumberDataProvider extends AbstractNumericDataProviderWithStaticMappings { private final static String FLOAT = "Float"; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java index 7afbf876f22..efbd8892979 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/AbstractQueryDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection; +package com.sap.sse.datamining.ui.client.selection; import java.util.ArrayList; import java.util.Collection; @@ -19,10 +19,10 @@ import com.google.gwt.user.client.ui.VerticalPanel; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.QueryDefinitionChangedListener; -import com.sap.sse.datamining.ui.QueryDefinitionProvider; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.QueryDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.QueryDefinitionProvider; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java similarity index 94% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java index 9b05469de52..32350029644 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection; +package com.sap.sse.datamining.ui.client.selection; import java.util.ArrayList; import java.util.Collection; @@ -22,14 +22,14 @@ import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.AggregatorDefinitionChangedListener; -import com.sap.sse.datamining.ui.AggregatorDefinitionProvider; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; -import com.sap.sse.datamining.ui.ExtractionFunctionChangedListener; -import com.sap.sse.datamining.ui.ExtractionFunctionProvider; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.AggregatorDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.AggregatorDefinitionProvider; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.client.ExtractionFunctionChangedListener; +import com.sap.sse.datamining.ui.client.ExtractionFunctionProvider; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java index 4c6c77da93b..768d5cedcc7 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/MultiDimensionalGroupingProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection; +package com.sap.sse.datamining.ui.client.selection; import java.util.ArrayList; import java.util.Collection; @@ -22,11 +22,11 @@ import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; -import com.sap.sse.datamining.ui.GroupingChangedListener; -import com.sap.sse.datamining.ui.GroupingProvider; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.client.GroupingChangedListener; +import com.sap.sse.datamining.ui.client.GroupingProvider; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/QueryDefinitionProviderWithControls.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java similarity index 92% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/QueryDefinitionProviderWithControls.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java index 2691dbdc14e..a27572ba74d 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/QueryDefinitionProviderWithControls.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection; +package com.sap.sse.datamining.ui.client.selection; import java.io.Serializable; import java.util.ArrayList; @@ -29,27 +29,27 @@ import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO; -import com.sap.sse.datamining.ui.AggregatorDefinitionChangedListener; -import com.sap.sse.datamining.ui.AggregatorDefinitionProvider; -import com.sap.sse.datamining.ui.DataMiningComponentProvider; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.DataMiningSettingsControl; -import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; -import com.sap.sse.datamining.ui.ExtractionFunctionChangedListener; -import com.sap.sse.datamining.ui.ExtractionFunctionProvider; -import com.sap.sse.datamining.ui.FilterSelectionChangedListener; -import com.sap.sse.datamining.ui.FilterSelectionProvider; -import com.sap.sse.datamining.ui.GroupingChangedListener; -import com.sap.sse.datamining.ui.GroupingProvider; -import com.sap.sse.datamining.ui.ResultsPresenter; -import com.sap.sse.datamining.ui.WithControls; -import com.sap.sse.datamining.ui.developer.PredefinedQueryRunner; -import com.sap.sse.datamining.ui.developer.QueryDefinitionViewer; -import com.sap.sse.datamining.ui.selection.filter.ListRetrieverChainFilterSelectionProvider; -import com.sap.sse.datamining.ui.settings.AdvancedDataMiningSettings; -import com.sap.sse.datamining.ui.settings.AdvancedDataMiningSettingsDialogComponent; +import com.sap.sse.datamining.ui.client.AggregatorDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.AggregatorDefinitionProvider; +import com.sap.sse.datamining.ui.client.DataMiningComponentProvider; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.client.DataMiningSettingsInfoManager; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.client.ExtractionFunctionChangedListener; +import com.sap.sse.datamining.ui.client.ExtractionFunctionProvider; +import com.sap.sse.datamining.ui.client.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.client.FilterSelectionProvider; +import com.sap.sse.datamining.ui.client.GroupingChangedListener; +import com.sap.sse.datamining.ui.client.GroupingProvider; +import com.sap.sse.datamining.ui.client.ResultsPresenter; +import com.sap.sse.datamining.ui.client.WithControls; +import com.sap.sse.datamining.ui.client.developer.PredefinedQueryRunner; +import com.sap.sse.datamining.ui.client.developer.QueryDefinitionViewer; +import com.sap.sse.datamining.ui.client.selection.filter.ListRetrieverChainFilterSelectionProvider; +import com.sap.sse.datamining.ui.client.settings.AdvancedDataMiningSettings; +import com.sap.sse.datamining.ui.client.settings.AdvancedDataMiningSettingsDialogComponent; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.dialog.DataEntryDialog; import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java similarity index 93% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java index acfccc09587..3608587ebb2 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/RetrieverLevelSettingsComponent.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java @@ -1,9 +1,9 @@ -package com.sap.sse.datamining.ui.selection; +package com.sap.sse.datamining.ui.client.selection; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java similarity index 95% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java index 7ea4d6b27fe..f4ca492b8ae 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SimpleDataRetrieverChainDefinitionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection; +package com.sap.sse.datamining.ui.client.selection; import java.util.ArrayList; import java.util.Collections; @@ -23,13 +23,13 @@ import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.DataMiningSettingsControl; -import com.sap.sse.datamining.ui.DataMiningSettingsInfo; -import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.client.DataMiningSettingsInfo; +import com.sap.sse.datamining.ui.client.DataMiningSettingsInfoManager; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionProvider; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.CompositeSettings; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java similarity index 97% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java index 78700c87a8d..c16abbae685 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/SuggestBoxStatisticProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection; +package com.sap.sse.datamining.ui.client.selection; import java.util.ArrayList; import java.util.Collection; @@ -30,16 +30,16 @@ import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.AggregatorDefinitionChangedListener; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.DataMiningSettingsControl; -import com.sap.sse.datamining.ui.DataMiningSettingsInfo; -import com.sap.sse.datamining.ui.DataMiningSettingsInfoManager; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionChangedListener; -import com.sap.sse.datamining.ui.ExtractionFunctionChangedListener; -import com.sap.sse.datamining.ui.StatisticChangedListener; -import com.sap.sse.datamining.ui.StatisticProvider; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.AggregatorDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.DataMiningSettingsControl; +import com.sap.sse.datamining.ui.client.DataMiningSettingsInfo; +import com.sap.sse.datamining.ui.client.DataMiningSettingsInfoManager; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionChangedListener; +import com.sap.sse.datamining.ui.client.ExtractionFunctionChangedListener; +import com.sap.sse.datamining.ui.client.StatisticChangedListener; +import com.sap.sse.datamining.ui.client.StatisticProvider; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.CompositeSettings; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ControllableMultiSelectionModel.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java similarity index 98% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ControllableMultiSelectionModel.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java index a031a6defa3..0214c5d534e 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ControllableMultiSelectionModel.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection.filter; +package com.sap.sse.datamining.ui.client.selection.filter; import java.util.HashMap; import java.util.HashSet; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/DimensionFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/DimensionFilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java index a384f329f88..a208629cd5f 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/DimensionFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection.filter; +package com.sap.sse.datamining.ui.client.selection.filter; import java.io.Serializable; import java.util.ArrayList; @@ -32,12 +32,12 @@ import com.sap.sse.datamining.shared.impl.GenericGroupKey; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.DataMiningResources; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.FilterSelectionChangedListener; -import com.sap.sse.datamining.ui.ManagedDataMiningQueriesCounter; -import com.sap.sse.datamining.ui.execution.ManagedDataMiningQueryCallback; -import com.sap.sse.datamining.ui.execution.SimpleManagedDataMiningQueriesCounter; +import com.sap.sse.datamining.ui.client.DataMiningResources; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.client.ManagedDataMiningQueriesCounter; +import com.sap.sse.datamining.ui.client.execution.ManagedDataMiningQueryCallback; +import com.sap.sse.datamining.ui.client.execution.SimpleManagedDataMiningQueriesCounter; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.controls.busyindicator.SimpleBusyIndicator; import com.sap.sse.gwt.client.shared.controls.AbstractObjectRenderer; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTable.css b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTable.css rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTableResources.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java similarity index 83% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTableResources.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java index 24b0092e355..e3c23ced6a4 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterTableResources.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection.filter; +package com.sap.sse.datamining.ui.client.selection.filter; import com.google.gwt.user.cellview.client.CellTable; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterableSelectionTable.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java similarity index 98% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterableSelectionTable.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java index ac27793c763..cd0332ae432 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/FilterableSelectionTable.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection.filter; +package com.sap.sse.datamining.ui.client.selection.filter; import java.io.Serializable; import java.util.ArrayList; @@ -22,7 +22,7 @@ import com.google.gwt.view.client.DefaultSelectionEventManager.SelectAction; import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.ProvidesKey; import com.google.gwt.view.client.SelectionChangeEvent; -import com.sap.sse.datamining.ui.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.client.FilterSelectionChangedListener; import com.sap.sse.gwt.client.celltable.BaseCelltable; import com.sap.sse.gwt.client.panels.AbstractFilterablePanel; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ListRetrieverChainFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java similarity index 96% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ListRetrieverChainFilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java index 2cb89d717d6..61047d5210f 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/ListRetrieverChainFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection.filter; +package com.sap.sse.datamining.ui.client.selection.filter; import java.io.Serializable; import java.util.Collections; @@ -31,13 +31,13 @@ import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.ReducedDimensionsDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; -import com.sap.sse.datamining.ui.DataRetrieverChainDefinitionProvider; -import com.sap.sse.datamining.ui.FilterSelectionChangedListener; -import com.sap.sse.datamining.ui.FilterSelectionPresenter; -import com.sap.sse.datamining.ui.FilterSelectionProvider; -import com.sap.sse.datamining.ui.presentation.PlainFilterSelectionPresenter; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.ui.client.FilterSelectionChangedListener; +import com.sap.sse.datamining.ui.client.FilterSelectionPresenter; +import com.sap.sse.datamining.ui.client.FilterSelectionProvider; +import com.sap.sse.datamining.ui.client.presentation.PlainFilterSelectionPresenter; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java similarity index 98% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java index d7a856ea234..c348b9bcc57 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/selection/filter/RetrieverLevelFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.selection.filter; +package com.sap.sse.datamining.ui.client.selection.filter; import java.io.Serializable; import java.util.ArrayList; @@ -21,8 +21,8 @@ import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; -import com.sap.sse.datamining.ui.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/AdvancedDataMiningSettings.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java similarity index 93% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/AdvancedDataMiningSettings.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java index fc6ca1c2a24..7fd8b5f1614 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/AdvancedDataMiningSettings.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.settings; +package com.sap.sse.datamining.ui.client.settings; import com.sap.sse.common.settings.AbstractSettings; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/AdvancedDataMiningSettingsDialogComponent.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java similarity index 93% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/AdvancedDataMiningSettingsDialogComponent.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java index f5887d41b4e..74b9d38ec6c 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/AdvancedDataMiningSettingsDialogComponent.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java @@ -1,10 +1,10 @@ -package com.sap.sse.datamining.ui.settings; +package com.sap.sse.datamining.ui.client.settings; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FocusWidget; import com.google.gwt.user.client.ui.Widget; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.StringMessages; import com.sap.sse.gwt.client.dialog.DataEntryDialog; import com.sap.sse.gwt.client.dialog.DataEntryDialog.Validator; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettings.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java similarity index 92% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettings.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java index ffd58dbf016..5996806ed17 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettings.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.ui.settings; +package com.sap.sse.datamining.ui.client.settings; import com.sap.sse.common.settings.AbstractSettings; diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettingsDialogComponent.java b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java similarity index 93% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettingsDialogComponent.java rename to java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java index 8232604154d..e20d8115d44 100644 --- a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/settings/QueryRunnerSettingsDialogComponent.java +++ b/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java @@ -1,10 +1,10 @@ -package com.sap.sse.datamining.ui.settings; +package com.sap.sse.datamining.ui.client.settings; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FocusWidget; import com.google.gwt.user.client.ui.Widget; -import com.sap.sse.datamining.ui.StringMessages; +import com.sap.sse.datamining.ui.client.StringMessages; import com.sap.sse.gwt.client.dialog.DataEntryDialog; import com.sap.sse.gwt.client.dialog.DataEntryDialog.Validator; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; From 8c4426c26fce58896efb80f065a004f4df927fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Thu, 19 Apr 2018 15:57:47 +0200 Subject: [PATCH 10/63] tired to fix launch bug.. --- java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch | 1 + java/com.sap.sse.datamining.ui/.classpath | 2 +- java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF | 1 + .../resources/com/sap/sse/datamining/SSEDataMining.gwt.xml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index ef5e302a8e1..f41f1349905 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -56,6 +56,7 @@ + diff --git a/java/com.sap.sse.datamining.ui/.classpath b/java/com.sap.sse.datamining.ui/.classpath index a9e09244c3f..b247c0e698a 100644 --- a/java/com.sap.sse.datamining.ui/.classpath +++ b/java/com.sap.sse.datamining.ui/.classpath @@ -1,9 +1,9 @@ - + diff --git a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF index 9e3e8f44a1c..493e4ecaee5 100644 --- a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF @@ -18,3 +18,4 @@ Require-Bundle: com.sap.sse.gwt;bundle-version="1.0.0", com.sap.sse.datamining.shared;bundle-version="1.0.0", com.sap.sse.common, org.moxieapps.gwt.highcharts;bundle-version="1.6.0" +Automatic-Module-Name: com.sap.sse.datamining.ui diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml b/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml index ee8a1329ab7..774b08a8d97 100644 --- a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml +++ b/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml @@ -1,6 +1,7 @@ + From 520c4bd9de7898005e22ccf7079e685457956b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Fri, 20 Apr 2018 12:43:47 +0200 Subject: [PATCH 11/63] branch is back to normal, local tests running correctly --- java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch | 4 ++-- .../sap/sailing/gwt/ui/client/StringMessages.java | 2 -- .../SailingServer (No Proxy).launch | 2 +- java/com.sap.sse.datamining.ui/.classpath | 8 ++++---- java/com.sap.sse.datamining.ui/.gitignore | 1 - .../.settings/org.eclipse.core.resources.prefs | 9 --------- .../.settings/org.eclipse.jdt.core.prefs | 5 ----- .../.settings/org.eclipse.pde.core.prefs | 4 ++++ .../com.sap.sse.datamining.ui/META-INF/MANIFEST.MF | 13 +++++++------ java/com.sap.sse.datamining.ui/build.properties | 6 +++--- java/com.sap.sse.datamining.ui/pom.xml | 13 ------------- .../ui/client/AbstractDataMiningComponent.java | 0 .../AggregatorDefinitionChangedListener.java | 0 .../ui/client/AggregatorDefinitionProvider.java | 0 .../ui/client/AnchorDataMiningSettingsControl.java | 0 .../ui/client/DataMiningComponentProvider.java | 0 .../datamining/ui/client/DataMiningResources.java | 0 .../datamining/ui/client/DataMiningService.java | 0 .../ui/client/DataMiningServiceAsync.java | 0 .../ui/client/DataMiningSettingsControl.java | 0 .../ui/client/DataMiningSettingsInfo.java | 0 .../ui/client/DataMiningSettingsInfoManager.java | 0 ...ataRetrieverChainDefinitionChangedListener.java | 0 .../DataRetrieverChainDefinitionProvider.java | 0 .../client/ExtractionFunctionChangedListener.java | 0 .../ui/client/ExtractionFunctionProvider.java | 0 .../ui/client/FilterSelectionChangedListener.java | 0 .../ui/client/FilterSelectionPresenter.java | 0 .../ui/client/FilterSelectionProvider.java | 0 .../ui/client/GroupingChangedListener.java | 0 .../sse/datamining/ui/client/GroupingProvider.java | 0 .../ui/client/ManagedDataMiningQueriesCounter.java | 0 .../ui/client/QueryDefinitionChangedListener.java | 0 .../ui/client/QueryDefinitionProvider.java | 0 .../sap/sse/datamining/ui/client/QueryRunner.java | 0 .../sse/datamining/ui/client/ResultsPresenter.java | 0 .../ui/client/ResultsPresenterWithControls.java | 0 .../ui/client/StatisticChangedListener.java | 0 .../datamining/ui/client/StatisticProvider.java | 0 .../sse/datamining/ui/client/StringMessages.java | 0 .../datamining/ui/client/StringMessages.properties | 0 .../ui/client/StringMessages_de.properties | 0 .../ui/client/StringMessages_es.properties | 0 .../ui/client/StringMessages_fr.properties | 0 .../ui/client/StringMessages_ja.properties | 0 .../ui/client/StringMessages_pt.properties | 0 .../ui/client/StringMessages_ru.properties | 0 .../ui/client/StringMessages_zh.properties | 0 .../sap/sse/datamining/ui/client/WithControls.java | 0 .../ui/client/developer/PredefinedQueryRunner.java | 0 .../ui/client/developer/QueryDefinitionParser.java | 0 .../ui/client/developer/QueryDefinitionViewer.java | 0 .../execution/ManagedDataMiningQueryCallback.java | 0 .../SimpleManagedDataMiningQueriesCounter.java | 0 .../ui/client/execution/SimpleQueryRunner.java | 0 .../AbstractNumericResultsPresenter.java | 0 .../presentation/AbstractResultsPresenter.java | 0 .../AbstractTabbedResultsPresenter.java | 0 .../client/presentation/MultiResultsPresenter.java | 0 .../PlainFilterSelectionPresenter.java | 0 .../client/presentation/PlainResultsPresenter.java | 0 .../ui/client/presentation/ResultsChart.java | 0 .../dataproviders/AbstractNumericDataProvider.java | 0 ...tractNumericDataProviderWithStaticMappings.java | 0 .../AverageWithStatsDataProvider.java | 0 .../dataproviders/BearingDataProvider.java | 0 .../dataproviders/DataProvidersPrecedenceList.java | 0 .../dataproviders/DistanceDataProvider.java | 0 .../dataproviders/DurationDataProvider.java | 0 .../dataproviders/NumberDataProvider.java | 0 .../selection/AbstractQueryDefinitionProvider.java | 0 ...ionFunctionAndAggregatorDefinitionProvider.java | 0 .../MultiDimensionalGroupingProvider.java | 0 .../QueryDefinitionProviderWithControls.java | 0 .../selection/RetrieverLevelSettingsComponent.java | 0 ...SimpleDataRetrieverChainDefinitionProvider.java | 0 .../selection/SuggestBoxStatisticProvider.java | 0 .../filter/ControllableMultiSelectionModel.java | 0 .../filter/DimensionFilterSelectionProvider.java | 0 .../ui/client/selection/filter/FilterTable.css | 0 .../selection/filter/FilterTableResources.java | 0 .../selection/filter/FilterableSelectionTable.java | 0 .../ListRetrieverChainFilterSelectionProvider.java | 0 .../RetrieverLevelFilterSelectionProvider.java | 0 .../settings/AdvancedDataMiningSettings.java | 0 .../AdvancedDataMiningSettingsDialogComponent.java | 0 .../ui/client/settings/QueryRunnerSettings.java | 0 .../QueryRunnerSettingsDialogComponent.java | 0 .../com/sap/sse/datamining/SSEDataMining.gwt.xml | 0 .../sap/sse/datamining/ui/images/arrow_left.png | Bin .../sap/sse/datamining/ui/images/arrow_right.png | Bin .../com/sap/sse/datamining/ui/images/close.png | Bin .../sse/datamining/ui/images/magnifier_small.png | Bin .../sse/datamining/ui/images/plusicon_small.png | Bin .../src/com/sap/sse/gwt/SSESharedGWT.gwt.xml | 3 +++ 95 files changed, 24 insertions(+), 46 deletions(-) delete mode 100644 java/com.sap.sse.datamining.ui/.gitignore delete mode 100644 java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs create mode 100644 java/com.sap.sse.datamining.ui/.settings/org.eclipse.pde.core.prefs delete mode 100644 java/com.sap.sse.datamining.ui/pom.xml rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataMiningResources.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataMiningService.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/GroupingChangedListener.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/GroupingProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/QueryRunner.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/ResultsPresenter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StatisticChangedListener.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StatisticProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages.properties (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages_de.properties (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages_es.properties (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages_fr.properties (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages_ja.properties (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages_pt.properties (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages_ru.properties (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/StringMessages_zh.properties (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/WithControls.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java (100%) mode change 100755 => 100644 rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java (100%) mode change 100755 => 100644 rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java (100%) mode change 100755 => 100644 rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java (100%) mode change 100755 => 100644 rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java (100%) mode change 100755 => 100644 rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java (100%) mode change 100755 => 100644 rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java (100%) rename java/com.sap.sse.datamining.ui/src/{ => main/java}/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java (100%) rename java/com.sap.sse.datamining.ui/{ => src/main}/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml (100%) rename java/com.sap.sse.datamining.ui/{ => src/main}/resources/com/sap/sse/datamining/ui/images/arrow_left.png (100%) rename java/com.sap.sse.datamining.ui/{ => src/main}/resources/com/sap/sse/datamining/ui/images/arrow_right.png (100%) rename java/com.sap.sse.datamining.ui/{ => src/main}/resources/com/sap/sse/datamining/ui/images/close.png (100%) rename java/com.sap.sse.datamining.ui/{ => src/main}/resources/com/sap/sse/datamining/ui/images/magnifier_small.png (100%) rename java/com.sap.sse.datamining.ui/{ => src/main}/resources/com/sap/sse/datamining/ui/images/plusicon_small.png (100%) diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index f41f1349905..611a42bb0f5 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -56,8 +56,8 @@ - - + + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index aa049ed7772..30c43a6c917 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -1470,9 +1470,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String defaultName(); String exampleTextForName(); String flightsCount(@PluralCount(DefaultRule_1_0n.class) int count); - String queryDefinitionViewer(); String resultsFoundForSearch(@PluralCount(DefaultRule_1_0n.class) int amount, String searchText); - String useClassGetName(); String errorLoadingDataWithTryAgain(); String addGalleryPhoto(); String addStageImage(); diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch index 9c666ad1841..199a3dc95bd 100644 --- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch +++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch @@ -36,5 +36,5 @@ - + diff --git a/java/com.sap.sse.datamining.ui/.classpath b/java/com.sap.sse.datamining.ui/.classpath index b247c0e698a..46e988fba74 100644 --- a/java/com.sap.sse.datamining.ui/.classpath +++ b/java/com.sap.sse.datamining.ui/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/java/com.sap.sse.datamining.ui/.gitignore b/java/com.sap.sse.datamining.ui/.gitignore deleted file mode 100644 index ae3c1726048..00000000000 --- a/java/com.sap.sse.datamining.ui/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 1c1633b69eb..00000000000 --- a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/com/sap/sse/datamining/ui/client/StringMessages.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/client/StringMessages_de.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/client/StringMessages_es.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties=UTF-8 -encoding//src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties=UTF-8 diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs index a698e59674f..0c68a61dca8 100644 --- a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs +++ b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.8 diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 00000000000..e8ff8be0bab --- /dev/null +++ b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +pluginProject.equinox=false +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF index 493e4ecaee5..6e9a40d0b25 100644 --- a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF @@ -5,7 +5,12 @@ Bundle-SymbolicName: com.sap.sse.datamining.ui Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ActivationPolicy: lazy +Require-Bundle: com.sap.sse.gwt, + com.sap.sse.common, + com.sap.sse.datamining.shared, + org.moxieapps.gwt.highcharts, + com.google.gwt.servlet;bundle-version="2.8.2", + com.google.gwt.user;bundle-version="2.8.2";resolution:=optional Export-Package: com.sap.sse.datamining.ui.client, com.sap.sse.datamining.ui.client.developer, com.sap.sse.datamining.ui.client.execution, @@ -14,8 +19,4 @@ Export-Package: com.sap.sse.datamining.ui.client, com.sap.sse.datamining.ui.client.selection, com.sap.sse.datamining.ui.client.selection.filter, com.sap.sse.datamining.ui.client.settings -Require-Bundle: com.sap.sse.gwt;bundle-version="1.0.0", - com.sap.sse.datamining.shared;bundle-version="1.0.0", - com.sap.sse.common, - org.moxieapps.gwt.highcharts;bundle-version="1.6.0" -Automatic-Module-Name: com.sap.sse.datamining.ui +Bundle-ActivationPolicy: lazy diff --git a/java/com.sap.sse.datamining.ui/build.properties b/java/com.sap.sse.datamining.ui/build.properties index 1e6a0fbf26f..cc04202b130 100644 --- a/java/com.sap.sse.datamining.ui/build.properties +++ b/java/com.sap.sse.datamining.ui/build.properties @@ -1,5 +1,5 @@ -source.. = src/,\ - resources/ +source.. = src/main/java/,\ + src/main/resources/ output.. = bin/ bin.includes = META-INF/,\ - + . diff --git a/java/com.sap.sse.datamining.ui/pom.xml b/java/com.sap.sse.datamining.ui/pom.xml deleted file mode 100644 index 31cd313d40d..00000000000 --- a/java/com.sap.sse.datamining.ui/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.sap.sse.datamining.ui - eclipse-plugin - \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningResources.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningResources.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningResources.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningResources.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningService.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningService.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningService.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningService.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/GroupingChangedListener.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingChangedListener.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/GroupingChangedListener.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/GroupingProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/GroupingProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryRunner.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryRunner.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryRunner.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryRunner.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StatisticChangedListener.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticChangedListener.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StatisticChangedListener.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StatisticProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StatisticProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.properties rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_de.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_de.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_de.properties rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_de.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_es.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_es.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_es.properties rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_es.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_fr.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_fr.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_ja.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_ja.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_pt.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_pt.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_ru.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_ru.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_zh.properties similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_zh.properties diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/WithControls.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/WithControls.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/WithControls.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/WithControls.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java old mode 100755 new mode 100644 similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java old mode 100755 new mode 100644 similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java old mode 100755 new mode 100644 similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java old mode 100755 new mode 100644 similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java old mode 100755 new mode 100644 similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java old mode 100755 new mode 100644 similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java similarity index 100% rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml similarity index 100% rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_left.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/arrow_left.png similarity index 100% rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_left.png rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/arrow_left.png diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_right.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/arrow_right.png similarity index 100% rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_right.png rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/arrow_right.png diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/close.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/close.png similarity index 100% rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/close.png rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/close.png diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/magnifier_small.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/magnifier_small.png similarity index 100% rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/magnifier_small.png rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/magnifier_small.png diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/plusicon_small.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/plusicon_small.png similarity index 100% rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/plusicon_small.png rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/plusicon_small.png diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml index f454ba6bc60..29bdd11e390 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml @@ -1,6 +1,9 @@ + + + From 97be670c2b3deef1f25ff88fe983d1fb3d01e77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Fri, 20 Apr 2018 13:25:17 +0200 Subject: [PATCH 12/63] fixed imports --- .../sailing/domain/common/dto/LeaderboardEntryDTO.java | 2 +- .../CompleteManeuverCurveWithEstimationData.java | 1 + ...neuverCurveBoundariesWithDetailedManeuverLossImpl.java | 4 ++-- .../common/client/suggestion/RegattaSuggestOracle.java | 1 + .../sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java | 2 +- .../EstimationDataSerializationDeserializationTest.java | 8 ++++---- ...teManeuverCurveWithEstimationDataJsonDeserializer.java | 4 ++-- .../impl/ManeuverCurveBoundariesJsonDeserializer.java | 2 +- ...oundariesWithDetailedManeuverLossJsonDeserializer.java | 2 +- ...eCourseAndSpeedWithEstimationDataJsonDeserializer.java | 2 +- ...neuverMainCurveWithEstimationDataJsonDeserializer.java | 2 +- ...eBoundariesWithDetailedManeuverLossJsonSerializer.java | 2 +- 12 files changed, 17 insertions(+), 15 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java index 2f1cb0c04c8..1e7a07418d4 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java @@ -3,11 +3,11 @@ package com.sap.sailing.domain.common.dto; import java.io.Serializable; import java.util.List; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.impl.MeterDistance; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.impl.MillisecondsDurationImpl; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java index 4c280b007e9..bd41ca3d81a 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java @@ -5,6 +5,7 @@ import com.sap.sailing.domain.common.Positioned; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.tracking.CompleteManeuverCurve; import com.sap.sse.common.Bearing; +import com.sap.sse.common.TimePoint; import com.sap.sse.common.Timed; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Dimension; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveBoundariesWithDetailedManeuverLossImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveBoundariesWithDetailedManeuverLossImpl.java index e3f824797eb..8a695564a12 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveBoundariesWithDetailedManeuverLossImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveBoundariesWithDetailedManeuverLossImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.maneuverdetection.impl; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.maneuverdetection.ManeuverCurveBoundariesWithDetailedManeuverLoss; import com.sap.sailing.domain.tracking.impl.ManeuverCurveBoundariesImpl; +import com.sap.sse.common.Distance; +import com.sap.sse.common.Speed; import com.sap.sse.common.TimePoint; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/RegattaSuggestOracle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/RegattaSuggestOracle.java index dbac93da52c..ebcde83f206 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/RegattaSuggestOracle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/suggestion/RegattaSuggestOracle.java @@ -9,6 +9,7 @@ import com.sap.sailing.gwt.ui.client.RegattasDisplayer; import com.sap.sailing.gwt.ui.shared.RegattaDTO; import com.sap.sse.common.Util; import com.sap.sse.common.util.NaturalComparator; +import com.sap.sse.gwt.client.suggestion.AbstractListSuggestOracle; public class RegattaSuggestOracle extends AbstractListSuggestOracle implements RegattasDisplayer { public RegattaSuggestOracle() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java index 303493d0e04..441634e399b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java @@ -57,7 +57,6 @@ import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.MultiSelectionModel; import com.google.gwt.view.client.SelectionChangeEvent; import com.google.gwt.view.client.SelectionChangeEvent.Handler; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.DetailType; import com.sap.sailing.domain.common.InvertibleComparator; import com.sap.sailing.domain.common.LeaderboardNameConstants; @@ -100,6 +99,7 @@ import com.sap.sailing.gwt.ui.client.shared.filter.LeaderboardFetcher; import com.sap.sailing.gwt.ui.common.client.DateAndTimeFormatterUtil; import com.sap.sailing.gwt.ui.leaderboard.DetailTypeColumn.LegDetailField; import com.sap.sailing.gwt.ui.shared.RaceTimesInfoDTO; +import com.sap.sse.common.Bearing; import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; import com.sap.sse.common.Util; diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java index 523b9d53840..4ff3b4c0ce6 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java @@ -10,13 +10,9 @@ import org.junit.Test; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.impl.BoatClassImpl; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.BoatHullType; -import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; @@ -40,7 +36,11 @@ import com.sap.sailing.server.gateway.serialization.impl.ManeuverCurveWithUnstab import com.sap.sailing.server.gateway.serialization.impl.ManeuverMainCurveWithEstimationDataJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.PositionJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.WindJsonSerializer; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; +import com.sap.sse.common.Speed; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompleteManeuverCurveWithEstimationDataJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompleteManeuverCurveWithEstimationDataJsonDeserializer.java index f08a6befba2..6c7dfe3c4b0 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompleteManeuverCurveWithEstimationDataJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompleteManeuverCurveWithEstimationDataJsonDeserializer.java @@ -2,10 +2,8 @@ package com.sap.sailing.server.gateway.deserialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.maneuverdetection.CompleteManeuverCurveWithEstimationData; import com.sap.sailing.domain.maneuverdetection.ManeuverCurveWithUnstableCourseAndSpeedWithEstimationData; import com.sap.sailing.domain.maneuverdetection.ManeuverMainCurveWithEstimationData; @@ -13,6 +11,8 @@ import com.sap.sailing.domain.maneuverdetection.impl.CompleteManeuverCurveWithEs import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.serialization.impl.CompleteManeuverCurveWithEstimationDataJsonSerializer; +import com.sap.sse.common.Bearing; +import com.sap.sse.common.impl.DegreeBearingImpl; /** * diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveBoundariesJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveBoundariesJsonDeserializer.java index 7d0853493ba..559e1029574 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveBoundariesJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveBoundariesJsonDeserializer.java @@ -2,7 +2,6 @@ package com.sap.sailing.server.gateway.deserialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; @@ -10,6 +9,7 @@ import com.sap.sailing.domain.tracking.impl.ManeuverCurveBoundariesImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; import com.sap.sailing.server.gateway.serialization.impl.ManeuverCurveBoundariesJsonSerializer; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveBoundariesWithDetailedManeuverLossJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveBoundariesWithDetailedManeuverLossJsonDeserializer.java index d4572fe5c64..30d268ee221 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveBoundariesWithDetailedManeuverLossJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveBoundariesWithDetailedManeuverLossJsonDeserializer.java @@ -2,13 +2,13 @@ package com.sap.sailing.server.gateway.deserialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.maneuverdetection.ManeuverCurveBoundariesWithDetailedManeuverLoss; import com.sap.sailing.domain.maneuverdetection.impl.ManeuverCurveBoundariesWithDetailedManeuverLossImpl; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.serialization.impl.ManeuverCurveBoundariesWithDetailedManeuverLossJsonSerializer; +import com.sap.sse.common.Distance; /** * diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataJsonDeserializer.java index 8fad44f0368..0aef71ffeb3 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataJsonDeserializer.java @@ -3,7 +3,6 @@ package com.sap.sailing.server.gateway.deserialization.impl; import org.json.simple.JSONObject; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.maneuverdetection.ManeuverCurveBoundariesWithDetailedManeuverLoss; import com.sap.sailing.domain.maneuverdetection.ManeuverCurveWithUnstableCourseAndSpeedWithEstimationData; @@ -11,6 +10,7 @@ import com.sap.sailing.domain.maneuverdetection.impl.ManeuverCurveWithUnstableCo import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.serialization.impl.ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataJsonSerializer; import com.sap.sse.common.Duration; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsDurationImpl; /** diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java index 26af22c461d..1542bd2095a 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java @@ -2,13 +2,13 @@ package com.sap.sailing.server.gateway.deserialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.maneuverdetection.ManeuverCurveBoundariesWithDetailedManeuverLoss; import com.sap.sailing.domain.maneuverdetection.ManeuverMainCurveWithEstimationData; import com.sap.sailing.domain.maneuverdetection.impl.ManeuverMainCurveWithEstimationDataImpl; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.serialization.impl.ManeuverMainCurveWithEstimationDataJsonSerializer; +import com.sap.sse.common.impl.DegreeBearingImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; /** diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/ManeuverCurveBoundariesWithDetailedManeuverLossJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/ManeuverCurveBoundariesWithDetailedManeuverLossJsonSerializer.java index c887e6f751d..1ba01711355 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/ManeuverCurveBoundariesWithDetailedManeuverLossJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/ManeuverCurveBoundariesWithDetailedManeuverLossJsonSerializer.java @@ -2,9 +2,9 @@ package com.sap.sailing.server.gateway.serialization.impl; import org.json.simple.JSONObject; -import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.maneuverdetection.HasDetailedManeuverLoss; import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; +import com.sap.sse.common.Distance; /** * From 34392a9485029f5c63bbd0fbc478e3dfbd63c39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Fri, 20 Apr 2018 14:02:48 +0200 Subject: [PATCH 13/63] gathered gwt datamining modules in SSEDataMining.gwt.xml --- .../resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml | 6 +++++- .../sap/sse/datamining/ui/client/DataMiningResources.java | 2 +- .../src/com/sap/sse/gwt/SSESharedGWT.gwt.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml index 54c59cf7492..03c0af83135 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml @@ -13,12 +13,16 @@ + + + + diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningResources.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningResources.java index 9ed3a2a1fe2..9a4b5bcde4e 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningResources.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningResources.java @@ -3,7 +3,7 @@ package com.sap.sse.datamining.ui.client; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; -public interface DataMiningResources extends ClientBundle { // TODO extract resource files +public interface DataMiningResources extends ClientBundle { @Source("com/sap/sse/datamining/ui/images/close.png") ImageResource closeIcon(); diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml index 29bdd11e390..8743a840c52 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml @@ -1,7 +1,7 @@ - + From 9fbf54efb3b732a513f465bc5d9aedf7c06bd2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Mon, 23 Apr 2018 08:53:31 +0200 Subject: [PATCH 14/63] added maven project with the respective dependencies and added it to sailing project's maven dependencies --- java/com.sap.sailing.gwt.ui/pom.xml | 6 +++ java/com.sap.sse.datamining.ui/pom.xml | 67 ++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 java/com.sap.sse.datamining.ui/pom.xml diff --git a/java/com.sap.sailing.gwt.ui/pom.xml b/java/com.sap.sailing.gwt.ui/pom.xml index f3de2df8a3a..ad9aa420785 100755 --- a/java/com.sap.sailing.gwt.ui/pom.xml +++ b/java/com.sap.sailing.gwt.ui/pom.xml @@ -116,6 +116,12 @@ ${project.version} sources + + com.sap.sailing + com.sap.sse.datamining.ui + ${project.version} + sources + diff --git a/java/com.sap.sse.datamining.ui/pom.xml b/java/com.sap.sse.datamining.ui/pom.xml new file mode 100644 index 00000000000..f885cac1e5a --- /dev/null +++ b/java/com.sap.sse.datamining.ui/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sse.datamining.ui + eclipse-plugin + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + generate-sources + + plugin-source + + + + + + + + + com.sap.sailing + com.sap.sse.common + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.datamining.shared + ${project.version} + sources + + + com.sap.sailing + com.sap.sse.gwt + ${project.version} + sources + + + org.moxieapps.gwt + org.moxieapps.gwt.highcharts + ${project.version} + sources + + + com.google.gwt + gwt-user + ${gwt.version} + + + com.google.gwt + gwt-dev + ${gwt.version} + + + From 30999982c1eceb4bf5a60557a95086c2e3aa8eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Mon, 23 Apr 2018 09:57:54 +0200 Subject: [PATCH 15/63] fixed configuration --- .../SailingDashboardsGWT sdm.launch | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch index c6adf7bec2d..a9c1dda4f80 100644 --- a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch +++ b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch @@ -22,18 +22,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + From 668ee283e90ac68422770ee063c6fe4ebdfe2d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Mon, 23 Apr 2018 10:01:35 +0200 Subject: [PATCH 16/63] added com.sap.sse.datamining.ui bundle --- java/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/java/pom.xml b/java/pom.xml index b6a3145cd62..58845c88fe1 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -87,6 +87,7 @@ com.sap.sse.gwt.adminconsole com.sap.sse.datamining com.sap.sse.datamining.shared + com.sap.sse.datamining.ui com.sap.sse.security com.sap.sse.security.ui com.sap.sse.security.userstore.mongodb From 60f3750d9a1b072512c53537ac30af86bf14ed5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Mon, 23 Apr 2018 10:19:56 +0200 Subject: [PATCH 17/63] removed unnecessary resource folder --- java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch | 1 - 1 file changed, 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index 611a42bb0f5..1fd2a0ae702 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -56,7 +56,6 @@ - From 88e692e6d774d92e8af0aaff053ed5ac5f32a436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Mon, 23 Apr 2018 10:20:07 +0200 Subject: [PATCH 18/63] fixed configuration --- java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch | 1 + 1 file changed, 1 insertion(+) diff --git a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch index 1107e49c502..6dc3f4ffd8d 100644 --- a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch +++ b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch @@ -33,6 +33,7 @@ + From b1d998f7aad224e1d89a8be444509c94aa29b970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Mon, 23 Apr 2018 15:51:34 +0200 Subject: [PATCH 19/63] changed to corret SNAPSHOT version --- java/com.sap.sse.datamining.ui/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sse.datamining.ui/pom.xml b/java/com.sap.sse.datamining.ui/pom.xml index f885cac1e5a..9cf6d6254c2 100644 --- a/java/com.sap.sse.datamining.ui/pom.xml +++ b/java/com.sap.sse.datamining.ui/pom.xml @@ -50,7 +50,7 @@ org.moxieapps.gwt org.moxieapps.gwt.highcharts - ${project.version} + 1.6.0-SNAPSHOT sources From 38f94dfd6edef0026f217952b04f2198f3a4cb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Fri, 27 Apr 2018 11:46:47 +0200 Subject: [PATCH 20/63] recreated the polar_data file because junit test was based on old serialization data which causes it to fail --- .../TabbedSailingResultsPresenter.java | 2 +- .../resources/polar_data | Bin 29122 -> 17351 bytes .../jaxrs/api/test/PolarDataResourceTest.java | 42 +++++++++++++----- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java index 16ee7db3156..1eba0bdc9e4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java @@ -21,7 +21,7 @@ public class TabbedSailingResultsPresenter extends AbstractTabbedResultsPresente } @Override - public void showResult(QueryResultDTO result) { // TODO make abstract + public void showResult(QueryResultDTO result) { if (result != null) { if (result.getResultType().equals("com.sap.sailing.polars.datamining.shared.PolarAggregation")) { CloseableTabHeader oldHeader = getSelectedHeader(); diff --git a/java/com.sap.sailing.polars.test/resources/polar_data b/java/com.sap.sailing.polars.test/resources/polar_data index d3a841ecee48d3a0c810391588f4d798b346e125..004b5dd6b5acea7a1cf2ab7535edbe321bf9ed05 100755 GIT binary patch literal 17351 zcmbVT2V4}#_g^?rRBRNnVgnUXuz;eV>^mu93L9Ro;Dz!?J;iuGQ$yFLZ^f*ha@l$2#)P8YVwOpT&$uP!9M#JdkMwM2Rz!;5) z-4KNsyziEM+v3xboAy-0FsgZ$N~6j$Wew75(p5@EqhO*Lxxu7o!YFr4N>*u<0y&K8 zs5KeYDn=j17#RhtJcdzaWTt7g`b@1>8826=OolMZ6LUqI^}ojxr!a<5?Q{xbY`Tm= z{F;nG+AJMoR2j8;L!vfHqfncaObX>@$kdwD%6KMAo5RGKM>V8SO$|D=$|%ie4U3eU zG8pu%y~)7DYSj7R2BRvAgB+pNvkYM>z1hkXstx85gBr3Y-$Q+hv*tpRvM#^O&_c>7_}LC zIdZewl%+9Xx^pfvFu};^bjSrpDqM!9(I3q&`sHTV-#oki=GpaUXV;%Kp0k&iOI8^( zqvd&FXb3r)zTiAP)gKA`%PRS|1=3m)vanI+n{VtX3MuMgQDk8FHDc(uxUMP_XBW05cdOdzYp&B!Tr9t-xv3Ta6bt5`{8~+-0zS3{c%4S z_k(di1ouO5e*o?e!2N-^KM?mraX%FIY22sHA849?UcnJ);2Mesn)?uX+uTR1Kh%14 z>ev)v@M8l!+HHeOX(~lLlc8q}1{BUw)I-rvZ(!o|S_OKf)pyOwWx9pLu=`L(HPBl) z(MoM>4vZ$FO6?yl*9GV4EIXNf<~LYwK+#F(Sohj@hntP9lu-5&RDHEpu8fc?P_&Pt z>KQZ9xS3kD5(Nyi<<7b6(q)&cJyO=&VmyjLN)(#0)rL&Do>7`p-XN4dP{3A3>a`}_ zP$qv#;`NUjN8j0RPuZtX^)uy$1XCJ%Y>-h7<56Rznh<8oP~>Ez=7$UfX$GSnSx;dUn*#9X=H#6btWUY^e?&zp9kP04Zj8VMW591N-nOrDMfm&@){7Gkdt zfXL-?m4YAm)czAa3%{UzxhXM+MkD1yWU1J+aVYNv=dlscV~U>gwv1sjLdlqn#C#ot z4B~!Jj6fb~Bt+V9l*&k=&PX|h#U{rjN5zD3;kFgR!KMgXc_&SdrjDykq*}RgkXmlw z3K7NCT+gpYblqf6)fqzh$aOlsHjho-Otf6Xm~v2sVKP@QQJQF#TCFlL3av(olD)ez zU#C*Y)$05Nqg-z^B1%je!$n01qp>Lv)=%+)N=!APFvW*1j`i)(~T%6WvfRmo<8 zgWU%-_4#PyC~ig_H0UuqbzXVM(~`hg9IV>XcI;ChT7G{7~H5X43}y<)N_ zc~7*bBw>^*O4gR_8>Jbl(Hc=GXpAZiH6w@^so;N1s(CDbA>^UzPoZbB7>!Ym)`r|* zOvpB&IAlOetFeJCBL#gdm|l50x_7Gl>YN4h5tJddKoQiNcL^~DX!2wAN=8qP#jch; zJJYoO4;I%5>o7+IaK(Pp9QjFU~F+M>!gAwMfki*}JBN`tl* z8|b6bBLy<8KEq$GV;|$qVem(rGt*zLk*o6!Ducf; zjKM$7G9<48dBimxtBXO7LAw-1Z?tuMiP(!aw8EsipJ z5RIu<<;A9tNHArg$Sp}t4MUpw$~sP~(ijb(R5D5<)#U>;%d{vCq*5+9C^~9UX+C0P zv`KAbb+hy3oTsxx3sS;{@=)XeKeGdH?Ta!da)2N206)S3?5PX;oOi&oqxYg_JV}+K z{gz5OE3`~{x=Nu!Q2CKe?1+ufa1M0hk88)DrzpD3ZQU1JDe6$w+pd+UUJBJ;pFQFQ zMImc^gv25^&Cl#KzxSL*uh?5ZHuOzzG_Iv;X7de&3QE>{$3JWEPMPs8oZG?d=!6|N z>?>GKXg(!&_QACcAPLlEQr&h~@?h4vhQ3z?&e}MjGBjr9h|Cm%(@F==A#KvAWmNwY z_XtiriZzEcCZ|X6WJM3;g--w53+x29ta$ZhF6Gf2xnKx?aA2KXmjy>r#se++=a3BU%)!j{btISsR+B2cwH07SEIZNHm09zn2zBXaiw3@>H^)ym-lH!DP&pzvt z$I11i`>01vc3)57;{cQ1wLv0-Ji{HgSpTrXcrk-VWZKb9i7ov%gqe|FX9Jco*f@=SS*Lv1GyS{iRfB`xUQ;=2Y177rC}-!Dg{d z!h6md6TyK!#{1)cpq0RguGy^@K1zY29=-#Y%=Lt-P`jfm!yBNZ8w$T=pJ-#z!nK zG$+DcVr|x7Q`j3OnKqZb3{xiQbc|lgp0yBG#_*SP)>n1j++jWxA74#k&CO(+UWa7L zZ*%zSr&-h*sb)kfN0(-5^Bo=wl${PTM3L8BwE{usLpeH2X!Uqtj39sEv}fhd=gJ0~ z4M5Y2*{luVpR=XBaMx4Ya8@Y!!Roe)v^%Jij76tX8PyP@%^%KQYgxuqY5mE2HTJ~9 zo;cBsW4@6JtZjL-3ka`q4uZ;nu6(hWd2#qymM$_HeYV^dhq0%51}|NJS!l6l=dE8Q( z#Qpu4jws-U<8s|hBZ>jB$!M7HVM!oMFptKXFx#B*a{sXkSt740%4|6MsE}iv{oY7J z%_Fho`DXHmD2@4drExSz7pZiZV2UkE<17A)(nL;(sttY;{a=(0FR)12vNXBELjG`{ zaw6zYZI-&38ASTjOOUc1W%i-4b2VUe<>R58{<7NJzh3DxRTW$AxWN~~^Mmg3AMa`EFNQrnIq5`zf%M82?P zDUldNC?)cREu} zFy4SdDs*De&wDgJSXX4d}3PF{S%jA>-BSI`z@a# z24t=%kj|s4J6yRk2O?hH`gX7TBADK8-P9igFAyeKQJ`Yv*e_3(8wn09!&BhRmby)+ ze^fz&bo_;J`9GMcUH;JNHj329Y3Lg}X`#c<1_b=*tv?eBrT* zn)Ft%W}?@MF4G>10l7#NNT0Sh?`8*2g^ca@7MBjGfwEmipIz@>N*+(Ad5wTY;^9J z^PY(&kVU!wb<{Wr=4QK=?AA^pOtPZD$<|9xc)LUs99V{@NS(UB@N)C{h6L$wli;s! z*KU3bw?v3MTjpBR`dcXUyWV2g6xNTAxY-xe-9oK zCRtHnX=tBk?T#r34lKh{pt9!s^7?h+Ns!bYfuFvlo?BYBItX06{j`nyM?>u8N!1N^ z92NsILlnr*SM}Sn;Ny7uk24+g#Si1bTiO5hGIwXfBr6KY|DILew+%VhSca#-+6@`; zGw&aL4M&Ee&dCj(c3v zF?0rO8<5!Fe!&O z7(F<2bZ>`DSn(=)`GQxw#DE+l3S`rQ^GCMNJ_ph7*1eHM*1)`L(GPpB%O*^+qQDty z*}jk8XbBE1!&9V<`u=d@S=?4~ChNu%{C52(PnTkQH;$Ko>YFr| z1ZhWPUi#Mbk-s-`SPvd6tGw!}wn2QtL-%J1fzLzsfA1!6@G?9FmbLu0sAcpz5+oHW@YCgUliv1ewv4WRbAQi{ z4Tr&F&Fs|hC2PfiY%2yN3>jnCzjy6zn04Z*&y}^waLj3?edmqq1(U2PQiuDa&$his z?lCOGQ>0;W(xwjc%`XG-o{adF&={yL&rz5$y4ClgI7&Sq#X|qCooI zDQ`8YvL1~0+I=SCt9U423Ebe^BLSo5d+d+6v#SjwtOGEB?ZDKm6gX{ISMmQHb`?E zC4A>WVoiY~x}eR_^&nw1mfogk-K z*2oLLoEHN!QVdA?>0aZO*VnEx4!5NhKpyv>{LcZS1StaK0d%@@d6^b^D;aI z{t9S0y!FmX5~SU30^}2B;hNPq=0Fdc>eF?=PSD2OysAuDB?hEc6v#(=R>h19d;&h* zmBH;d-3Mjfo`*A6k(H(u1=c%1XDW^~6^!O(cnaKTexcX(4Kv>Zxl`b$?=4w%^FZDM z@VZ8KimXb3u?OxK-HVM71G29ukiR)P)Qvm-J9He~tvGkuCP)izIpVL=V+E6}DX@M@ zn_D9npC&l43{Qb-muIW1gGxz|)FpwRzFwJIl@K}sT4Zl7vM)LX$;X~Q%6vUX49HMX zAYb4AHDltwjnKbwmag-_X^`*LU`w|hmj#ooDX`DMdD{KOGJ*rk@DzBt;+*2^4s}V8 z_CW$a{p^BcW+PJ-1iG(V+-YHbFnYG~t!g5scBSr!0{Qmd8foyuBM_uzCKo-*14EVb zpI62n5KOYBz|N`ZdCOMB5*%2Dr@(`b*T-#j9!r9h5TT5IHT?LDn87{}usmVI^#Sui zH{->yjq%kYW|Dd?1|;<8q$_;cejcb{c;B#HUa(E}!}v+*j|d1>6u8rIVukW3d7Xh} zc#72flYZ5(rXvZm**QXEx6;E7(tx9oSvmUti7F2$t3NStMy#0gB=txX$mWl7JxyEY zL&DRN>+q^KEKa|W(5TNs!XzsSoZeg%GpAW&f&2j-vFv*GnJAW$N<@BVC;J`9G1s*Gh|GYFjhXiR?CGgWv`X8OR=~6@R zAL5mjxV|@J^*{L7`SddpAgRluKpyGu7BS~ud$3<~e$7`G69DFao$-}>H^C%p3KaZ& zv6FiydDOx(JOwId%{b<~KavDV1qd4Hz1JNRjvUm`PYvA)CSFlM@3S*1Hm+2P0g11u zKk#xnOtRn$kFwP;ZB&y&Z(~b1)UNdPc^@)NSW)23;Z?UT%E)sHmf*Mg6sUUhOApDEm%_~OGCW1|0~RgcHhZ>4v> zxpaz1A=VV=J$XlBaZE$PXe`51K-Jo-LCJ=K_dp6?dza83cQiEkGPH)?J92{Jz|(O0 zVdG^Vui7c*g%7nz3`meV!eCSH<}ghX8kgPF9V!gPr#)_Z3J|O*QVKdL?%gHMhrA3= zkA_SzS-H6c zhEG3rVY%OYSRT;m+@F;%2$QTR@T2@_YnKQz{$d%PBK5Fq|4F?GT}hC2$kzl;JEivx z>-Iq8q(|$oT^b05_nxP9X|zzxa=j%6Bz^z($aBeqy`W34@)@$siNMUhSULV}1Od{D z0vk&w436DRzSY7qJOzH1MHf1BGuNWHth1v9jr8w#nZIL4K8KF;*O*%QYCztq$(Dh$ z&WHi|xfqZ@rB4oW-o61sBmVkhbV*~Fa;wr~>RMvQSySK;Q*Y6flWPQ{c^RG}rA9^0 z@f$OaoJo6P=IK{2M@gc->jnMBxu2x`XF=ZioQWUhxr+h0MGQ##*V`ek2j|{_j=mu+ zCj=THtwYb*C9Bg32v!tWUskg<_7ma%EhM}QPl4*PC+EJO_TEJnbyd(v-|GCU`^|Av zp>>q2m((x-QnHtnC}0JZ zUt49#n(Srkf9}k^-D7@bX8t`7r!$}Teb0G6_dV}9_q})8|DMp5hzXYvVU(4GCqn-O zk%H)Ot59JSPY`W|K8_MbTM42>kyhTqNS@d?g3p(_^P~AU-=_T@{ZNL=E91UkLi zd9KCY4NtU)My^EjC_%I!DkjQB7#$`E`GV&W2BJ+ zzSxy7<%dwlhw}yD5y3*CI6^24_2GpIVkE9aTUu(E!v0?}-XT&~qP-|Y>J{e6NAl6( zF2X1gUn-Ca#gdUikLZxdm{5KI(Nq#4jEM~O;YSH$`Cf`qB>{x7L=-8IIww#QbLYi` z^U-JKF%rI4bYy~?L@J1qyF5rJrUYCCV#O>2h&Hqgt4GWDiun9c&l)aVc~YK>FeX~+ z%@;#-cqCs+H1V9si{)8I@}k47J)))jaK6~7b_I7aPZTkkm_cw59vu@E%olrw4HihG z!f-JU(Ht2Q6)mChhH+?uzEZwOgeZ^_Zl35eTBECr{>iVdwc_epE3U3Jb#<+&$;;=< z=#3UgBZl$fUC|Icbord(#Y8`(@Q*0@SAewE?!VkH;@4R%f%nHZmO9Cw${kFOO0L{jgXb{Cxj^^Z0LsZ@C@_+18i?OZj)btqvYn~&cV+p-Tek?yy zA|OS)}Mw{7XRJ>8nqZ3nuwpxcgg+lg*F(`^^J?Mk=Z=(aoE_MqFIbZbesR&;Ak zw>C_hDF21*MfZEreOtP3OZV;Qz8&4Sr~CGFzc=0QP51lI{XTTRFWv7;_Z{fI1KoF| z`;K(KAKmXq_nqjz6W#Am_xscR0d#)=-5*Hz2hx2m-RIJMlJ1j=Ur3VqJX;QsAa4i~ zNck_^VnrWCKUXd!GaJUez=$~k)U*rvL4EQVhP_{EDS*(3B}!G z$-hT{c>JuqHXE++QnaZw zrXvwd;m3=Rb6RoKO4UM2wraR2-^&Fd%)r-AU+p#j2+>1+NffD3N|<1~lvnUXwC_2^ zQyI`~hM4G7Ge)f$%99^HGC{;g6O#X+9Dx`yWHYTB+RAWHBqj7ld5`uO?kZ2Vt&kVg z22tCt6U;*wPJS|R7V@Mnkvxg~7!vXzuI+LE?&(^D-VmZ2Pb3lxOqw7PgzzFG6MUsSu~afjL~WxeFhd3CV8BZl&Wl1j zHqM2wRE**rZP@iAVj?4*`MfA8(N)D}TeF{fq5wi#o_w@L%QyB;v>l2sDbZ7f9m?my zNS~6XqRhO8C3Z`dlS55Al-d%qEC(2O8{c8o`q>$0kMv zXF_~XCwcIb^!6bShwdc38KA)HUgL1Blf(JJ1B~*mos`gbfsrr_d|-GyaXc~Ugv5NnV(&O%`%pBL>kmS}{=6bs_L!u)+>qEHss9y`_*S!Pbz-aMrEF8zt6{u|gCbI!O6y!ifR%y( z`W%dQPegzfLx2@V0CfjObIuU3=F%IFxgW>!(1IIFGz<~)!@>k10^}+)QVcbsAsSAH zbSd1mDQ`YO8aH{eUmQ=!UJeL$*`_jDM+*Wi!^fmNdqtL zFFQ1D%?X;?dkA#6q}aQ1ph0zLc(t2+2~(qE^EgmQ2@+&+TArChtCrB@VxR17^GacG z;g<5;(wCTI9TJcz>d?b!gas?9Y=e=269ubot$sWOlcYycmVk$($cQ7%nj;E^FgFnt+4bb!5r%KEL3LYqa9#6hJM^6we=0g}K1}*W^wx9rh1A`> z8uWmh@{1)uMxvmgZ1iJw71j`4^{e9rDNnOy1vi&1EXqveE|}c+VZS|uTwZ?Ulj~52 zJM9{6?YfA;B@`(YM%thySpuz3z74r)H9xN?yKQB@-OgoZ8367SFbmx9s5!m(X z`4x&DX>^|IUYJ2iSV@Wc!@P!j4Ibs`8863sk=-7D$qnEX%X{|p3Z!H)va{DNT2gWq zksTW_Vp$SFWDk7%rw>UG+;?YNBqS2Gk&Q?8&2l6|5TJW(PUoYz*hgB#lA=^%8?~&q+Gp54`*(kak3L3vf ze99`e?^=?G*jf`lgi6u1u!Tq0*=0xuX@5!Ea&k^p6j+un=$TtF0r-1ggbtPVt>Hwc zE(zEgyJ)KWZY;wp+h8Q1@ag^oeKz^AHknbBC7g|R&S=YDHb*{pI=Wgf!}M&|1td<_ zn+p?*8?`)|z7*18CVX*QR|t>#W|fz4XDIlh{Hi;;WR(f24VELG9;|udjqZkJtA7nM z%&C90()Rr&;RzMZ&W3$lwi|Zppo@ zE4rvKijhmmvtU;yqHMC)gV&jD3WjRWS0r!9($=Ubnr*gyT%S&ep-+F>cHELk$oBs< zf0I+JDxy+uP{b4DoxNG!JDp#F_O@GjpDpWygYB6o`v1FbR6Pl%XVm6J<>}p-;N0}_jQV%SLX6MA z?qxF~VXwP^>HDs_3ce`6>W(OqQ)W@|xRQ`%Ea<2;>MFtYHce~Mrl>Z)@Q704hnacJ z+_V|y803Gv)>cMTc&iPDW8)GozbFOg@VPG!HFtry!QGw`hDWKp7PmT%`g9>fUd?51 z6_}#4OJs}$9ph_?FqU&SrJam$c!BO>JPBj@{R%B2uL($r?(7|lgm2AOO60#<D z-ZV@Q&(yeUZp*0%H~zcABmYQV)amtaFVI~zb(4(`liT`e|H0KCE>nj~{3iA9I*$DA zl$x#8AT%X~({hha&D1|z^25Ip9o*0zcZdQ}DmkILbFC#O^!aJmd282Yp0wAdO3`r* zsrADpsc<7YqHDrFNU3W!^i-(wx~DLXdJ+&iN+jZoovA_-@|7?7;=JIv-mfygy8bcu z&$MMz&-9=DBY4Gf{|tg_%t{GU?A`@EF^E(=z@QwZE(d-l!)yI@I)aL0JXA^%is^xA z4-%Ho`nK=;V$Z>f382eMiz!cl`J5_Wu!ZirhEwvA8LVD=cTSc_I|!BJJc&lMw+Vh! zO}}P5fzTR%s6Z8LsB#;6+>#(Ade;@+Q~=R2E_Xp7LC?ErHAQgPD~E0^Pt9DZswSU~ zV(P9s$^XyKX?}0-A$D8|gJ4B?BPm3J<-hGQ4A90}jc|IJXWQ|PqD(?p-BDqru6iT8 zAYA^(A9?(u|ET&L6$_|B($L+<4Mw{8Oc*&BhNH-)ZqWZK!=XD(z#b^|AUa=1z`JdRNK*khZ%cnld zmJ6Q$Yb3ffPr;WJusTNR0(@OY>3X_`Mj=toaa~4T6<0t*ql5l!)Z_nUbm+g04*!1{ z^(N(Nb-6!+9aDn~<&*tSqa)?0yqc+j(NW|-jrt|lz#14Gon50ro6-&t=eW9+`b0Zz-VxGjaF?&LxO5x z4UC4$mE@$=W;Ar$|HmkwtkJ5?D8IM{R)3~)74%Ls9Ik;;EVb8W6wBcn7{yY1ZAP&i zu7Oc3wby18%i$Ur#Zr51MzI{Ofl(~A*Jc#U;TjmlQhRMiu^g^}Q7pCBW^@Ai|41k# zrd69!Y-7-1rr3T_n^A0I(7-6RU({w4+ZZ%38WL1PT5U$LjX?vW*nUx)QEX$-z$ms~ z)Mhj+vBnX`sNyKygueM@U#`%i61^X~W56Es%b$oXd7gA*g~d~J<5SxMlL!%|*OfY^ zb4uld5go;Uj}at)frFZf;_ZNcRn+|C=Y6W8#_6W8BHuCUt_fwEAN-u#znI|uYFx0~ zjzqPgvi!AiwbszEnh;s|$v4o_xF;ATx>%gPVhHZnf4#_yX^qu{ln|KJ>-OjT><^d( zt-~OY`D#c*@4_;<2W|=~h-0igdHJo#pxw=RKulb={?i2>^j$Oc;(39kTwYC1_Nc{) ztdbK`g>o&o=vIOcx+t<$oj$KAS5-AS|ePLSc8XkTFE$?^v2Eq8Xm0G%$4%w2on2TVvlwz;}Z zZ0Nf^u=pG+!RRmuEK1zyG|66!b3%+^<;gQzpGLG^G>m*7bKv{! z4(`zYK;QCxI)hbmg5?u|dYn|Xi_G&zadL4?LHZ*UC(_hKjy|e5fv#509;LUt0&nxS zoQ&wBu;EayWvdqPtOv>nKWdn0JHeGFCzd;jD#{9*JqM$ecr7n(q7^SDuWN@SP#VvnMB{#KAIk&ofAz3g! zZT`3wAK57>BVf2;dW_r9377<}!yqu|=ap&Uz5hxO^yr3Y9@?a*K_9UVZ#X%x@%pTV zYxj||v=Onf$2+KWl3ffO^%g^RlbsITnw1dT%I#m<-TFbuj=vP@&fQ4JN1`|(YUSi= z~|e$mlQ# z9Iz^USvF4bDh|E5a@w=<NA-Ic{9FyevtK#I|oWPUh{(fK(JSQoc>j7lpg}n6AG}Z%U1Y#lWgk`cN zCPC{k2psh0bZp5J)xl zj!LZ>ib>Eq3<3|9zFFbZvA<(tltbBCmn*Kd{m%FJ~K9mA@r{%1F1 z9w;F&P{)3DyA_>S2}XxOAU0;^g9ytue{oWul_%$)FML#->PF_&yY_r(;t{fHTAwdp zXD?F83A^tQ57gp>Y_R5V%Vk$cS<#mJNqa^la+fuJI@ocaDo$Rs9F<*EiLl;Evm}eaI7)Yv*=ewb)|CC(yaH zD$66P82V3h>$S0}fb~Eb0qMAnJ(ElwF$r3SLEvD=|K6ME>foFZ?28lHKk{QnpM*qil3r}?-q1w(NOhl2 zDz1+1mX?+QUB*k2HY|<;9>iB)U-ujHSP6lRr^@&K;4Q}_XdMQDd(%t1{5UcM=S1r` zD^GqZy}x$e=0niU>HU@ZFN6?m^7MY+W(gW_!qHccllJaS3q^WPb>n5B2(!n^4&$uAj3j_r0X1S``Q7L86tYQl+{`DD;|qq5s*FK%mJ?;QFv z6}Mnp|7O2c=Gb+KddGKaUn6t3k4#zxDLcso2!lSp?>%7{G4ugQ; z+R(|4p^BS%hLgsa#WXlk5|b4|-Vd3bnR3+(8j2$XmRCEf7J-=)FAoNOiBBS07UR8r@$H=2MDff0CTQe?iAi<&CAR2g(Snbe!C2 z_D}qLLhCRHTZvTjlK%VK4nAZ6l#B&?$3v9QL^*|Yc zBgukZ%MQpe30j9i;Pvv?eRnKX?5#8>x=UDj^6R&2`-ARZ1?zLow5m%FLs+GrsHAmk zO*qL>j}xQ5Aijh+c{@p*l7u)(pWDfJPNJ$fDQzrg%60{D3z{L}?rbDd$Du{55S$XpA@L1<@1O9-%L&l4V{gc31V7({# ztc6NW*z*a8rxqt4i zT>qZE6^8$^JpL+#&w8MYz`XR9D<(lNOoG;75Rjd0Hgxr1J^9GY+QAEF&kfA`a<4xD zvlkTs(^uVr;VvUvJbCkhCYMsfv?h{5Vl* z>=v@@c=ER>)2-0fd`+9janD$fl@aj0d8TU0=iaOYqr)Ju_|n*u(g;NnndXFWV&%zW zca{%)y6OY@vU+|u&wh=d)%}TWOal~WJoSpsM2T9QaDO@O3Q0g~=9=13 z!a-Gz1&c3V0+W5xU|gS^bDS1eU~R;>C9n54WIa$u;I_bg*vkg&Yx&xY4ud$?Grm5k zm~4p0i3xUQ10&0u7O8;-;J&MGBffqd%E3GEUfihfpuaa`O@d(;^TTnK8XX zcO!15AG4S}O%*3(#-7Vx@7&o})An2d&I!?ll_yj6OS4Zj+d>vyn*!ZuIeJ zlLWV9f6n($I|Q?5R$cL6=b+8TD& z&hInpfieO!C!O45G6b))(K-wQ$G3mF@pA73oDvtLEr_M=!K!s2|F;GUr#TQ7uwFQr+j1 zcgtk&%fFaFr#2Fsqo1N+0=zBl7V@3-KpBDLE+2jpUoh4f9R`8BJsNL5n{S76!oe!M zWJyMc^WyhYp`}%MV&uUe;L8h_T<}ZLgcFW>oJ{X(V1nvu*}mbQ&!d*qe_}IRb)D_% zHmjh5(3h#o_)N`EHDXLhe6=rLo3fNVU9Q_gg+}! zX00p9+jN5@zghG#l03QzHYiwdzH17ZmD0 zFU?dHCly`i9K9Yl8#+~M&-9tP2qu)>47^muV?9ttU_C#4)}W}Hm;|lEAdnxIZ&hj> zh;yQa-5-&klGX}W6-j`5PjJt5 z^Ju!>n~<$IRgsdkQxzwtT68`X7{Dhh20L5%t#W`)`|fAyCE<5$N(hWwz5Pe<_IDU3 zv<`#7nxjQm0uvVFoDjgulNaBgS@}M=9{I!J-QK89!@%a+k7oG`Hfh2MsL4t3q>9R( z1UIioMTK{LLY8{!+>FAmsyNwwCQsZrshTW4s~6b(pck0w#5k-fYKM8Cgn)OwHv3NH zK4c{r9R`8#jZ4gQ;xHmp2(V5s?^_M!dA(w(0s-Zwu6&3Wf@cI_}#$qBm`bJXJ` zy8-XQwOq8{l(|H8e}T^Ssr@R4?oqYxfPTr$?4(d{aF*>APwv$drrIrQ+U+O%gHOcdW~`5l4uinEtb^Z{U)qAli5_+zO;+w${n&NVDd<&@*<`TMnA4Z(a@sBj8J%kj7 zIJHS?tXrfBC+2E#lC3{&io+@@PQHDVG(wzgFWx*Bz2__+sqXX1b6eAbb8ovr>j|5i zbRsW+??>t4(Q#O%P#J-xjYixIw%f}3$mlQ#T*%rQxahMp9w(f^tUP(&D85iQU?3P- z=kzz;{Q?G^nYqDlmZ3^c*nLOM`(jeNLl^DEAJNNLA2$7oD<`-%Uc0K%`vodEDcIlc z*wbWPsPBKEdx>=>447XJhPd=+Jy1qKJnmzMcGHev60{D3z^>r!vL69@w>{RWyOYiq(uhFWn#66MzxjJS$8={~E$_T9FUq4jH!D@+&4uineYO-D5 zma#Y|oawAZGC$ecaOj`K(BN`UyQ~eD!6nBz!7E(#Js`VwI63NZqLoPajIbqS$6gQ2 zv@#^Pz4r8paNMRUPVU_}bY*uJdoY+BQl9^9ACR|fqRtdwW<5|wAU3SC{`~~(c@3k( zAaH1mQT)buo4+{0Pdp{Ag>wg-TMbQTnPv|w@&}JNuZDbACk@sP=ZKn|gza$-Kb$B# z?`M(c(2w9wHz>V5B~%qBj~a}Bl@fRyjCW4+wt!#Y9@op_Rri+|CrSt;j^_3?EyvIH zv<`#7$vvlUjvl9&HM8%GVJ(s`_X~0|2eyOOi-w*t>iGqHs$;UWQ|@ZQiLrW|=){vSJfmpdT-^Kg`%|!Nb|%{7g9-3^PO!Vx zN~8CbQq|&w?BIT8AbQbN_C3FOuW^W*!|TnqpmVK!W_6!WUdF6zwW(n$v>*CMAj_-| zqYn#@9M!^3Sjq^j9JqOHP$qspp>-Gpu65FB>AvC<&IxBU#>qo-N&4%w3((|XR_4p_ zr{KA%u^_zAUz0dlsU9cWR(Q@$MD>$clXGp*d6u*kEiXo`Do#e-UXj`)1KOV)6P{=5 z2V-&s-_vpIEj~IT4ES+z= z!%$z78a44zElxVRDk&HvJRA>0 zho7CkbTb_0teJfW%i82~Jy{DOzacbVQSD&* zDhj-wMBh5s$XsQdVCNH#dYo{02U>SQwdvCnay^~u6I?-M)stM2Do%2|tdisF_aVRS z`*y?W<|MG%e<(edvv{ zH(j20T1t%akndRPPD37 zdGe$2n8+Wt3!!8Guz-yp-oY5@-J#!ZXmSt8xvO5B)H7?eYR5K$yTR+@JAJhOB$;e! zy471%oa`kXHqUc-NfwuxZok}k2bdbH>#*)IUI9`;aIZ`9rMqJkYyFU2RyX*fwrP~Q+(Sh&NJ#gL+6}Qi<9gQDVK{R z*#!4@siEbDY(jP-QFK*H<=OthiIZ<)4-W>D?$GE=BnLc>CEV(Cb_DBzG6J*he|_<6 zi9MTObQlCq72KI0v(^1CPHwXn$s1{pm*3Y31)Uyu7UozuLVwAcm`fGGa(Oj5QSW^= z*|*-mDm>A-m97nUCw9R`61U4M9ZC;#AGEqI)#!fieQC4}?6QnTOreF**zaxj)W)Jhonl#|a0EJhJ#^hUep+ZeS*x zXsHv(1Mk~YKYcH{t&$ULFCL>FC-rRft`)Vn9XW*yM z1-IfsyTgK!U$(Y|zF}#9I(jMc&%g2s#)*eooN%AX{_7ls-YLKMrE|!Kg@kP3MswfY zcT{n*HPa$+|ClM{y$R2?771ga(cA;`76&z8Jyu4*^=^8URZ=i3!RRmuOn>>aGR!$?IbjIvfiePTCzyWu@wf{n zLF+IGd|AW4U#Zgp=S05+D^LFM*_gRL@h9}Y^=D_~{KX&?ej>XDY4klWN44UFY`ERv zdgf9>cD`))kac$m+2n*PqmFM=!3lZRWSuQx?L>Z@CA#+I=U zj=kZljDXb2P9n9%-^QSI7zFm2xCeUsl;E6jdSjfFUO08gYQ{KdHq$)9;&V87Tx-28 z@HEKf|Fw27PWGtB$+tW^w+{gXcTd3Y7l{>wY|Ph*y$%Ga;-vVV$0UPKUSMkT@`doX z4h&B->wSDU{+6N=0`rN4{JUN7^9ilPAdu}3FS=bY`->AH#>x95mmFs8i35v0B`2=6 zFMzS6%k1=%0!=vCpcW@&151bNUC{HL%Rc(Hobd#AglydB)b^@4IaxZ=xaCMGS<$c6 z)RDU3(8abZ@3N^U=7ACdyfI(LH|c^s6K8Z71UCM8)-kSCIL-+%0JC^uG3S~0MHjNF zM}cVm4MXT$S& z+d8m#GXAW(E~eCC8MOL0!LY*~5o zbw|nCr{Uhvp|I7BTjv5H&~g0SQD(*}+vW#- zo^MN3#mVz8e_rb~F@rYw*_ji9OktGIG|PG&<5>@s5m=tmb87qZ*D(oNhe6=7QN+aw z*A+Eqrhekh%9D9rb@pcME&zSmm_NRL=fHWi){0w)+%(~&>R+62NS^_>+TFTyUqw9d zp1(9$kPt&|ywG~(n1@Hm0&TmQar{TvOqCF5RNf=*aXEJX%jhr&4B}-N#s2;)Z~XNg ze0pZ&lEFe61nS! zIgL3yS5-W`?{VRVe)p$f{!q`>lRN}|2Mq3!J0`Q7C?l}!v`1R|1G<<5t-~O2Q6IS9 zk5|Zjq~k#=mz5_gTJL($#%Bq1_?%JDZcHy2?O8g~TmP6QoGen06TOM2KQu2)lwEza zYBSdsoy}gEHM~7d6(?7w-(50dlNI@A`a7~;j|8xv|BIZAfBRDzfye~EMpr|zKjXpZ zFbJfR&SIA^#VV&cA!cKo-0jn`pg7_-=$75LYT7vg2Iy}n(*3B2Xf^lT1ob%Ka1-u} z(I0}&O0OP?qK7+vahrm}m8v*-6=#^JHF_wtuiE_h(cm56|KgHf-WnO}fieQCn;mU+ zu&O&ILF+IG-17Ku { + polarService.runWithDomainFactory(domainFactory -> { try { client.updatePolarDataRegressions(); } catch (Exception e) { @@ -49,9 +51,24 @@ public class PolarDataResourceTest { /** * Test to check if client importing data correctly. Using {@link PolarDataClientMock} which use {@link File} - * polar_data.json as source + * polar_data as source.
+ * The following steps are necessary in order to produce a new polar_data file. In this example the event 505 + * Worlds 2015 is chosen
+ *
" + htmlWhitespace + "
" + htmlWhitespace + "").appendEscaped(columnHeader.toString()).appendHtmlConstant("").appendEscaped(columnHeader.toString()) + .appendHtmlConstant("
").appendEscaped(rowKey + ":").appendHtmlConstant("").appendEscaped(key + ":").appendHtmlConstant("").append(results.get(key).get(signifier).doubleValue()).appendHtmlConstant("").append(results.get(key).get(signifier).doubleValue()) + .appendHtmlConstant("
+ *
    + *
  1. Run the local Sailing Server and Sailing GWT from the run configurations
    2. + *
  2. Access the local Admin Console
    3. + *
  3. Go to Connector's tap, select TracTrac Events + *
  4. Select 505 Worlds 2015 from the selection options and click at List Races
    5. + *
  5. Mark all of the resulting races, click at Start tracking and wait until they reach FINISHED + * status
    6. + *
  6. Access the local polar data file and store it + * within this project's /resources folder + *
+ *
* - * @throws NotEnoughDataHasBeenAddedException + * @throws NotEnoughDataHasBeenAdwas + * edException */ @Test public void testImportingFromMockFile() throws NotEnoughDataHasBeenAddedException { @@ -59,13 +76,14 @@ public class PolarDataResourceTest { PolynomialFunction angleDownwindFunction = new PolynomialFunction(ANGLE_FUNCTION_COEFFS_DOWNWIND); PolynomialFunction speedDownwindFunction = new PolynomialFunction(SPEED_FUNCTIONS_COEFFS_DOWNWIND); - assertThat(polarService.getSpeedRegressionsPerAngle().size(), is(68)); - assertThat(polarService.getCubicRegressionsPerCourse().size(), is(4)); - assertThat(polarService.getFixCointPerBoatClass().get(boatClass), is(9330L)); + assertThat(polarService.getSpeedRegressionsPerAngle().size(), is(36)); + assertThat(polarService.getCubicRegressionsPerCourse().size(), is(2)); + assertThat(polarService.getFixCointPerBoatClass().get(boatClass), is(105594L)); // presuming that if downwind functions & regression collections' size are correct then any other thing is // imported correctly assertThat(polarService.getAngleRegressionFunction(boatClass, LegType.DOWNWIND), is(angleDownwindFunction)); assertThat(polarService.getSpeedRegressionFunction(boatClass, LegType.DOWNWIND), is(speedDownwindFunction)); + // assertThat(polarService.get) } } From 34cbfde6394b0f885da757360221bdc331c2978c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 7 May 2018 16:38:09 +0200 Subject: [PATCH 21/63] bug4564 extracted constants and removed all jsni code in the deserializer --- .../dto/ExpeditionAllInOneConstants.java | 20 ++++++-- .../domain/common/dto/ImportConstants.java | 18 +++++++ .../ExpeditionDataImportResponse.java | 47 ++++++++++--------- .../impl/ExpeditionAllInOneImportServlet.java | 20 ++++---- .../impl/ImportResultSerializer.java | 21 +++++---- 5 files changed, 80 insertions(+), 46 deletions(-) create mode 100644 java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/ImportConstants.java diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/ExpeditionAllInOneConstants.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/ExpeditionAllInOneConstants.java index 1dc69d141ba..e87a00b2e67 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/ExpeditionAllInOneConstants.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/ExpeditionAllInOneConstants.java @@ -6,11 +6,23 @@ public final class ExpeditionAllInOneConstants { public static final String REQUEST_PARAMETER_REGATTA_NAME = "regattaName"; public static final String REQUEST_PARAMETER_LOCALE = "locale"; public static final String REQUEST_PARAMETER_IMPORT_START_DATA = "importStartData"; - public static final String START_TIMES = "startTimes"; - public enum ImportMode{ - NEW_COMPETITOR, NEW_EVENT, NEW_RACE; + public static final String RESPONSE_START_TIMES = "startTimes"; + public static final String RESPONSE_EVENT_ID = "eventId"; + public static final String RESPONSE_LEADER_BOARD_NAME = "leaderboardName"; + public static final String RESPONSE_LEADER_BOARD_GROUP_NAME = "leaderboardGroupName"; + public static final String RESPONSE_REGATTA_NAME = "regattaName"; + public static final String RESPONSE_RACE_LIST = "raceNameRaceColumnNameFleetNameList"; + public static final String RESPONSE_ERRORS = "errors"; + public static final String RESPONSE_GPS_DEVICE_IDS = "gpsDeviceIds"; + public static final String RESPONSE_SENSOR_DEVICE_IDS = "sensorDeviceIds"; + public static final String RESPONSE_SENSOR_FIX_IMPORTER_TYPE = "sensorFixImporterType"; + + public enum ImportMode { + NEW_COMPETITOR, + NEW_EVENT, + NEW_RACE; } - + private ExpeditionAllInOneConstants() { } } diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/ImportConstants.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/ImportConstants.java new file mode 100644 index 00000000000..098c62e8fc3 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/ImportConstants.java @@ -0,0 +1,18 @@ +package com.sap.sailing.domain.common.dto; + +public class ImportConstants { + + public static final String RACE_NAME = "raceName"; + public static final String RACE_COLUMN_NAME = "raceColumnName"; + public static final String FLEET_NAME = "fleetName"; + public static final String FILENAME = "filename"; + public static final String REQUESTED_IMPORTER = "requestedImporter"; + public static final String EX_UUID = "exUUID"; + public static final String CLASS_NAME = "className"; + public static final String MESSAGE = "message"; + public static final String ERRORS = "errors"; + public static final String UPLOADS = "uploads"; + + private ImportConstants() { + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/resulthandling/ExpeditionDataImportResponse.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/resulthandling/ExpeditionDataImportResponse.java index 420a7442767..3912961e708 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/resulthandling/ExpeditionDataImportResponse.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/resulthandling/ExpeditionDataImportResponse.java @@ -4,9 +4,11 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import com.google.gwt.core.shared.GWT; import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONObject; import com.sap.sailing.domain.common.dto.ExpeditionAllInOneConstants; +import com.sap.sailing.domain.common.dto.ImportConstants; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -14,6 +16,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class ExpeditionDataImportResponse extends AbstractDataImportResponse { public static final ExpeditionDataImportResponse parse(String json) { + GWT.debugger(); return AbstractDataImportResponse.parse(json, "ExpeditionDataImportResponse"); } @@ -21,31 +24,31 @@ public class ExpeditionDataImportResponse extends AbstractDataImportResponse { } public final UUID getEventId() { - String eventId = getString("eventId"); + String eventId = getString(ExpeditionAllInOneConstants.RESPONSE_EVENT_ID); return eventId == null ? null : UUID.fromString(eventId); } - public final native String getLeaderboardGroupName() /*-{ - return this.leaderboardGroupName; - }-*/; - - public final native String getLeaderboardName() /*-{ - return this.leaderboardName; - }-*/; + public final String getLeaderboardGroupName() { + return getString(ExpeditionAllInOneConstants.RESPONSE_LEADER_BOARD_GROUP_NAME); + } + + public final String getLeaderboardName() { + return getString(ExpeditionAllInOneConstants.RESPONSE_LEADER_BOARD_NAME); + } + + public final String getRegattaName() { + return getString(ExpeditionAllInOneConstants.RESPONSE_REGATTA_NAME); + } - public final native String getRegattaName() /*-{ - return this.regattaName; - }-*/; - public final List> getRaceEntries() { ArrayList> raceNameRaceColumnNameFleetNameList = new ArrayList<>(); JSONObject jsonView = new JSONObject(this); - JSONArray entryList = jsonView.get("raceNameRaceColumnNameFleetNameList").isArray(); + JSONArray entryList = jsonView.get(ExpeditionAllInOneConstants.RESPONSE_RACE_LIST).isArray(); for (int i = 0; i < entryList.size(); i++) { JSONObject entry = entryList.get(i).isObject(); - String raceName = entry.get("raceName").isString().stringValue(); - String raceColumnName = entry.get("raceColumnName").isString().stringValue(); - String fleetName = entry.get("fleetName").isString().stringValue(); + String raceName = entry.get(ImportConstants.RACE_NAME).isString().stringValue(); + String raceColumnName = entry.get(ImportConstants.RACE_COLUMN_NAME).isString().stringValue(); + String fleetName = entry.get(ImportConstants.FLEET_NAME).isString().stringValue(); raceNameRaceColumnNameFleetNameList .add(new Triple(raceName, raceColumnName, fleetName)); } @@ -55,7 +58,7 @@ public class ExpeditionDataImportResponse extends AbstractDataImportResponse { public final Iterable getStartTimes() { final List result = new ArrayList<>(); JSONObject jsonView = new JSONObject(this); - JSONArray startTimesList = jsonView.get(ExpeditionAllInOneConstants.START_TIMES).isArray(); + JSONArray startTimesList = jsonView.get(ExpeditionAllInOneConstants.RESPONSE_START_TIMES).isArray(); for (int i = 0; i < startTimesList.size(); i++) { final long startTimeAsMillis = (long) startTimesList.get(i).isNumber().doubleValue(); result.add(new MillisecondsTimePoint(startTimeAsMillis)); @@ -64,16 +67,16 @@ public class ExpeditionDataImportResponse extends AbstractDataImportResponse { } public final List getGpsDeviceIds() { - return getStringList("gpsDeviceIds"); + return getStringList(ExpeditionAllInOneConstants.RESPONSE_GPS_DEVICE_IDS); } public final List getSensorDeviceIds() { - return getStringList("sensorDeviceIds"); + return getStringList(ExpeditionAllInOneConstants.RESPONSE_SENSOR_DEVICE_IDS); } - public final native String getSensorFixImporterType() /*-{ - return this.sensorFixImporterType; - }-*/; + public final String getSensorFixImporterType() { + return getString(ExpeditionAllInOneConstants.RESPONSE_SENSOR_FIX_IMPORTER_TYPE); + }; public final boolean hasEventId() { final String stringValue = getString("eventId"); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java index f5f13047bd0..a96b6867581 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java @@ -141,16 +141,16 @@ public class ExpeditionAllInOneImportServlet extends AbstractFileUploadServlet { private JSONObject toJSON(ImporterResult importerResult) { final JSONObject json = new JSONObject(); - json.put("eventId", importerResult.eventId == null ? null : importerResult.eventId.toString()); - json.put("leaderboardName", importerResult.leaderboardName); - json.put("leaderboardGroupName", importerResult.leaderboardGroupName); - json.put("regattaName", importerResult.regattaName); - json.put("raceNameRaceColumnNameFleetNameList", ImportResultSerializer.serializeRaceList(importerResult.raceNameRaceColumnNameFleetnameList)); - json.put("errors", ImportResultSerializer.serializeErrorList(importerResult.errorList)); - json.put("gpsDeviceIds", ImportResultSerializer.serializeTrackList(importerResult.importGpsFixData)); - json.put("sensorDeviceIds", ImportResultSerializer.serializeTrackList(importerResult.importSensorFixData)); - json.put("sensorFixImporterType", importerResult.sensorFixImporterType); - json.put(ExpeditionAllInOneConstants.START_TIMES, ImportResultSerializer.serializeIterable(importerResult.startData.getStartTimes(), + json.put(ExpeditionAllInOneConstants.RESPONSE_EVENT_ID, importerResult.eventId == null ? null : importerResult.eventId.toString()); + json.put(ExpeditionAllInOneConstants.RESPONSE_LEADER_BOARD_NAME, importerResult.leaderboardName); + json.put(ExpeditionAllInOneConstants.RESPONSE_LEADER_BOARD_GROUP_NAME, importerResult.leaderboardGroupName); + json.put(ExpeditionAllInOneConstants.RESPONSE_REGATTA_NAME, importerResult.regattaName); + json.put(ExpeditionAllInOneConstants.RESPONSE_RACE_LIST, ImportResultSerializer.serializeRaceList(importerResult.raceNameRaceColumnNameFleetnameList)); + json.put(ExpeditionAllInOneConstants.RESPONSE_ERRORS, ImportResultSerializer.serializeErrorList(importerResult.errorList)); + json.put(ExpeditionAllInOneConstants.RESPONSE_GPS_DEVICE_IDS, ImportResultSerializer.serializeTrackList(importerResult.importGpsFixData)); + json.put(ExpeditionAllInOneConstants.RESPONSE_SENSOR_DEVICE_IDS, ImportResultSerializer.serializeTrackList(importerResult.importSensorFixData)); + json.put(ExpeditionAllInOneConstants.RESPONSE_SENSOR_FIX_IMPORTER_TYPE, importerResult.sensorFixImporterType); + json.put(ExpeditionAllInOneConstants.RESPONSE_START_TIMES, ImportResultSerializer.serializeIterable(importerResult.startData.getStartTimes(), startTime->startTime.asMillis())); return json; } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultSerializer.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultSerializer.java index bc28374835f..888c23c287c 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultSerializer.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultSerializer.java @@ -7,6 +7,7 @@ import java.util.stream.StreamSupport; import org.json.simple.JSONArray; import org.json.simple.JSONObject; +import com.sap.sailing.domain.common.dto.ImportConstants; import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.ErrorImportDTO; import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.TrackImportDTO; import com.sap.sse.common.Util.Triple; @@ -18,8 +19,8 @@ class ImportResultSerializer { static JSONObject serializeImportResult(ImportResultDTO result) { final JSONObject json = new JSONObject(); - json.put("errors", serializeErrorList(result.getErrorList())); - json.put("uploads", serializeTrackList(result.getImportResult())); + json.put(ImportConstants.ERRORS, serializeErrorList(result.getErrorList())); + json.put(ImportConstants.UPLOADS, serializeTrackList(result.getImportResult())); return json; } @@ -43,19 +44,19 @@ class ImportResultSerializer { private static JSONObject serializeRaceEntry(Triple entry) { final JSONObject json = new JSONObject(); - json.put("raceName", entry.getA()); - json.put("raceColumnName", entry.getB()); - json.put("fleetName", entry.getC()); + json.put(ImportConstants.RACE_NAME, entry.getA()); + json.put(ImportConstants.RACE_COLUMN_NAME, entry.getB()); + json.put(ImportConstants.FLEET_NAME, entry.getC()); return json; } private static JSONObject serializeError(ErrorImportDTO error) { final JSONObject json = new JSONObject(); - json.put("filename", error.getFilename()); - json.put("requestedImporter", error.getRequestedImporter()); - json.put("exUUID", error.getExUUID()); - json.put("className", error.getName()); - json.put("message", error.getMessage()); + json.put(ImportConstants.FILENAME, error.getFilename()); + json.put(ImportConstants.REQUESTED_IMPORTER, error.getRequestedImporter()); + json.put(ImportConstants.EX_UUID, error.getExUUID()); + json.put(ImportConstants.CLASS_NAME, error.getName()); + json.put(ImportConstants.MESSAGE, error.getMessage()); return json; } From 78a7a4c72dbba5d024d0e1f7fd714ac2ef804087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 7 May 2018 16:57:37 +0200 Subject: [PATCH 22/63] bug4564 removed dto declaration from file not going over the line --- .../gateway/trackfiles/impl/GPSFixImportTest.java | 4 ++-- .../trackfiles/impl/AllinOneImportException.java | 2 +- .../trackfiles/impl/ExpeditionAllInOneImporter.java | 10 +++++----- .../impl/{ImportResultDTO.java => ImportResult.java} | 4 ++-- .../trackfiles/impl/ImportResultSerializer.java | 6 +++--- .../trackfiles/impl/SensorDataImportServlet.java | 2 +- .../gateway/trackfiles/impl/SensorDataImporter.java | 4 ++-- .../trackfiles/impl/TrackFilesImportServlet.java | 2 +- .../gateway/trackfiles/impl/TrackFilesImporter.java | 8 ++++---- 9 files changed, 21 insertions(+), 21 deletions(-) rename java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/{ImportResultDTO.java => ImportResult.java} (98%) diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java index c27acbb5ce7..2a09bbca568 100755 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/trackfiles/impl/GPSFixImportTest.java @@ -78,7 +78,7 @@ public class GPSFixImportTest { } @Override - protected void additionalDataExtractor(ImportResultDTO jsonResult, TrackFileImportDeviceIdentifier device) + protected void additionalDataExtractor(ImportResult jsonResult, TrackFileImportDeviceIdentifier device) throws TransformationException { } @@ -161,7 +161,7 @@ public class GPSFixImportTest { } }; AtomicBoolean failed = new AtomicBoolean(false); - ImportResultDTO holder = new ImportResultDTO(Logger.getLogger(GPSFixImportTest.class.getName())){ + ImportResult holder = new ImportResult(Logger.getLogger(GPSFixImportTest.class.getName())){ @Override public void add(Exception exception) { diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/AllinOneImportException.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/AllinOneImportException.java index dacb910dee7..794b2e1a81e 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/AllinOneImportException.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/AllinOneImportException.java @@ -3,7 +3,7 @@ package com.sap.sailing.server.gateway.trackfiles.impl; import java.util.ArrayList; import java.util.List; -import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.ErrorImportDTO; +import com.sap.sailing.server.gateway.trackfiles.impl.ImportResult.ErrorImportDTO; public class AllinOneImportException extends Exception { private static final long serialVersionUID = 1L; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java index 9b2abbb65c8..b96ad4ba34d 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java @@ -75,8 +75,8 @@ import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.geocoding.ReverseGeocoder; import com.sap.sailing.server.RacingEventService; -import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.ErrorImportDTO; -import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.TrackImportDTO; +import com.sap.sailing.server.gateway.trackfiles.impl.ImportResult.ErrorImportDTO; +import com.sap.sailing.server.gateway.trackfiles.impl.ImportResult.TrackImportDTO; import com.sap.sailing.server.gateway.windimport.AbstractWindImporter; import com.sap.sailing.server.gateway.windimport.AbstractWindImporter.WindImportResult; import com.sap.sailing.server.gateway.windimport.expedition.WindImporter; @@ -214,7 +214,7 @@ public class ExpeditionAllInOneImporter { final String trackedRaceName = filenameWithDateTimeSuffix; final String windSourceId = filenameWithDateTimeSuffix; final int[] discardThresholds = new int[0]; - final ImportResultDTO jsonHolderForGpsFixImport = new ImportResultDTO(logger); + final ImportResult jsonHolderForGpsFixImport = new ImportResult(logger); // Import GPS Fixes final List> filesForGpsFixImport = Arrays.asList(new Pair<>(filenameWithSuffix, fileItem)); try { @@ -228,7 +228,7 @@ public class ExpeditionAllInOneImporter { } errors.addAll(jsonHolderForGpsFixImport.getErrorList()); // Import Extended Sensor Data - final ImportResultDTO jsonHolderForSensorFixImport = new ImportResultDTO(logger); + final ImportResult jsonHolderForSensorFixImport = new ImportResult(logger); final String sensorFixImporterType = DoubleVectorFixImporter.EXPEDITION_EXTENDED_TYPE; final Iterable> importerNamesAndFilesForSensorFixImport = Arrays .asList(new Pair<>(sensorFixImporterType, fileItem)); @@ -684,7 +684,7 @@ public class ExpeditionAllInOneImporter { return trackedRace; } - private void ensureSuccessfulImport(ImportResultDTO result, String errorMessage) throws AllinOneImportException { + private void ensureSuccessfulImport(ImportResult result, String errorMessage) throws AllinOneImportException { if (!result.getErrorList().isEmpty()) { throw new AllinOneImportException(errorMessage, result.getErrorList()); } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultDTO.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResult.java similarity index 98% rename from java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultDTO.java rename to java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResult.java index 2f39536c11f..acb03da31b8 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultDTO.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResult.java @@ -11,7 +11,7 @@ import com.sap.sse.common.TimeRange; /** * Convenience class that wraps the json objects used to render json result objects */ -class ImportResultDTO { +class ImportResult { private final List errorList = new CopyOnWriteArrayList<>(); private final List importResult = new CopyOnWriteArrayList<>(); @@ -88,7 +88,7 @@ class ImportResultDTO { } - ImportResultDTO(Logger logger) { + ImportResult(Logger logger) { this.logger = logger; } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultSerializer.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultSerializer.java index 888c23c287c..3790dc5e622 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultSerializer.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ImportResultSerializer.java @@ -8,8 +8,8 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import com.sap.sailing.domain.common.dto.ImportConstants; -import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.ErrorImportDTO; -import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.TrackImportDTO; +import com.sap.sailing.server.gateway.trackfiles.impl.ImportResult.ErrorImportDTO; +import com.sap.sailing.server.gateway.trackfiles.impl.ImportResult.TrackImportDTO; import com.sap.sse.common.Util.Triple; /** @@ -17,7 +17,7 @@ import com.sap.sse.common.Util.Triple; */ class ImportResultSerializer { - static JSONObject serializeImportResult(ImportResultDTO result) { + static JSONObject serializeImportResult(ImportResult result) { final JSONObject json = new JSONObject(); json.put(ImportConstants.ERRORS, serializeErrorList(result.getErrorList())); json.put(ImportConstants.UPLOADS, serializeTrackList(result.getImportResult())); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/SensorDataImportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/SensorDataImportServlet.java index e4dfeeb3117..d1729a9fb58 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/SensorDataImportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/SensorDataImportServlet.java @@ -27,7 +27,7 @@ public class SensorDataImportServlet extends AbstractFileUploadServlet { @Override protected void process(List fileItems, HttpServletRequest req, HttpServletResponse resp) throws IOException { - ImportResultDTO importResult = new ImportResultDTO(logger); + ImportResult importResult = new ImportResult(logger); boolean enableDownsampler = false; try { String importerName = null; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/SensorDataImporter.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/SensorDataImporter.java index 23296918e64..b083a0ffa2d 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/SensorDataImporter.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/SensorDataImporter.java @@ -21,7 +21,7 @@ import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.trackimport.DoubleVectorFixImporter; import com.sap.sailing.domain.trackimport.FormatNotSupportedException; import com.sap.sailing.server.RacingEventService; -import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.TrackImportDTO; +import com.sap.sailing.server.gateway.trackfiles.impl.ImportResult.TrackImportDTO; import com.sap.sse.common.NoCorrespondingServiceRegisteredException; import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util.Pair; @@ -50,7 +50,7 @@ public class SensorDataImporter { * * @throws IOException */ - public void importFiles(boolean enableDownsampler, ImportResultDTO result, Iterable> importerNamesAndFiles) + public void importFiles(boolean enableDownsampler, ImportResult result, Iterable> importerNamesAndFiles) throws IOException { final Collection availableImporters = new LinkedHashSet<>(); availableImporters.addAll(getOSGiRegisteredImporters()); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java index 56895516fce..f807518b8c8 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImportServlet.java @@ -41,7 +41,7 @@ public class TrackFilesImportServlet extends AbstractFileUploadServlet { @Override protected void process(List fileItems, HttpServletRequest req, HttpServletResponse resp) throws IOException { - ImportResultDTO importResult = new ImportResultDTO(logger); + ImportResult importResult = new ImportResult(logger); try { String prefImporterType = null; List> files = new ArrayList<>(); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImporter.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImporter.java index 4c1f19447cd..7a9680a09e1 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImporter.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/TrackFilesImporter.java @@ -26,7 +26,7 @@ import com.sap.sailing.domain.trackfiles.TrackFileImportDeviceIdentifier; import com.sap.sailing.domain.trackimport.GPSFixImporter; import com.sap.sailing.domain.trackimport.GPSFixImporter.Callback; import com.sap.sailing.server.RacingEventService; -import com.sap.sailing.server.gateway.trackfiles.impl.ImportResultDTO.TrackImportDTO; +import com.sap.sailing.server.gateway.trackfiles.impl.ImportResult.TrackImportDTO; import com.sap.sse.common.NoCorrespondingServiceRegisteredException; import com.sap.sse.common.TimeRange; import com.sap.sse.common.TypeBasedServiceFinderFactory; @@ -45,7 +45,7 @@ public class TrackFilesImporter { this.context = context; } - public void importFixes(ImportResultDTO jsonResult, String prefImporterType, List> files) + public void importFixes(ImportResult jsonResult, String prefImporterType, List> files) throws IOException { GPSFixImporter preferredImporter = null; if (prefImporterType != null && !prefImporterType.isEmpty()) { @@ -55,7 +55,7 @@ public class TrackFilesImporter { importFilesWithPreferredImporter(files, jsonResult, preferredImporter); } - void importFilesWithPreferredImporter(Iterable> files, ImportResultDTO jsonResult, + void importFilesWithPreferredImporter(Iterable> files, ImportResult jsonResult, GPSFixImporter preferredImporter) throws IOException { for (Pair pair : files) { final String fileName = pair.getA(); @@ -113,7 +113,7 @@ public class TrackFilesImporter { } } - protected void additionalDataExtractor(ImportResultDTO jsonResult, TrackFileImportDeviceIdentifier device) + protected void additionalDataExtractor(ImportResult jsonResult, TrackFileImportDeviceIdentifier device) throws TransformationException { TimeRange range = service.getSensorFixStore().getTimeRangeCoveredByFixes(device); long amount = service.getSensorFixStore().getNumberOfFixes(device); From 042d112f8c438df347e6f26cec9a0520612867df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Mon, 28 May 2018 09:28:57 +0200 Subject: [PATCH 23/63] put common string messages into the sse.StringMessages interface; put datamining specific string messages into the datamining.ui.StringMessages interface --- .../com/sap/sailing/gwt/ui/client/StringMessages.java | 3 +-- .../sailing/gwt/ui/client/StringMessages.properties | 2 -- .../sailing/gwt/ui/client/StringMessages_de.properties | 1 - .../sailing/gwt/ui/client/StringMessages_es.properties | 1 - .../sailing/gwt/ui/client/StringMessages_fr.properties | 2 -- .../sailing/gwt/ui/client/StringMessages_ja.properties | 1 - .../sailing/gwt/ui/client/StringMessages_pt.properties | 1 - .../sailing/gwt/ui/client/StringMessages_ru.properties | 1 - .../sailing/gwt/ui/client/StringMessages_zh.properties | 1 - .../presentation/NumberPairResultsPresenter.java | 7 ++++--- .../presentation/TabbedSailingResultsPresenter.java | 10 +++++----- .../sap/sse/datamining/ui/client/StringMessages.java | 4 ++-- .../sse/datamining/ui/client/StringMessages.properties | 2 +- .../datamining/ui/client/StringMessages_de.properties | 2 +- .../datamining/ui/client/StringMessages_es.properties | 2 +- .../datamining/ui/client/StringMessages_fr.properties | 2 +- .../datamining/ui/client/StringMessages_ja.properties | 3 +-- .../datamining/ui/client/StringMessages_pt.properties | 2 +- .../datamining/ui/client/StringMessages_ru.properties | 2 +- .../datamining/ui/client/StringMessages_zh.properties | 2 +- .../src/com/sap/sse/gwt/client/StringMessages.java | 1 + .../com/sap/sse/gwt/client/StringMessages.properties | 2 +- .../sap/sse/gwt/client/StringMessages_de.properties | 1 + .../sap/sse/gwt/client/StringMessages_es.properties | 1 + .../sap/sse/gwt/client/StringMessages_fr.properties | 1 + .../sap/sse/gwt/client/StringMessages_ja.properties | 3 +-- .../sap/sse/gwt/client/StringMessages_pt.properties | 1 + .../sap/sse/gwt/client/StringMessages_ru.properties | 1 + .../sap/sse/gwt/client/StringMessages_zh.properties | 1 + 29 files changed, 29 insertions(+), 34 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 7d5584f746a..a94daa72a9a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -916,7 +916,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String outlierMinimumNeighborhoodPctString(); String oneOrMoreParametersAreEmpty(); String errorWhileAddingSeriesToChart(); - String generatingPolarSheet(); + String generatingPolarSheet(); String dataCount(); String generationFinished(); String generating(); @@ -1455,7 +1455,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String raceOffice(); String polarResultsPresenter(); String maneuverSpeedDetailsResultsPresenter(); - String numberPairResultsPresenter(); String actionWatch(); String actionAnalyze(); String inviteSelectedCompetitors(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index dbdd8db7c4d..a6fdda49e2c 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -9,7 +9,6 @@ trackedBefore=History of tracked events general=General listRaces=List Races listRegattas=List Regattas -numberPairResultsPresenter=Scatterplot wind=Wind maneuverType=Maneuver windPanelLabel=This is the Wind Panel which so far is completely empty. @@ -886,7 +885,6 @@ legType=Leg Type sailID=Sail Number seriesLeaderboard=Series leaderboard regattaLeaderboards=Regatta leaderboards -clearSelection=Clear selection running=Running done=Done lastFinished=Last finished diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index b8438a56ed7..99dd2d5d6fa 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -1429,7 +1429,6 @@ eventsHaveTakenPlace[one]= Eine Veranstaltung hat stattgefunden raceOffice=Wettfahrtleitung polarResultsPresenter=Polar Ergebnis-Darsteller maneuverSpeedDetailsResultsPresenter=Manöver Geschwindigkeitsdetails Ergebnis-Darsteller -numberPairResultsPresenter=Scatterplot actionWatch=Verfolgen actionAnalyze=Analysieren denoteAllRacesForRaceLogTrackingShorctut=Alle rennen für racelog tracking markieren diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties index 946027f73bb..e0b7412dec4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties @@ -9,7 +9,6 @@ trackedBefore=Historial de eventos rastreados general=General listRaces=Listar carreras listRegattas=Listar regatas -numberPairResultsPresenter=Diagrama de dispersión wind=Viento maneuverType=Maniobra windPanelLabel=Este es el panel de vientos, y hasta el momento está totalmente vacío. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties index e5fa880fc21..0e8a8b7d674 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties @@ -9,7 +9,6 @@ trackedBefore=Historique des manifestations suivies general=Généralités listRaces=Lister courses listRegattas=Lister régates -numberPairResultsPresenter=Concentration points mesure wind=Vent maneuverType=Manœuvre windPanelLabel=Ceci est le panneau des mesures du vent, vide pour l''instant. @@ -882,7 +881,6 @@ legType=Type de portion de parcours sailID=Numéro de voile seriesLeaderboard=Palmarès de la série regattaLeaderboards=Palmarès de la régate -clearSelection=Réinitialiser sélection running=En cours d''exécution done=Terminé lastFinished=Fin de dernière exécution diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties index 96baef3c7c2..5fd4b7fc526 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties @@ -9,7 +9,6 @@ trackedBefore=追跡イベントの履歴 general=一般 listRaces=レース一覧 listRegattas=レガッタ一覧 -numberPairResultsPresenter=散布図 wind=風 maneuverType=マニューバー windPanelLabel=これは風パネルであり、今のところ完全に空となっています。 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties index 58a00b5245c..b86e9570948 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties @@ -9,7 +9,6 @@ trackedBefore=Histórico de eventos rastreados general=Geral listRaces=Listar corridas listRegattas=Listar regatas -numberPairResultsPresenter=Diagrama de dispersão wind=Vento maneuverType=Manobra windPanelLabel=Este é o painel eólico que até o momento está completamente vazio. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties index b165e98ba23..bf78a5989ef 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties @@ -9,7 +9,6 @@ trackedBefore=История отслеживаемых событий general=Общее listRaces=Список гонок listRegattas=Список регат -numberPairResultsPresenter=Множество точек wind=Ветер maneuverType=Маневр windPanelLabel=Это панель ветров, которая пока что совсем пуста. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties index fe097bfa378..8905c5821b4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties @@ -9,7 +9,6 @@ trackedBefore=已跟踪活动的历史记录 general=常规 listRaces=比赛轮次清单 listRegattas=比赛清单 -numberPairResultsPresenter=散点图 wind=风力 maneuverType=操作 windPanelLabel=这是风力面板，目前完全空白。 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java index d3795788ed9..a0da3f866f4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java @@ -27,6 +27,7 @@ import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.data.PairWithStats; import com.sap.sse.datamining.shared.impl.CompoundGroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.client.presentation.AbstractResultsPresenter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; @@ -38,7 +39,7 @@ public class NumberPairResultsPresenter extends AbstractResultsPresenter seriesMappedByGroupKey; public NumberPairResultsPresenter(Component parent, ComponentContext context, StringMessages stringMessages) { - super(parent, context, stringMessages); + super(parent, context); seriesMappedByGroupKey = new HashMap<>(); chartPanel = new SimpleLayoutPanel() { @Override @@ -61,7 +62,7 @@ public class NumberPairResultsPresenter extends AbstractResultsPresenter Date: Mon, 4 Jun 2018 17:04:24 +0200 Subject: [PATCH 24/63] Bug 4587: Using an official SAP client ID for our Google Maps API usage. In addition we now specify a channel. --- .../sailing/gwt/ui/client/shared/racemap/RaceMap.java | 2 +- .../sailing/gwt/ui/shared/racemap/GoogleMapAPIKey.java | 10 +++++++--- .../com/sap/sailing/gwt/ui/simulator/SimulatorMap.java | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java index c1cbd09b235..de9cedfff7e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java @@ -728,7 +728,7 @@ public class RaceMap extends AbstractCompositeComponent impleme RaceMap.this.managedInfoWindow = new ManagedInfoWindow(map); } }; - LoadApi.go(onLoad, loadLibraries, sensor, "key="+GoogleMapAPIKey.V3_APIKey); + LoadApi.go(onLoad, loadLibraries, sensor, GoogleMapAPIKey.V3_PARAMS); } /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/GoogleMapAPIKey.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/GoogleMapAPIKey.java index 6d7d7a37a7d..cea6959e1c6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/GoogleMapAPIKey.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/GoogleMapAPIKey.java @@ -1,7 +1,11 @@ package com.sap.sailing.gwt.ui.shared.racemap; -public class GoogleMapAPIKey { - // key for domains web4sap.com: This is the old Google Maps v2 key -> Most probably we will need a new key for v3 - public static final String V3_APIKey = "AIzaSyD1Se4tIkt-wglccbco3S7twaHiG20hR9E"; +import com.google.gwt.maps.client.LoadApi; +public class GoogleMapAPIKey { + /** + * These are the additional parameters to give to a + * {@link LoadApi#go(Runnable, java.util.ArrayList, boolean, String)} call for our Google Maps API usage. + */ + public static final String V3_PARAMS = "client=gme-sapglobalmarketing&channel=sapsailing.com"; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java index eb5974db9c1..fc7852d9dcf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java @@ -558,7 +558,7 @@ public class SimulatorMap extends AbsolutePanel implements RequiresDataInitializ } }; - LoadApi.go(onLoad, loadLibraries, sensor, "key="+GoogleMapAPIKey.V3_APIKey); + LoadApi.go(onLoad, loadLibraries, sensor, GoogleMapAPIKey.V3_PARAMS); } private void initializeOverlays() { From 2b677f2ccba2111d414ec5b9c6ab52782bea103b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 5 Jun 2018 17:09:59 +0200 Subject: [PATCH 25/63] bug4552 initial multi url change of mediatracks --- .../gwt/ui/adminconsole/MediaPanel.java | 29 +- .../multivideo/MultiRenameDialog.java | 250 ++++++++++++++++++ 2 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java index c3f1ac55dae..f269058013c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java @@ -39,6 +39,7 @@ import com.google.gwt.view.client.SelectionModel; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.domain.common.media.MediaUtil; +import com.sap.sailing.gwt.ui.adminconsole.multivideo.MultiRenameDialog; import com.sap.sailing.gwt.ui.adminconsole.multivideo.MultiVideoDialog; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; import com.sap.sailing.gwt.ui.client.MediaTracksRefresher; @@ -58,7 +59,7 @@ import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.async.MarkedAsyncCallback; import com.sap.sse.gwt.client.celltable.BaseCelltable; import com.sap.sse.gwt.client.celltable.EntityIdentityComparator; -import com.sap.sse.gwt.client.celltable.RefreshableSingleSelectionModel; +import com.sap.sse.gwt.client.celltable.RefreshableMultiSelectionModel; import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback; import com.sap.sse.gwt.client.panels.LabeledAbstractFilterablePanel; @@ -82,7 +83,7 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { private CellTable mediaTracksTable; private ListDataProvider mediaTrackListDataProvider = new ListDataProvider(); private Date latestDate; - private RefreshableSingleSelectionModel refreshableSelectionModel; + private RefreshableMultiSelectionModel refreshableSelectionModel; public MediaPanel(Set regattasDisplayers, SailingServiceAsync sailingService, RegattaRefresher regattaRefresher, MediaServiceAsync mediaService, ErrorReporter errorReporter, @@ -131,6 +132,27 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { }); buttonAndFilterPanel.add(multiVideo); + + Button multiVideoRename = new Button("i18n rename videos"); + multiVideoRename.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + Set selected = refreshableSelectionModel.getSelectedSet(); + if (selected.isEmpty()) { + Window.alert("i18n select mediatracks first"); + } else { + new MultiRenameDialog(mediaService, stringMessages, selected, errorReporter, + new Runnable() { + @Override + public void run() { + loadMediaTracks(); + } + }).center(); + } + } + }); + buttonAndFilterPanel.add(multiVideoRename); + add(buttonAndFilterPanel); Label lblFilterRaces = new Label(stringMessages.filterMediaByName() + ":"); @@ -170,6 +192,7 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { @Override public void onSuccess(Iterable allMediaTracks) { + mediaTrackListDataProvider.getList().clear(); Util.addAll(allMediaTracks, mediaTrackListDataProvider.getList()); filterableMediaTracks.updateAll(mediaTrackListDataProvider.getList()); mediaTrackListDataProvider.refresh(); @@ -192,7 +215,7 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { mediaTracksTable.addColumnSortHandler(sortHandler); // Add a selection model so we can select cells. - refreshableSelectionModel = new RefreshableSingleSelectionModel<>(new EntityIdentityComparator() { + refreshableSelectionModel = new RefreshableMultiSelectionModel<>(new EntityIdentityComparator() { @Override public boolean representSameEntity(MediaTrack dto1, MediaTrack dto2) { return dto1.dbId.equals(dto2.dbId); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java new file mode 100644 index 00000000000..c3f20f16f77 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java @@ -0,0 +1,250 @@ +package com.sap.sailing.gwt.ui.adminconsole.multivideo; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Style.Unit; +import com.google.gwt.event.dom.client.ChangeEvent; +import com.google.gwt.event.dom.client.ChangeHandler; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.KeyUpEvent; +import com.google.gwt.event.dom.client.KeyUpHandler; +import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.event.logical.shared.ValueChangeHandler; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.Anchor; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.DialogBox; +import com.google.gwt.user.client.ui.DockPanel; +import com.google.gwt.user.client.ui.FlexTable; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.ui.TextBox; +import com.sap.sailing.domain.common.media.MediaTrack; +import com.sap.sailing.gwt.ui.client.MediaServiceAsync; +import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sailing.gwt.ui.client.media.TimeFormatUtil; +import com.sap.sse.gwt.client.ErrorReporter; + +/** + * This class allows to add multiple videos at once, by crawling index sites of a given url, and using the metadata of + * mp4 files to fill starttime and duration. Additionally it allows to add the new mediatracks directly to the races + * that are overlapping. + */ +public class MultiRenameDialog extends DialogBox { + private static final String EMPTY_TEXT = ""; + private static final int TITLE_COLUMN = 0; + private static final int URL_COLUMN = 1; + private static final int URL_COLUMN_NEW = 2; + private static final int DURATION_COLUMN = 3; + private static final int STARTTIME_COLUMN = 4; + private static final int MIMETYPE_COLUMN = 5; + + private static final Style STYLE = GWT. create(StyleHolder.class).style(); + private StringMessages stringMessages; + private List mediaTrackRenameMap = new ArrayList<>(); + private FlexTable dataTable; + private Button doSaveButton; + private TextBox replacePartIn; + private TextBox replacePartOut; + + public MultiRenameDialog(MediaServiceAsync mediaService, + StringMessages stringMessages, Set selected, ErrorReporter errorReporter, Runnable afterLinking) { + this.stringMessages = stringMessages; + setGlassEnabled(true); + + FlowPanel mainContent = new FlowPanel(); + Label descriptionLabel = new Label("i18n select tracks to rename, ensure that replace and with are properly filled, then execute"); + descriptionLabel.getElement().getStyle().setPadding(0.5, Unit.EM); + mainContent.add(descriptionLabel); + + mainContent.add(new Label("replace ")); + replacePartIn = new TextBox(); + mainContent.add(replacePartIn); + mainContent.add(new Label(" with ")); + replacePartOut = new TextBox(); + replacePartOut.setText("http://replace_me_with_baseurl/"); + mainContent.add(replacePartOut); + + replacePartOut.addChangeHandler(new ChangeHandler() { + @Override + public void onChange(ChangeEvent event) { + updateUI(); + } + }); + replacePartOut.addKeyUpHandler(new KeyUpHandler() { + + @Override + public void onKeyUp(KeyUpEvent event) { + updateUI(); + } + }); + replacePartOut.addValueChangeHandler(new ValueChangeHandler() { + @Override + public void onValueChange(ValueChangeEvent event) { + updateUI(); + } + }); + + FlowPanel buttonPanel = new FlowPanel(); + DockPanel dockPanel = new DockPanel(); + add(dockPanel); + dockPanel.add(new ScrollPanel(mainContent), DockPanel.CENTER); + + dataTable = new FlexTable(); + STYLE.ensureInjected(); + dataTable.addStyleName(STYLE.tableStyle()); + mainContent.add(dataTable); + + Button cancelButton = new Button(stringMessages.close()); + cancelButton.getElement().getStyle().setMargin(3, Unit.PX); + cancelButton.ensureDebugId("CancelButton"); + cancelButton.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + MultiRenameDialog.this.hide(); + } + }); + + doSaveButton = new Button(stringMessages.addMediaTrack()); + doSaveButton.addClickHandler(new ClickHandler() { + + @Override + public void onClick(ClickEvent event) { + hide(); + for(MediaTrack track:mediaTrackRenameMap) { + String newUrl = getPatchedUrl(track); + track.url = newUrl; + mediaService.updateUrl(track, new AsyncCallback() { + + @Override + public void onSuccess(Void result) { + afterLinking.run(); + } + + @Override + public void onFailure(Throwable caught) { + Window.alert("Some error occured during saving!"); + } + }); + } + } + }); + buttonPanel.add(doSaveButton); + buttonPanel.add(cancelButton); + + dockPanel.add(buttonPanel, DockPanel.SOUTH); + + mediaTrackRenameMap = new ArrayList<>(selected); + + replacePartIn.setText(maxPrefixForAll()); + updateUI(); + } + + private String maxPrefixForAll() { + List allUrls = mediaTrackRenameMap.stream().map(f -> f.url).collect(Collectors.toList()); + + int length = Integer.MAX_VALUE; + for (String url : allUrls) { + final int urlLength = url.length(); + if (urlLength < length) { + length = urlLength; + } + } + for (int i = 0; i < length; i++) { + Character charTest = null; + for (String url : allUrls) { + char cur = url.charAt(i); + if (charTest == null) { + charTest = cur; + } else { + if (charTest.charValue() != cur) { + return url.substring(0, i); + } + } + } + } + // for some reason the whole urls do match + return allUrls.get(0); + } + + protected void updateUI() { + int y = 0; + dataTable.removeAllRows(); + dataTable.clear(); + dataTable.setWidget(y, TITLE_COLUMN, new Label(stringMessages.title())); + dataTable.setWidget(y, URL_COLUMN, new Label(stringMessages.url())); + dataTable.setWidget(y, DURATION_COLUMN, new Label(stringMessages.duration())); + dataTable.setWidget(y, STARTTIME_COLUMN, new Label(stringMessages.startTime())); + dataTable.setWidget(y, MIMETYPE_COLUMN, new Label(stringMessages.mimeType())); + + for (int row = 0; row < dataTable.getCellCount(0); row++) { + dataTable.getFlexCellFormatter().addStyleName(y, row, STYLE.tableHeader()); + } + + y++; + for (MediaTrack remoteFile : mediaTrackRenameMap) { + + Label name = new Label(remoteFile.title); + dataTable.setWidget(y, TITLE_COLUMN, name); + + Anchor link = new Anchor(remoteFile.url); + link.setHref(remoteFile.url); + link.setTarget("_blank"); + dataTable.setWidget(y, URL_COLUMN, link); + + + String newUrl = getPatchedUrl(remoteFile); + Anchor linknew = new Anchor(newUrl); + linknew.setHref(newUrl); + linknew.setTarget("_blank"); + dataTable.setWidget(y, URL_COLUMN_NEW, linknew); + + String durationtext = EMPTY_TEXT; + if (remoteFile.duration != null) { + durationtext = TimeFormatUtil.durationToHrsMinSec(remoteFile.duration); + } + dataTable.setWidget(y, DURATION_COLUMN, new Label(durationtext)); + String startTimeText = EMPTY_TEXT; + if (remoteFile.startTime != null) { + startTimeText = TimeFormatUtil.DATETIME_FORMAT.format(new Date(remoteFile.startTime.asMillis())); + } + dataTable.setWidget(y, STARTTIME_COLUMN, new Label(startTimeText)); + dataTable.setWidget(y, MIMETYPE_COLUMN, new Label(remoteFile.mimeType.name())); + y++; + } + + if (isShowing()) { + center(); + } + } + + private String getPatchedUrl(MediaTrack remoteFile) { + String newUrl = remoteFile.url; + newUrl = newUrl.substring(replacePartIn.getText().length()); + newUrl = replacePartOut.getText() + newUrl; + return newUrl; + } + + static interface StyleHolder extends ClientBundle { + @Source("MultiVideoDialog.css") + Style style(); + } + + static interface Style extends CssResource { + String tableStyle(); + + String tableHeader(); + + String checkboxStyle(); + } +} From 0a324810e50b3aa9f0c5e08a157030b63e6898c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Wed, 6 Jun 2018 07:35:48 +0200 Subject: [PATCH 26/63] added method to register result presenter to the retrieved data type --- .../NumberPairResultsPresenter.java | 6 +- .../TabbedSailingResultsPresenter.java | 58 +++++-------------- .../AbstractTabbedResultsPresenter.java | 48 +++++++++++++++ 3 files changed, 66 insertions(+), 46 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java index a0da3f866f4..69b6796a8e0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java @@ -21,25 +21,25 @@ import org.moxieapps.gwt.highcharts.client.plotOptions.SeriesPlotOptions; import com.google.gwt.user.client.ui.SimpleLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sailing.gwt.ui.datamining.AbstractSailingResultsPresenter; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.data.PairWithStats; import com.sap.sse.datamining.shared.impl.CompoundGroupKey; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; -import com.sap.sse.datamining.ui.client.presentation.AbstractResultsPresenter; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.shared.settings.ComponentContext; -public class NumberPairResultsPresenter extends AbstractResultsPresenter { +public class NumberPairResultsPresenter extends AbstractSailingResultsPresenter { private QueryResultDTO result; private final SimpleLayoutPanel chartPanel; private final Chart chart; private final Map seriesMappedByGroupKey; public NumberPairResultsPresenter(Component parent, ComponentContext context, StringMessages stringMessages) { - super(parent, context); + super(parent, context, stringMessages); seriesMappedByGroupKey = new HashMap<>(); chartPanel = new SimpleLayoutPanel() { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java index 46c37757246..69efcd24436 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/TabbedSailingResultsPresenter.java @@ -1,62 +1,34 @@ package com.sap.sailing.gwt.ui.datamining.presentation; +import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsAggregation; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.polarmining.PolarBackendResultsPresenter; import com.sap.sailing.gwt.ui.polarmining.PolarResultsPresenter; -import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sailing.polars.datamining.shared.PolarAggregation; +import com.sap.sailing.polars.datamining.shared.PolarBackendData; +import com.sap.sse.datamining.shared.data.PairWithStats; import com.sap.sse.datamining.ui.client.presentation.AbstractTabbedResultsPresenter; -import com.sap.sse.datamining.ui.client.presentation.MultiResultsPresenter; import com.sap.sse.datamining.ui.client.presentation.ResultsChart.DrillDownCallback; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public class TabbedSailingResultsPresenter extends AbstractTabbedResultsPresenter { - private final StringMessages stringMessages; public TabbedSailingResultsPresenter(Component parent, ComponentContext context, DrillDownCallback drillDownCallback, StringMessages stringMessages) { super(parent, context, drillDownCallback); - this.stringMessages = stringMessages; - } - @Override - public void showResult(QueryResultDTO result) { - if (result != null) { - if (result.getResultType().equals("com.sap.sailing.polars.datamining.shared.PolarAggregation")) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus( - new PolarResultsPresenter(TabbedSailingResultsPresenter.this, getComponentContext(), stringMessages)); - removeTab(oldHeader); - } else if (result.getResultType().equals("com.sap.sailing.polars.datamining.shared.PolarBackendData")) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus(new PolarBackendResultsPresenter(TabbedSailingResultsPresenter.this, getComponentContext(), - stringMessages)); - removeTab(oldHeader); - } else if (result.getResultType() - .equals("com.sap.sailing.datamining.shared.ManeuverSpeedDetailsAggregation")) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus(new ManeuverSpeedDetailsResultsPresenter(TabbedSailingResultsPresenter.this, - getComponentContext(), stringMessages)); - removeTab(oldHeader); - } - else if (result.getResultType() - .equals("com.sap.sse.datamining.shared.data.PairWithStats")) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus(new NumberPairResultsPresenter(TabbedSailingResultsPresenter.this, - getComponentContext(), stringMessages)); - removeTab(oldHeader); - } - else { - if (!(getSelectedPresenter() instanceof MultiResultsPresenter)) { - CloseableTabHeader oldHeader = getSelectedHeader(); - addTabAndFocus(new MultiResultsPresenter(this, getComponentContext(), drillDownCallback)); - removeTab(oldHeader); - } - } - getSelectedHeader().setText(result.getResultSignifier()); - } - getSelectedPresenter().showResult(result); - } + registerResultPresenter(PolarAggregation.class, + new PolarResultsPresenter(TabbedSailingResultsPresenter.this, getComponentContext(), stringMessages)); + registerResultPresenter(PolarBackendData.class, new PolarBackendResultsPresenter( + TabbedSailingResultsPresenter.this, getComponentContext(), stringMessages)); + + registerResultPresenter(ManeuverSpeedDetailsAggregation.class, new ManeuverSpeedDetailsResultsPresenter( + TabbedSailingResultsPresenter.this, getComponentContext(), stringMessages)); + + registerResultPresenter(PairWithStats.class, new NumberPairResultsPresenter(TabbedSailingResultsPresenter.this, + getComponentContext(), stringMessages)); + } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java index 76a7cd5d3d9..64f4837f862 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java @@ -32,6 +32,7 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractDataMiningC protected final ScrolledTabLayoutPanel tabPanel; protected final Map> presentersMappedByHeader; protected final DrillDownCallback drillDownCallback; + protected final Map> registeredResultPresenterMap; public AbstractTabbedResultsPresenter(Component parent, ComponentContext context, DrillDownCallback drillDownCallback) { @@ -41,6 +42,7 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractDataMiningC tabPanel.setAnimationDuration(0); tabPanel.getElement().getStyle().setMarginTop(10, Unit.PX); presentersMappedByHeader = new HashMap<>(); + registeredResultPresenterMap = new HashMap<>(); addNewTabTab(); addTabAndFocus(new MultiResultsPresenter(this, context, drillDownCallback)); @@ -185,4 +187,50 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractDataMiningC public String getId() { return "TabbedResultsPresenter"; } + + /** + * Register an {@link ResultsPresenter} to handle the retrieved {@link resultType}. Each {@link resultType} can only + * be registered once. Multiple registrations will cause an {@link IllegalStateException}. + * + * @param resultType + * of the datamining query. + * @param resultPresenter + * which shall be used to handle the datamaining query result. + * + * @throws IllegalStateException + * if the {@link resultType} is already registered. + */ + protected void registerResultPresenter(Class resultType, ResultsPresenter resultPresenter) + throws IllegalStateException { + if (!registeredResultPresenterMap.containsKey(resultType)) { + String className = resultType.getName(); + registeredResultPresenterMap.put(className, resultPresenter); + } else { + throw new IllegalStateException( + "Multiple registration for result type key: " + resultType.toString() + "not allowed."); + } + } + + @Override + public void showResult(QueryResultDTO result) { + try { + if (result != null) { + if (registeredResultPresenterMap.containsKey(result.getResultType())) { + CloseableTabHeader oldHeader = getSelectedHeader(); + addTabAndFocus(registeredResultPresenterMap.get(result.getResultType())); + removeTab(oldHeader); + } else { + if (!(getSelectedPresenter() instanceof MultiResultsPresenter)) { + CloseableTabHeader oldHeader = getSelectedHeader(); + addTabAndFocus(new MultiResultsPresenter(this, getComponentContext(), drillDownCallback)); + removeTab(oldHeader); + } + getSelectedHeader().setText(result.getResultSignifier()); + } + } + + } finally { + getSelectedPresenter().showResult(result); + } + } } From 2463f1757c1bea54dd16c4210f3d63ee2f6523aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Wed, 6 Jun 2018 11:27:13 +0200 Subject: [PATCH 27/63] added JavaDoc and fixed imports --- .../{ => presentation}/AbstractSailingResultsPresenter.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/{ => presentation}/AbstractSailingResultsPresenter.java (100%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractSailingResultsPresenter.java similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/AbstractSailingResultsPresenter.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractSailingResultsPresenter.java From 8b8a8d43a39707dd9da3b9f3c8a9c7fd11450186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Wed, 6 Jun 2018 11:27:41 +0200 Subject: [PATCH 28/63] added JavaDoc and fixed imports --- .../presentation/AbstractSailingResultsPresenter.java | 2 +- .../presentation/ManeuverSpeedDetailsResultsPresenter.java | 1 - .../datamining/presentation/NumberPairResultsPresenter.java | 1 - .../gwt/ui/polarmining/PolarBackendResultsPresenter.java | 2 +- .../sailing/gwt/ui/polarmining/PolarResultsPresenter.java | 2 +- .../client/presentation/AbstractTabbedResultsPresenter.java | 6 ++++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractSailingResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractSailingResultsPresenter.java index 387634395be..319324d0ee6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractSailingResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/AbstractSailingResultsPresenter.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.datamining; +package com.sap.sailing.gwt.ui.datamining.presentation; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.settings.Settings; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java index eb5d77f298f..e72a1c95a2d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsResultsPresenter.java @@ -20,7 +20,6 @@ import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsAggregation; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.charts.ChartToCsvExporter; -import com.sap.sailing.gwt.ui.datamining.AbstractSailingResultsPresenter; import com.sap.sse.common.settings.Settings; import com.sap.sse.common.util.NaturalComparator; import com.sap.sse.datamining.shared.GroupKey; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java index 69b6796a8e0..0ead4ea8645 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/NumberPairResultsPresenter.java @@ -21,7 +21,6 @@ import org.moxieapps.gwt.highcharts.client.plotOptions.SeriesPlotOptions; import com.google.gwt.user.client.ui.SimpleLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.datamining.AbstractSailingResultsPresenter; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.GroupKey; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java index c1c705ec83a..ded676f65da 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarBackendResultsPresenter.java @@ -21,7 +21,7 @@ import com.google.gwt.user.client.ui.SimpleLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.charts.ChartToCsvExporter; -import com.sap.sailing.gwt.ui.datamining.AbstractSailingResultsPresenter; +import com.sap.sailing.gwt.ui.datamining.presentation.AbstractSailingResultsPresenter; import com.sap.sailing.gwt.ui.datamining.presentation.ChartFactory; import com.sap.sailing.polars.datamining.shared.PolarBackendData; import com.sap.sse.common.settings.Settings; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java index 1c02c94c33a..013243f97fa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarmining/PolarResultsPresenter.java @@ -31,7 +31,7 @@ import com.google.gwt.user.client.ui.SimpleLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.charts.ChartToCsvExporter; -import com.sap.sailing.gwt.ui.datamining.AbstractSailingResultsPresenter; +import com.sap.sailing.gwt.ui.datamining.presentation.AbstractSailingResultsPresenter; import com.sap.sailing.gwt.ui.datamining.presentation.ChartFactory; import com.sap.sailing.polars.datamining.shared.PolarAggregation; import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java index 64f4837f862..08adc67653a 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java @@ -189,8 +189,10 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractDataMiningC } /** - * Register an {@link ResultsPresenter} to handle the retrieved {@link resultType}. Each {@link resultType} can only - * be registered once. Multiple registrations will cause an {@link IllegalStateException}. + * Register a {@link ResultsPresenter} to handle the retrieved {@link resultType}. Each {@link resultType} can only + * be registered once. Multiple registrations will cause an {@link IllegalStateException}. When + * {@link #showResult(QueryResultDTO)} executes it checks whether the {@link resultType} was registered before and + * triggers the corresponding {@link ResultsPresenter}. * * @param resultType * of the datamining query. From dca0df96b1f04fb7754b61ceabf1135930587657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Wed, 6 Jun 2018 12:18:25 +0200 Subject: [PATCH 29/63] added fix to resolve serialization of com.sap.sse.common.DegreeBearingImpl --- .../domain/common/impl/DegreeBearingImpl.java | 33 +++++++++++++ .../resources/polar_data | Bin 17351 -> 29122 bytes .../jaxrs/api/test/PolarDataResourceTest.java | 44 ++++++------------ 3 files changed, 46 insertions(+), 31 deletions(-) create mode 100644 java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java new file mode 100644 index 00000000000..814f93f963b --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java @@ -0,0 +1,33 @@ +package com.sap.sailing.domain.common.impl; + +import java.io.ObjectStreamException; + +import com.sap.sse.common.AbstractBearing; +import com.sap.sse.common.Bearing; + + +@Deprecated +public class DegreeBearingImpl extends AbstractBearing implements Bearing { + private static final long serialVersionUID = -8045400378221073451L; + private final double bearingDeg; + + /** + * + * @param bearingDeg + * if amount degrees over 360, then it will be mod 360 degrees + */ + public DegreeBearingImpl(double bearingDeg) { + super(); + this.bearingDeg = bearingDeg - 360 * (int) (bearingDeg / 360.); + } + + @Override + public double getDegrees() { + return bearingDeg; + } + + private Object readResolve() throws ObjectStreamException { + return new com.sap.sse.common.impl.DegreeBearingImpl(bearingDeg); + } + +} diff --git a/java/com.sap.sailing.polars.test/resources/polar_data b/java/com.sap.sailing.polars.test/resources/polar_data index 004b5dd6b5acea7a1cf2ab7535edbe321bf9ed05..d3a841ecee48d3a0c810391588f4d798b346e125 100755 GIT binary patch literal 29122 zcmbVU30O?u`@hphAr;C_veTkM33J~Ti6}*q&{R_m)r^^Gvu5APnk}U4J0VM^>}0JZ zUt49#n(Srkf9}k^-D7@bX8t`7r!$}Teb0G6_dV}9_q})8|DMp5hzXYvVU(4GCqn-O zk%H)Ot59JSPY`W|K8_MbTM42>kyhTqNS@d?g3p(_^P~AU-=_T@{ZNL=E91UkLi zd9KCY4NtU)My^EjC_%I!DkjQB7#$`E`GV&W2BJ+ zzSxy7<%dwlhw}yD5y3*CI6^24_2GpIVkE9aTUu(E!v0?}-XT&~qP-|Y>J{e6NAl6( zF2X1gUn-Ca#gdUikLZxdm{5KI(Nq#4jEM~O;YSH$`Cf`qB>{x7L=-8IIww#QbLYi` z^U-JKF%rI4bYy~?L@J1qyF5rJrUYCCV#O>2h&Hqgt4GWDiun9c&l)aVc~YK>FeX~+ z%@;#-cqCs+H1V9si{)8I@}k47J)))jaK6~7b_I7aPZTkkm_cw59vu@E%olrw4HihG z!f-JU(Ht2Q6)mChhH+?uzEZwOgeZ^_Zl35eTBECr{>iVdwc_epE3U3Jb#<+&$;;=< z=#3UgBZl$fUC|Icbord(#Y8`(@Q*0@SAewE?!VkH;@4R%f%nHZmO9Cw${kFOO0L{jgXb{Cxj^^Z0LsZ@C@_+18i?OZj)btqvYn~&cV+p-Tek?yy zA|OS)}Mw{7XRJ>8nqZ3nuwpxcgg+lg*F(`^^J?Mk=Z=(aoE_MqFIbZbesR&;Ak zw>C_hDF21*MfZEreOtP3OZV;Qz8&4Sr~CGFzc=0QP51lI{XTTRFWv7;_Z{fI1KoF| z`;K(KAKmXq_nqjz6W#Am_xscR0d#)=-5*Hz2hx2m-RIJMlJ1j=Ur3VqJX;QsAa4i~ zNck_^VnrWCKUXd!GaJUez=$~k)U*rvL4EQVhP_{EDS*(3B}!G z$-hT{c>JuqHXE++QnaZw zrXvwd;m3=Rb6RoKO4UM2wraR2-^&Fd%)r-AU+p#j2+>1+NffD3N|<1~lvnUXwC_2^ zQyI`~hM4G7Ge)f$%99^HGC{;g6O#X+9Dx`yWHYTB+RAWHBqj7ld5`uO?kZ2Vt&kVg z22tCt6U;*wPJS|R7V@Mnkvxg~7!vXzuI+LE?&(^D-VmZ2Pb3lxOqw7PgzzFG6MUsSu~afjL~WxeFhd3CV8BZl&Wl1j zHqM2wRE**rZP@iAVj?4*`MfA8(N)D}TeF{fq5wi#o_w@L%QyB;v>l2sDbZ7f9m?my zNS~6XqRhO8C3Z`dlS55Al-d%qEC(2O8{c8o`q>$0kMv zXF_~XCwcIb^!6bShwdc38KA)HUgL1Blf(JJ1B~*mos`gbfsrr_d|-GyaXc~Ugv5NnV(&O%`%pBL>kmS}{=6bs_L!u)+>qEHss9y`_*S!Pbz-aMrEF8zt6{u|gCbI!O6y!ifR%y( z`W%dQPegzfLx2@V0CfjObIuU3=F%IFxgW>!(1IIFGz<~)!@>k10^}+)QVcbsAsSAH zbSd1mDQ`YO8aH{eUmQ=!UJeL$*`_jDM+*Wi!^fmNdqtL zFFQ1D%?X;?dkA#6q}aQ1ph0zLc(t2+2~(qE^EgmQ2@+&+TArChtCrB@VxR17^GacG z;g<5;(wCTI9TJcz>d?b!gas?9Y=e=269ubot$sWOlcYycmVk$($cQ7%nj;E^FgFnt+4bb!5r%KEL3LYqa9#6hJM^6we=0g}K1}*W^wx9rh1A`> z8uWmh@{1)uMxvmgZ1iJw71j`4^{e9rDNnOy1vi&1EXqveE|}c+VZS|uTwZ?Ulj~52 zJM9{6?YfA;B@`(YM%thySpuz3z74r)H9xN?yKQB@-OgoZ8367SFbmx9s5!m(X z`4x&DX>^|IUYJ2iSV@Wc!@P!j4Ibs`8863sk=-7D$qnEX%X{|p3Z!H)va{DNT2gWq zksTW_Vp$SFWDk7%rw>UG+;?YNBqS2Gk&Q?8&2l6|5TJW(PUoYz*hgB#lA=^%8?~&q+Gp54`*(kak3L3vf ze99`e?^=?G*jf`lgi6u1u!Tq0*=0xuX@5!Ea&k^p6j+un=$TtF0r-1ggbtPVt>Hwc zE(zEgyJ)KWZY;wp+h8Q1@ag^oeKz^AHknbBC7g|R&S=YDHb*{pI=Wgf!}M&|1td<_ zn+p?*8?`)|z7*18CVX*QR|t>#W|fz4XDIlh{Hi;;WR(f24VELG9;|udjqZkJtA7nM z%&C90()Rr&;RzMZ&W3$lwi|Zppo@ zE4rvKijhmmvtU;yqHMC)gV&jD3WjRWS0r!9($=Ubnr*gyT%S&ep-+F>cHELk$oBs< zf0I+JDxy+uP{b4DoxNG!JDp#F_O@GjpDpWygYB6o`v1FbR6Pl%XVm6J<>}p-;N0}_jQV%SLX6MA z?qxF~VXwP^>HDs_3ce`6>W(OqQ)W@|xRQ`%Ea<2;>MFtYHce~Mrl>Z)@Q704hnacJ z+_V|y803Gv)>cMTc&iPDW8)GozbFOg@VPG!HFtry!QGw`hDWKp7PmT%`g9>fUd?51 z6_}#4OJs}$9ph_?FqU&SrJam$c!BO>JPBj@{R%B2uL($r?(7|lgm2AOO60#<D z-ZV@Q&(yeUZp*0%H~zcABmYQV)amtaFVI~zb(4(`liT`e|H0KCE>nj~{3iA9I*$DA zl$x#8AT%X~({hha&D1|z^25Ip9o*0zcZdQ}DmkILbFC#O^!aJmd282Yp0wAdO3`r* zsrADpsc<7YqHDrFNU3W!^i-(wx~DLXdJ+&iN+jZoovA_-@|7?7;=JIv-mfygy8bcu z&$MMz&-9=DBY4Gf{|tg_%t{GU?A`@EF^E(=z@QwZE(d-l!)yI@I)aL0JXA^%is^xA z4-%Ho`nK=;V$Z>f382eMiz!cl`J5_Wu!ZirhEwvA8LVD=cTSc_I|!BJJc&lMw+Vh! zO}}P5fzTR%s6Z8LsB#;6+>#(Ade;@+Q~=R2E_Xp7LC?ErHAQgPD~E0^Pt9DZswSU~ zV(P9s$^XyKX?}0-A$D8|gJ4B?BPm3J<-hGQ4A90}jc|IJXWQ|PqD(?p-BDqru6iT8 zAYA^(A9?(u|ET&L6$_|B($L+<4Mw{8Oc*&BhNH-)ZqWZK!=XD(z#b^|AUa=1z`JdRNK*khZ%cnld zmJ6Q$Yb3ffPr;WJusTNR0(@OY>3X_`Mj=toaa~4T6<0t*ql5l!)Z_nUbm+g04*!1{ z^(N(Nb-6!+9aDn~<&*tSqa)?0yqc+j(NW|-jrt|lz#14Gon50ro6-&t=eW9+`b0Zz-VxGjaF?&LxO5x z4UC4$mE@$=W;Ar$|HmkwtkJ5?D8IM{R)3~)74%Ls9Ik;;EVb8W6wBcn7{yY1ZAP&i zu7Oc3wby18%i$Ur#Zr51MzI{Ofl(~A*Jc#U;TjmlQhRMiu^g^}Q7pCBW^@Ai|41k# zrd69!Y-7-1rr3T_n^A0I(7-6RU({w4+ZZ%38WL1PT5U$LjX?vW*nUx)QEX$-z$ms~ z)Mhj+vBnX`sNyKygueM@U#`%i61^X~W56Es%b$oXd7gA*g~d~J<5SxMlL!%|*OfY^ zb4uld5go;Uj}at)frFZf;_ZNcRn+|C=Y6W8#_6W8BHuCUt_fwEAN-u#znI|uYFx0~ zjzqPgvi!AiwbszEnh;s|$v4o_xF;ATx>%gPVhHZnf4#_yX^qu{ln|KJ>-OjT><^d( zt-~OY`D#c*@4_;<2W|=~h-0igdHJo#pxw=RKulb={?i2>^j$Oc;(39kTwYC1_Nc{) ztdbK`g>o&o=vIOcx+t<$oj$KAS5-AS|ePLSc8XkTFE$?^v2Eq8Xm0G%$4%w2on2TVvlwz;}Z zZ0Nf^u=pG+!RRmuEK1zyG|66!b3%+^<;gQzpGLG^G>m*7bKv{! z4(`zYK;QCxI)hbmg5?u|dYn|Xi_G&zadL4?LHZ*UC(_hKjy|e5fv#509;LUt0&nxS zoQ&wBu;EayWvdqPtOv>nKWdn0JHeGFCzd;jD#{9*JqM$ecr7n(q7^SDuWN@SP#VvnMB{#KAIk&ofAz3g! zZT`3wAK57>BVf2;dW_r9377<}!yqu|=ap&Uz5hxO^yr3Y9@?a*K_9UVZ#X%x@%pTV zYxj||v=Onf$2+KWl3ffO^%g^RlbsITnw1dT%I#m<-TFbuj=vP@&fQ4JN1`|(YUSi= z~|e$mlQ# z9Iz^USvF4bDh|E5a@w=<NA-Ic{9FyevtK#I|oWPUh{(fK(JSQoc>j7lpg}n6AG}Z%U1Y#lWgk`cN zCPC{k2psh0bZp5J)xl zj!LZ>ib>Eq3<3|9zFFbZvA<(tltbBCmn*Kd{m%FJ~K9mA@r{%1F1 z9w;F&P{)3DyA_>S2}XxOAU0;^g9ytue{oWul_%$)FML#->PF_&yY_r(;t{fHTAwdp zXD?F83A^tQ57gp>Y_R5V%Vk$cS<#mJNqa^la+fuJI@ocaDo$Rs9F<*EiLl;Evm}eaI7)Yv*=ewb)|CC(yaH zD$66P82V3h>$S0}fb~Eb0qMAnJ(ElwF$r3SLEvD=|K6ME>foFZ?28lHKk{QnpM*qil3r}?-q1w(NOhl2 zDz1+1mX?+QUB*k2HY|<;9>iB)U-ujHSP6lRr^@&K;4Q}_XdMQDd(%t1{5UcM=S1r` zD^GqZy}x$e=0niU>HU@ZFN6?m^7MY+W(gW_!qHccllJaS3q^WPb>n5B2(!n^4&$uAj3j_r0X1S``Q7L86tYQl+{`DD;|qq5s*FK%mJ?;QFv z6}Mnp|7O2c=Gb+KddGKaUn6t3k4#zxDLcso2!lSp?>%7{G4ugQ; z+R(|4p^BS%hLgsa#WXlk5|b4|-Vd3bnR3+(8j2$XmRCEf7J-=)FAoNOiBBS07UR8r@$H=2MDff0CTQe?iAi<&CAR2g(Snbe!C2 z_D}qLLhCRHTZvTjlK%VK4nAZ6l#B&?$3v9QL^*|Yc zBgukZ%MQpe30j9i;Pvv?eRnKX?5#8>x=UDj^6R&2`-ARZ1?zLow5m%FLs+GrsHAmk zO*qL>j}xQ5Aijh+c{@p*l7u)(pWDfJPNJ$fDQzrg%60{D3z{L}?rbDd$Du{55S$XpA@L1<@1O9-%L&l4V{gc31V7({# ztc6NW*z*a8rxqt4i zT>qZE6^8$^JpL+#&w8MYz`XR9D<(lNOoG;75Rjd0Hgxr1J^9GY+QAEF&kfA`a<4xD zvlkTs(^uVr;VvUvJbCkhCYMsfv?h{5Vl* z>=v@@c=ER>)2-0fd`+9janD$fl@aj0d8TU0=iaOYqr)Ju_|n*u(g;NnndXFWV&%zW zca{%)y6OY@vU+|u&wh=d)%}TWOal~WJoSpsM2T9QaDO@O3Q0g~=9=13 z!a-Gz1&c3V0+W5xU|gS^bDS1eU~R;>C9n54WIa$u;I_bg*vkg&Yx&xY4ud$?Grm5k zm~4p0i3xUQ10&0u7O8;-;J&MGBffqd%E3GEUfihfpuaa`O@d(;^TTnK8XX zcO!15AG4S}O%*3(#-7Vx@7&o})An2d&I!?ll_yj6OS4Zj+d>vyn*!ZuIeJ zlLWV9f6n($I|Q?5R$cL6=b+8TD& z&hInpfieO!C!O45G6b))(K-wQ$G3mF@pA73oDvtLEr_M=!K!s2|F;GUr#TQ7uwFQr+j1 zcgtk&%fFaFr#2Fsqo1N+0=zBl7V@3-KpBDLE+2jpUoh4f9R`8BJsNL5n{S76!oe!M zWJyMc^WyhYp`}%MV&uUe;L8h_T<}ZLgcFW>oJ{X(V1nvu*}mbQ&!d*qe_}IRb)D_% zHmjh5(3h#o_)N`EHDXLhe6=rLo3fNVU9Q_gg+}! zX00p9+jN5@zghG#l03QzHYiwdzH17ZmD0 zFU?dHCly`i9K9Yl8#+~M&-9tP2qu)>47^muV?9ttU_C#4)}W}Hm;|lEAdnxIZ&hj> zh;yQa-5-&klGX}W6-j`5PjJt5 z^Ju!>n~<$IRgsdkQxzwtT68`X7{Dhh20L5%t#W`)`|fAyCE<5$N(hWwz5Pe<_IDU3 zv<`#7nxjQm0uvVFoDjgulNaBgS@}M=9{I!J-QK89!@%a+k7oG`Hfh2MsL4t3q>9R( z1UIioMTK{LLY8{!+>FAmsyNwwCQsZrshTW4s~6b(pck0w#5k-fYKM8Cgn)OwHv3NH zK4c{r9R`8#jZ4gQ;xHmp2(V5s?^_M!dA(w(0s-Zwu6&3Wf@cI_}#$qBm`bJXJ` zy8-XQwOq8{l(|H8e}T^Ssr@R4?oqYxfPTr$?4(d{aF*>APwv$drrIrQ+U+O%gHOcdW~`5l4uinEtb^Z{U)qAli5_+zO;+w${n&NVDd<&@*<`TMnA4Z(a@sBj8J%kj7 zIJHS?tXrfBC+2E#lC3{&io+@@PQHDVG(wzgFWx*Bz2__+sqXX1b6eAbb8ovr>j|5i zbRsW+??>t4(Q#O%P#J-xjYixIw%f}3$mlQ#T*%rQxahMp9w(f^tUP(&D85iQU?3P- z=kzz;{Q?G^nYqDlmZ3^c*nLOM`(jeNLl^DEAJNNLA2$7oD<`-%Uc0K%`vodEDcIlc z*wbWPsPBKEdx>=>447XJhPd=+Jy1qKJnmzMcGHev60{D3z^>r!vL69@w>{RWyOYiq(uhFWn#66MzxjJS$8={~E$_T9FUq4jH!D@+&4uineYO-D5 zma#Y|oawAZGC$ecaOj`K(BN`UyQ~eD!6nBz!7E(#Js`VwI63NZqLoPajIbqS$6gQ2 zv@#^Pz4r8paNMRUPVU_}bY*uJdoY+BQl9^9ACR|fqRtdwW<5|wAU3SC{`~~(c@3k( zAaH1mQT)buo4+{0Pdp{Ag>wg-TMbQTnPv|w@&}JNuZDbACk@sP=ZKn|gza$-Kb$B# z?`M(c(2w9wHz>V5B~%qBj~a}Bl@fRyjCW4+wt!#Y9@op_Rri+|CrSt;j^_3?EyvIH zv<`#7$vvlUjvl9&HM8%GVJ(s`_X~0|2eyOOi-w*t>iGqHs$;UWQ|@ZQiLrW|=){vSJfmpdT-^Kg`%|!Nb|%{7g9-3^PO!Vx zN~8CbQq|&w?BIT8AbQbN_C3FOuW^W*!|TnqpmVK!W_6!WUdF6zwW(n$v>*CMAj_-| zqYn#@9M!^3Sjq^j9JqOHP$qspp>-Gpu65FB>AvC<&IxBU#>qo-N&4%w3((|XR_4p_ zr{KA%u^_zAUz0dlsU9cWR(Q@$MD>$clXGp*d6u*kEiXo`Do#e-UXj`)1KOV)6P{=5 z2V-&s-_vpIEj~IT4ES+z= z!%$z78a44zElxVRDk&HvJRA>0 zho7CkbTb_0teJfW%i82~Jy{DOzacbVQSD&* zDhj-wMBh5s$XsQdVCNH#dYo{02U>SQwdvCnay^~u6I?-M)stM2Do%2|tdisF_aVRS z`*y?W<|MG%e<(edvv{ zH(j20T1t%akndRPPD37 zdGe$2n8+Wt3!!8Guz-yp-oY5@-J#!ZXmSt8xvO5B)H7?eYR5K$yTR+@JAJhOB$;e! zy471%oa`kXHqUc-NfwuxZok}k2bdbH>#*)IUI9`;aIZ`9rMqJkYyFU2RyX*fwrP~Q+(Sh&NJ#gL+6}Qi<9gQDVK{R z*#!4@siEbDY(jP-QFK*H<=OthiIZ<)4-W>D?$GE=BnLc>CEV(Cb_DBzG6J*he|_<6 zi9MTObQlCq72KI0v(^1CPHwXn$s1{pm*3Y31)Uyu7UozuLVwAcm`fGGa(Oj5QSW^= z*|*-mDm>A-m97nUCw9R`61U4M9ZC;#AGEqI)#!fieQC4}?6QnTOreF**zaxj)W)Jhonl#|a0EJhJ#^hUep+ZeS*x zXsHv(1Mk~YKYcH{t&$ULFCL>FC-rRft`)Vn9XW*yM z1-IfsyTgK!U$(Y|zF}#9I(jMc&%g2s#)*eooN%AX{_7ls-YLKMrE|!Kg@kP3MswfY zcT{n*HPa$+|ClM{y$R2?771ga(cA;`76&z8Jyu4*^=^8URZ=i3!RRmuOn>>aGR!$?IbjIvfiePTCzyWu@wf{n zLF+IGd|AW4U#Zgp=S05+D^LFM*_gRL@h9}Y^=D_~{KX&?ej>XDY4klWN44UFY`ERv zdgf9>cD`))kac$m+2n*PqmFM=!3lZRWSuQx?L>Z@CA#+I=U zj=kZljDXb2P9n9%-^QSI7zFm2xCeUsl;E6jdSjfFUO08gYQ{KdHq$)9;&V87Tx-28 z@HEKf|Fw27PWGtB$+tW^w+{gXcTd3Y7l{>wY|Ph*y$%Ga;-vVV$0UPKUSMkT@`doX z4h&B->wSDU{+6N=0`rN4{JUN7^9ilPAdu}3FS=bY`->AH#>x95mmFs8i35v0B`2=6 zFMzS6%k1=%0!=vCpcW@&151bNUC{HL%Rc(Hobd#AglydB)b^@4IaxZ=xaCMGS<$c6 z)RDU3(8abZ@3N^U=7ACdyfI(LH|c^s6K8Z71UCM8)-kSCIL-+%0JC^uG3S~0MHjNF zM}cVm4MXT$S& z+d8m#GXAW(E~eCC8MOL0!LY*~5o zbw|nCr{Uhvp|I7BTjv5H&~g0SQD(*}+vW#- zo^MN3#mVz8e_rb~F@rYw*_ji9OktGIG|PG&<5>@s5m=tmb87qZ*D(oNhe6=7QN+aw z*A+Eqrhekh%9D9rb@pcME&zSmm_NRL=fHWi){0w)+%(~&>R+62NS^_>+TFTyUqw9d zp1(9$kPt&|ywG~(n1@Hm0&TmQar{TvOqCF5RNf=*aXEJX%jhr&4B}-N#s2;)Z~XNg ze0pZ&lEFe61nS! zIgL3yS5-W`?{VRVe)p$f{!q`>lRN}|2Mq3!J0`Q7C?l}!v`1R|1G<<5t-~O2Q6IS9 zk5|Zjq~k#=mz5_gTJL($#%Bq1_?%JDZcHy2?O8g~TmP6QoGen06TOM2KQu2)lwEza zYBSdsoy}gEHM~7d6(?7w-(50dlNI@A`a7~;j|8xv|BIZAfBRDzfye~EMpr|zKjXpZ zFbJfR&SIA^#VV&cA!cKo-0jn`pg7_-=$75LYT7vg2Iy}n(*3B2Xf^lT1ob%Ka1-u} z(I0}&O0OP?qK7+vahrm}m8v*-6=#^JHF_wtuiE_h(cm56|KgHf-WnO}fieQCn;mU+ zu&O&ILF+IG-17Ku^mu93L9Ro;Dz!?J;iuGQ$yFLZ^f*ha@l$2#)P8YVwOpT&$uP!9M#JdkMwM2Rz!;5) z-4KNsyziEM+v3xboAy-0FsgZ$N~6j$Wew75(p5@EqhO*Lxxu7o!YFr4N>*u<0y&K8 zs5KeYDn=j17#RhtJcdzaWTt7g`b@1>8826=OolMZ6LUqI^}ojxr!a<5?Q{xbY`Tm= z{F;nG+AJMoR2j8;L!vfHqfncaObX>@$kdwD%6KMAo5RGKM>V8SO$|D=$|%ie4U3eU zG8pu%y~)7DYSj7R2BRvAgB+pNvkYM>z1hkXstx85gBr3Y-$Q+hv*tpRvM#^O&_c>7_}LC zIdZewl%+9Xx^pfvFu};^bjSrpDqM!9(I3q&`sHTV-#oki=GpaUXV;%Kp0k&iOI8^( zqvd&FXb3r)zTiAP)gKA`%PRS|1=3m)vanI+n{VtX3MuMgQDk8FHDc(uxUMP_XBW05cdOdzYp&B!Tr9t-xv3Ta6bt5`{8~+-0zS3{c%4S z_k(di1ouO5e*o?e!2N-^KM?mraX%FIY22sHA849?UcnJ);2Mesn)?uX+uTR1Kh%14 z>ev)v@M8l!+HHeOX(~lLlc8q}1{BUw)I-rvZ(!o|S_OKf)pyOwWx9pLu=`L(HPBl) z(MoM>4vZ$FO6?yl*9GV4EIXNf<~LYwK+#F(Sohj@hntP9lu-5&RDHEpu8fc?P_&Pt z>KQZ9xS3kD5(Nyi<<7b6(q)&cJyO=&VmyjLN)(#0)rL&Do>7`p-XN4dP{3A3>a`}_ zP$qv#;`NUjN8j0RPuZtX^)uy$1XCJ%Y>-h7<56Rznh<8oP~>Ez=7$UfX$GSnSx;dUn*#9X=H#6btWUY^e?&zp9kP04Zj8VMW591N-nOrDMfm&@){7Gkdt zfXL-?m4YAm)czAa3%{UzxhXM+MkD1yWU1J+aVYNv=dlscV~U>gwv1sjLdlqn#C#ot z4B~!Jj6fb~Bt+V9l*&k=&PX|h#U{rjN5zD3;kFgR!KMgXc_&SdrjDykq*}RgkXmlw z3K7NCT+gpYblqf6)fqzh$aOlsHjho-Otf6Xm~v2sVKP@QQJQF#TCFlL3av(olD)ez zU#C*Y)$05Nqg-z^B1%je!$n01qp>Lv)=%+)N=!APFvW*1j`i)(~T%6WvfRmo<8 zgWU%-_4#PyC~ig_H0UuqbzXVM(~`hg9IV>XcI;ChT7G{7~H5X43}y<)N_ zc~7*bBw>^*O4gR_8>Jbl(Hc=GXpAZiH6w@^so;N1s(CDbA>^UzPoZbB7>!Ym)`r|* zOvpB&IAlOetFeJCBL#gdm|l50x_7Gl>YN4h5tJddKoQiNcL^~DX!2wAN=8qP#jch; zJJYoO4;I%5>o7+IaK(Pp9QjFU~F+M>!gAwMfki*}JBN`tl* z8|b6bBLy<8KEq$GV;|$qVem(rGt*zLk*o6!Ducf; zjKM$7G9<48dBimxtBXO7LAw-1Z?tuMiP(!aw8EsipJ z5RIu<<;A9tNHArg$Sp}t4MUpw$~sP~(ijb(R5D5<)#U>;%d{vCq*5+9C^~9UX+C0P zv`KAbb+hy3oTsxx3sS;{@=)XeKeGdH?Ta!da)2N206)S3?5PX;oOi&oqxYg_JV}+K z{gz5OE3`~{x=Nu!Q2CKe?1+ufa1M0hk88)DrzpD3ZQU1JDe6$w+pd+UUJBJ;pFQFQ zMImc^gv25^&Cl#KzxSL*uh?5ZHuOzzG_Iv;X7de&3QE>{$3JWEPMPs8oZG?d=!6|N z>?>GKXg(!&_QACcAPLlEQr&h~@?h4vhQ3z?&e}MjGBjr9h|Cm%(@F==A#KvAWmNwY z_XtiriZzEcCZ|X6WJM3;g--w53+x29ta$ZhF6Gf2xnKx?aA2KXmjy>r#se++=a3BU%)!j{btISsR+B2cwH07SEIZNHm09zn2zBXaiw3@>H^)ym-lH!DP&pzvt z$I11i`>01vc3)57;{cQ1wLv0-Ji{HgSpTrXcrk-VWZKb9i7ov%gqe|FX9Jco*f@=SS*Lv1GyS{iRfB`xUQ;=2Y177rC}-!Dg{d z!h6md6TyK!#{1)cpq0RguGy^@K1zY29=-#Y%=Lt-P`jfm!yBNZ8w$T=pJ-#z!nK zG$+DcVr|x7Q`j3OnKqZb3{xiQbc|lgp0yBG#_*SP)>n1j++jWxA74#k&CO(+UWa7L zZ*%zSr&-h*sb)kfN0(-5^Bo=wl${PTM3L8BwE{usLpeH2X!Uqtj39sEv}fhd=gJ0~ z4M5Y2*{luVpR=XBaMx4Ya8@Y!!Roe)v^%Jij76tX8PyP@%^%KQYgxuqY5mE2HTJ~9 zo;cBsW4@6JtZjL-3ka`q4uZ;nu6(hWd2#qymM$_HeYV^dhq0%51}|NJS!l6l=dE8Q( z#Qpu4jws-U<8s|hBZ>jB$!M7HVM!oMFptKXFx#B*a{sXkSt740%4|6MsE}iv{oY7J z%_Fho`DXHmD2@4drExSz7pZiZV2UkE<17A)(nL;(sttY;{a=(0FR)12vNXBELjG`{ zaw6zYZI-&38ASTjOOUc1W%i-4b2VUe<>R58{<7NJzh3DxRTW$AxWN~~^Mmg3AMa`EFNQrnIq5`zf%M82?P zDUldNC?)cREu} zFy4SdDs*De&wDgJSXX4d}3PF{S%jA>-BSI`z@a# z24t=%kj|s4J6yRk2O?hH`gX7TBADK8-P9igFAyeKQJ`Yv*e_3(8wn09!&BhRmby)+ ze^fz&bo_;J`9GMcUH;JNHj329Y3Lg}X`#c<1_b=*tv?eBrT* zn)Ft%W}?@MF4G>10l7#NNT0Sh?`8*2g^ca@7MBjGfwEmipIz@>N*+(Ad5wTY;^9J z^PY(&kVU!wb<{Wr=4QK=?AA^pOtPZD$<|9xc)LUs99V{@NS(UB@N)C{h6L$wli;s! z*KU3bw?v3MTjpBR`dcXUyWV2g6xNTAxY-xe-9oK zCRtHnX=tBk?T#r34lKh{pt9!s^7?h+Ns!bYfuFvlo?BYBItX06{j`nyM?>u8N!1N^ z92NsILlnr*SM}Sn;Ny7uk24+g#Si1bTiO5hGIwXfBr6KY|DILew+%VhSca#-+6@`; zGw&aL4M&Ee&dCj(c3v zF?0rO8<5!Fe!&O z7(F<2bZ>`DSn(=)`GQxw#DE+l3S`rQ^GCMNJ_ph7*1eHM*1)`L(GPpB%O*^+qQDty z*}jk8XbBE1!&9V<`u=d@S=?4~ChNu%{C52(PnTkQH;$Ko>YFr| z1ZhWPUi#Mbk-s-`SPvd6tGw!}wn2QtL-%J1fzLzsfA1!6@G?9FmbLu0sAcpz5+oHW@YCgUliv1ewv4WRbAQi{ z4Tr&F&Fs|hC2PfiY%2yN3>jnCzjy6zn04Z*&y}^waLj3?edmqq1(U2PQiuDa&$his z?lCOGQ>0;W(xwjc%`XG-o{adF&={yL&rz5$y4ClgI7&Sq#X|qCooI zDQ`8YvL1~0+I=SCt9U423Ebe^BLSo5d+d+6v#SjwtOGEB?ZDKm6gX{ISMmQHb`?E zC4A>WVoiY~x}eR_^&nw1mfogk-K z*2oLLoEHN!QVdA?>0aZO*VnEx4!5NhKpyv>{LcZS1StaK0d%@@d6^b^D;aI z{t9S0y!FmX5~SU30^}2B;hNPq=0Fdc>eF?=PSD2OysAuDB?hEc6v#(=R>h19d;&h* zmBH;d-3Mjfo`*A6k(H(u1=c%1XDW^~6^!O(cnaKTexcX(4Kv>Zxl`b$?=4w%^FZDM z@VZ8KimXb3u?OxK-HVM71G29ukiR)P)Qvm-J9He~tvGkuCP)izIpVL=V+E6}DX@M@ zn_D9npC&l43{Qb-muIW1gGxz|)FpwRzFwJIl@K}sT4Zl7vM)LX$;X~Q%6vUX49HMX zAYb4AHDltwjnKbwmag-_X^`*LU`w|hmj#ooDX`DMdD{KOGJ*rk@DzBt;+*2^4s}V8 z_CW$a{p^BcW+PJ-1iG(V+-YHbFnYG~t!g5scBSr!0{Qmd8foyuBM_uzCKo-*14EVb zpI62n5KOYBz|N`ZdCOMB5*%2Dr@(`b*T-#j9!r9h5TT5IHT?LDn87{}usmVI^#Sui zH{->yjq%kYW|Dd?1|;<8q$_;cejcb{c;B#HUa(E}!}v+*j|d1>6u8rIVukW3d7Xh} zc#72flYZ5(rXvZm**QXEx6;E7(tx9oSvmUti7F2$t3NStMy#0gB=txX$mWl7JxyEY zL&DRN>+q^KEKa|W(5TNs!XzsSoZeg%GpAW&f&2j-vFv*GnJAW$N<@BVC;J`9G1s*Gh|GYFjhXiR?CGgWv`X8OR=~6@R zAL5mjxV|@J^*{L7`SddpAgRluKpyGu7BS~ud$3<~e$7`G69DFao$-}>H^C%p3KaZ& zv6FiydDOx(JOwId%{b<~KavDV1qd4Hz1JNRjvUm`PYvA)CSFlM@3S*1Hm+2P0g11u zKk#xnOtRn$kFwP;ZB&y&Z(~b1)UNdPc^@)NSW)23;Z?UT%E)sHmf*Mg6sUUhOApDEm%_~OGCW1|0~RgcHhZ>4v> zxpaz1A=VV=J$XlBaZE$PXe`51K-Jo-LCJ=K_dp6?dza83cQiEkGPH)?J92{Jz|(O0 zVdG^Vui7c*g%7nz3`meV!eCSH<}ghX8kgPF9V!gPr#)_Z3J|O*QVKdL?%gHMhrA3= zkA_SzS-H6c zhEG3rVY%OYSRT;m+@F;%2$QTR@T2@_YnKQz{$d%PBK5Fq|4F?GT}hC2$kzl;JEivx z>-Iq8q(|$oT^b05_nxP9X|zzxa=j%6Bz^z($aBeqy`W34@)@$siNMUhSULV}1Od{D z0vk&w436DRzSY7qJOzH1MHf1BGuNWHth1v9jr8w#nZIL4K8KF;*O*%QYCztq$(Dh$ z&WHi|xfqZ@rB4oW-o61sBmVkhbV*~Fa;wr~>RMvQSySK;Q*Y6flWPQ{c^RG}rA9^0 z@f$OaoJo6P=IK{2M@gc->jnMBxu2x`XF=ZioQWUhxr+h0MGQ##*V`ek2j|{_j=mu+ zCj=THtwYb*C9Bg32v!tWUskg<_7ma%EhM}QPl4*PC+EJO_TEJnbyd(v-|GCU`^|Av zp>>q2m((x-QnHtnC { + polarService.runWithDomainFactory(domainFactory -> { try { client.updatePolarDataRegressions(); } catch (Exception e) { @@ -51,24 +49,9 @@ public class PolarDataResourceTest { /** * Test to check if client importing data correctly. Using {@link PolarDataClientMock} which use {@link File} - * polar_data as source.
- * The following steps are necessary in order to produce a new polar_data file. In this example the event 505 - * Worlds 2015 is chosen
- * - *
    - *
  1. Run the local Sailing Server and Sailing GWT from the run configurations
    2. - *
  2. Access the local Admin Console
    3. - *
  3. Go to Connector's tap, select TracTrac Events - *
  4. Select 505 Worlds 2015 from the selection options and click at List Races
    5. - *
  5. Mark all of the resulting races, click at Start tracking and wait until they reach FINISHED - * status
    6. - *
  6. Access the local polar data file and store it - * within this project's /resources folder - *
- *
+ * polar_data.json as source * - * @throws NotEnoughDataHasBeenAdwas - * edException + * @throws NotEnoughDataHasBeenAddedException */ @Test public void testImportingFromMockFile() throws NotEnoughDataHasBeenAddedException { @@ -76,14 +59,13 @@ public class PolarDataResourceTest { PolynomialFunction angleDownwindFunction = new PolynomialFunction(ANGLE_FUNCTION_COEFFS_DOWNWIND); PolynomialFunction speedDownwindFunction = new PolynomialFunction(SPEED_FUNCTIONS_COEFFS_DOWNWIND); - assertThat(polarService.getSpeedRegressionsPerAngle().size(), is(36)); - assertThat(polarService.getCubicRegressionsPerCourse().size(), is(2)); - assertThat(polarService.getFixCointPerBoatClass().get(boatClass), is(105594L)); + assertThat(polarService.getSpeedRegressionsPerAngle().size(), is(68)); + assertThat(polarService.getCubicRegressionsPerCourse().size(), is(4)); + assertThat(polarService.getFixCointPerBoatClass().get(boatClass), is(9330L)); // presuming that if downwind functions & regression collections' size are correct then any other thing is // imported correctly assertThat(polarService.getAngleRegressionFunction(boatClass, LegType.DOWNWIND), is(angleDownwindFunction)); assertThat(polarService.getSpeedRegressionFunction(boatClass, LegType.DOWNWIND), is(speedDownwindFunction)); - // assertThat(polarService.get) } -} +} \ No newline at end of file From 3feb1203261667986def113429f3012a99cb663e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Gro=C3=9F?= Date: Wed, 6 Jun 2018 12:45:40 +0200 Subject: [PATCH 30/63] added JavaDoc describing why this class currently needs to exist --- .../domain/common/impl/DegreeBearingImpl.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java index 814f93f963b..b42a9d329b2 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DegreeBearingImpl.java @@ -5,17 +5,22 @@ import java.io.ObjectStreamException; import com.sap.sse.common.AbstractBearing; import com.sap.sse.common.Bearing; - +/** + * This class is marked as deprecated because it was refactored to {@link com.sap.sse.common.impl.DegreeBearingImpl} + * which shall be used instead. Nevertheless it needs to exist due to serialization issues which can be resolved with a + * new general data import at each server instance. The serialization progress of this class is therefore adjusted by + * the use of {@link #readResolve()} which returns the refactored {@link com.sap.sse.common.impl.DegreeBearingImpl} + * object. Deserialization of this class now points to the refactored {@link com.sap.sse.common.impl.DegreeBearingImpl}. + * + * + * @author Maximilian Gro (D064866) + * + */ @Deprecated public class DegreeBearingImpl extends AbstractBearing implements Bearing { private static final long serialVersionUID = -8045400378221073451L; private final double bearingDeg; - /** - * - * @param bearingDeg - * if amount degrees over 360, then it will be mod 360 degrees - */ public DegreeBearingImpl(double bearingDeg) { super(); this.bearingDeg = bearingDeg - 360 * (int) (bearingDeg / 360.); From e61b816648ade6373a209f8daa6e8d4f282c917c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 6 Jun 2018 13:50:08 +0200 Subject: [PATCH 31/63] bug4552 fix for selection model, added i18n --- .../gwt/ui/adminconsole/MediaPanel.java | 72 ++++++++++++------- .../multivideo/MultiRenameDialog.java | 12 ++-- .../sailing/gwt/ui/client/StringMessages.java | 6 ++ .../gwt/ui/client/StringMessages.properties | 8 ++- .../ui/client/StringMessages_de.properties | 6 ++ 5 files changed, 72 insertions(+), 32 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java index f269058013c..6ff5ed66618 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java @@ -16,12 +16,14 @@ import com.google.gwt.cell.client.FieldUpdater; import com.google.gwt.cell.client.TextCell; import com.google.gwt.cell.client.ValueUpdater; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.BrowserEvents; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyCodes; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.user.cellview.client.CellTable; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; @@ -29,13 +31,13 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; +import com.google.gwt.view.client.CellPreviewEvent; import com.google.gwt.view.client.DefaultSelectionEventManager; +import com.google.gwt.view.client.DefaultSelectionEventManager.SelectAction; import com.google.gwt.view.client.ListDataProvider; -import com.google.gwt.view.client.SelectionModel; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.domain.common.media.MediaUtil; @@ -49,6 +51,7 @@ import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.media.NewMediaWithRaceSelectionDialog; import com.sap.sailing.gwt.ui.client.media.TimeFormatUtil; +import com.sap.sailing.gwt.ui.client.shared.controls.BetterCheckboxCell; import com.sap.sailing.gwt.ui.shared.RegattaDTO; import com.sap.sailing.gwt.ui.shared.util.NullSafeComparableComparator; import com.sap.sse.common.Duration; @@ -70,7 +73,8 @@ import com.sap.sse.gwt.client.panels.LabeledAbstractFilterablePanel; * */ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { - + private static AdminConsoleTableResources tableResources = GWT.create(AdminConsoleTableResources.class); + private final SailingServiceAsync sailingService; private final LabeledAbstractFilterablePanel filterableMediaTracks; private List allMediaTracks; @@ -78,7 +82,6 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { private final MediaServiceAsync mediaService; private final ErrorReporter errorReporter; private final StringMessages stringMessages; - private final Grid mediaTracks; private Set regattasDisplayers; private CellTable mediaTracksTable; private ListDataProvider mediaTrackListDataProvider = new ListDataProvider(); @@ -94,9 +97,6 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { this.mediaService = mediaService; this.stringMessages = stringMessages; this.errorReporter = errorReporter; - mediaTracks = new Grid(); - mediaTracks.resizeColumns(3); - add(mediaTracks); HorizontalPanel buttonAndFilterPanel = new HorizontalPanel(); allMediaTracks = new ArrayList(); Button refreshButton = new Button(stringMessages.refresh()); @@ -133,13 +133,13 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { buttonAndFilterPanel.add(multiVideo); - Button multiVideoRename = new Button("i18n rename videos"); + Button multiVideoRename = new Button(this.stringMessages.multiUrlChangeMediaTrack()); multiVideoRename.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { Set selected = refreshableSelectionModel.getSelectedSet(); if (selected.isEmpty()) { - Window.alert("i18n select mediatracks first"); + Window.alert(stringMessages.noSelection()); } else { new MultiRenameDialog(mediaService, stringMessages, selected, errorReporter, new Runnable() { @@ -201,7 +201,6 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { } private void createMediaTracksTable() { - AdminConsoleTableResources tableResources = GWT.create(AdminConsoleTableResources.class); // Create a CellTable. // Set a key provider that provides a unique key for each contact. If key is @@ -226,10 +225,35 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { } }, filterableMediaTracks.getAllListDataProvider()); mediaTracksTable.setSelectionModel(refreshableSelectionModel, - DefaultSelectionEventManager. createDefaultManager()); + DefaultSelectionEventManager.createCustomManager(new DefaultSelectionEventManager.CheckboxEventTranslator() { + @Override + public boolean clearCurrentSelection(CellPreviewEvent event) { + return !isCheckboxColumn(event.getColumn()); + } + + @Override + public SelectAction translateSelectionEvent(CellPreviewEvent event) { + NativeEvent nativeEvent = event.getNativeEvent(); + if (BrowserEvents.CLICK.equals(nativeEvent.getType())) { + if (nativeEvent.getCtrlKey()) { + MediaTrack value = event.getValue(); + refreshableSelectionModel.setSelected(value, !refreshableSelectionModel.isSelected(value)); + return SelectAction.IGNORE; + } + if (!refreshableSelectionModel.getSelectedSet().isEmpty() && !isCheckboxColumn(event.getColumn())) { + return SelectAction.DEFAULT; + } + } + return SelectAction.TOGGLE; + } + + private boolean isCheckboxColumn(int columnIndex) { + return columnIndex == 0; + } + })); // Initialize the columns. - initTableColumns(refreshableSelectionModel, sortHandler); + initTableColumns(sortHandler); mediaTrackListDataProvider.addDataDisplay(mediaTracksTable); add(mediaTracksTable); @@ -240,20 +264,16 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { /** * Add the columns to the table. */ - private void initTableColumns(final SelectionModel selectionModel, ListHandler sortHandler) { - // // Checkbox column. This table will uses a checkbox column for selection. - // // Alternatively, you can call cellTable.setSelectionEnabled(true) to enable - // // mouse selection. - // Column checkColumn = new Column(new CheckboxCell(true, false)) - // { - // @Override - // public Boolean getValue(ContactInfo object) { - // // Get the value from the selection model. - // return selectionModel.isSelected(object); - // } - // }; - // cellTable.addColumn(checkColumn, SafeHtmlUtils.fromSafeConstant("
")); - // cellTable.setColumnWidth(checkColumn, 40, Unit.PX); + private void initTableColumns(ListHandler sortHandler) { + Column checkColumn = new Column(new BetterCheckboxCell(tableResources.cellTableStyle().cellTableCheckboxSelected(), tableResources.cellTableStyle().cellTableCheckboxDeselected())) { + @Override + public Boolean getValue(MediaTrack object) { + // Get the value from the selection model. + return refreshableSelectionModel.isSelected(object); + } + }; + mediaTracksTable.addColumn(checkColumn, SafeHtmlUtils.fromSafeConstant("
")); + mediaTracksTable.setColumnWidth(checkColumn, 40, Unit.PX); // db id Column dbIdColumn = new Column(new TextCell()) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java index c3f20f16f77..8f55795912b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java @@ -63,14 +63,15 @@ public class MultiRenameDialog extends DialogBox { setGlassEnabled(true); FlowPanel mainContent = new FlowPanel(); - Label descriptionLabel = new Label("i18n select tracks to rename, ensure that replace and with are properly filled, then execute"); + //placeholder for description if required + Label descriptionLabel = new Label(""); descriptionLabel.getElement().getStyle().setPadding(0.5, Unit.EM); mainContent.add(descriptionLabel); - mainContent.add(new Label("replace ")); + mainContent.add(new Label(stringMessages.multiUrlChangeFind())); replacePartIn = new TextBox(); mainContent.add(replacePartIn); - mainContent.add(new Label(" with ")); + mainContent.add(new Label(stringMessages.multiUrlChangeReplace())); replacePartOut = new TextBox(); replacePartOut.setText("http://replace_me_with_baseurl/"); mainContent.add(replacePartOut); @@ -115,7 +116,7 @@ public class MultiRenameDialog extends DialogBox { } }); - doSaveButton = new Button(stringMessages.addMediaTrack()); + doSaveButton = new Button(stringMessages.multiUrlChangeSave()); doSaveButton.addClickHandler(new ClickHandler() { @Override @@ -133,7 +134,7 @@ public class MultiRenameDialog extends DialogBox { @Override public void onFailure(Throwable caught) { - Window.alert("Some error occured during saving!"); + Window.alert(stringMessages.multiUrlChangeCannotSave()); } }); } @@ -183,6 +184,7 @@ public class MultiRenameDialog extends DialogBox { dataTable.clear(); dataTable.setWidget(y, TITLE_COLUMN, new Label(stringMessages.title())); dataTable.setWidget(y, URL_COLUMN, new Label(stringMessages.url())); + dataTable.setWidget(y, URL_COLUMN, new Label(stringMessages.multiUrlChangeNewURL())); dataTable.setWidget(y, DURATION_COLUMN, new Label(stringMessages.duration())); dataTable.setWidget(y, STARTTIME_COLUMN, new Label(stringMessages.startTime())); dataTable.setWidget(y, MIMETYPE_COLUMN, new Label(stringMessages.mimeType())); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index bc8d458077f..c351e75ebe6 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -2184,4 +2184,10 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String multiVideoDoNoAdd(); String multiVideoOffsetInput(); String multiVideoDescription(); + String multiUrlChangeMediaTrack(); + String multiUrlChangeReplace(); + String multiUrlChangeFind(); + String multiUrlChangeCannotSave(); + String multiUrlChangeSave(); + String multiUrlChangeNewURL(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index ea5d21cfe22..e580c3eb0cd 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -2172,4 +2172,10 @@ multiVideoWaitingForSave=Waiting for confirmation multiVideoIdle=Work queue is idle multiVideoDoNoAdd=Do not add multiVideoOffsetInput=Global video offset in milliseconds: -multiVideoDescription=The webserver is required to provide index listing (subfolders supported if indexed) to allow file discovery. After an initial analysis of the metadata contained in the mp4 files, the videos that should be added, need to be selected via the checkbox column on the left. The "Add Audio/Video" button will create media tracks for all selected files, and add those files to all races selected in the right column. \ No newline at end of file +multiVideoDescription=The webserver is required to provide index listing (subfolders supported if indexed) to allow file discovery. After an initial analysis of the metadata contained in the mp4 files, the videos that should be added, need to be selected via the checkbox column on the left. The "Add Audio/Video" button will create media tracks for all selected files, and add those files to all races selected in the right column. +multiUrlChangeMediaTrack=Adjust multipe media track urls +multiUrlChangeReplace=and replace +multiUrlChangeFind=find +multiUrlChangeCannotSave=An error occured while saving +multiUrlChangeSave=Save url changes +multiUrlChangeNewURL=new url \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 2d841a20e52..1425b176c15 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -2169,3 +2169,9 @@ multiVideoIdle=Keine Arbeit offen multiVideoDoNoAdd=Nicht hinzufügen multiVideoOffsetInput=Globales Videooffset in Millisekunden: multiVideoDescription=Ein Webserver mit Folderindex wird benötigt (Unterordner werden unterstützt, sofern diese auch indiziert sind), um die Erkennung von Datein zu ermöglichen. Nach einer initialen Analyse der Metadaten von den mp4 Dateien, müssen die gewünschen Videos in der linken Spalte ausgewählt werden. Der "Audio/Video hinzufügen" Knopf erstellt für die ausgewählten Videos Mediatracks, und fügt diese zu allen Rennen hinzu, die in der rechten Spalte ausgewählt wurden. +multiUrlChangeMediaTrack=Mehrere Mediatrack URLs anpassen +multiUrlChangeReplace=und ersetzen +multiUrlChangeFind=suchen +multiUrlChangeCannotSave=Es ist ein Fehler beim Speichern aufgetreten +multiUrlChangeSave=Änderungen der URLs speichern +multiUrlChangeNewURL=Neue Url \ No newline at end of file From 5b2b91bc8708b0de5618b4c025c25bc285505b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 6 Jun 2018 14:37:40 +0200 Subject: [PATCH 32/63] bug4522 formating only --- .../multivideo/MultiRenameDialog.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java index 8f55795912b..ef1be073719 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java @@ -57,13 +57,13 @@ public class MultiRenameDialog extends DialogBox { private TextBox replacePartIn; private TextBox replacePartOut; - public MultiRenameDialog(MediaServiceAsync mediaService, - StringMessages stringMessages, Set selected, ErrorReporter errorReporter, Runnable afterLinking) { + public MultiRenameDialog(MediaServiceAsync mediaService, StringMessages stringMessages, Set selected, + ErrorReporter errorReporter, Runnable afterLinking) { this.stringMessages = stringMessages; setGlassEnabled(true); FlowPanel mainContent = new FlowPanel(); - //placeholder for description if required + // placeholder for description if required Label descriptionLabel = new Label(""); descriptionLabel.getElement().getStyle().setPadding(0.5, Unit.EM); mainContent.add(descriptionLabel); @@ -75,7 +75,7 @@ public class MultiRenameDialog extends DialogBox { replacePartOut = new TextBox(); replacePartOut.setText("http://replace_me_with_baseurl/"); mainContent.add(replacePartOut); - + replacePartOut.addChangeHandler(new ChangeHandler() { @Override public void onChange(ChangeEvent event) { @@ -83,7 +83,7 @@ public class MultiRenameDialog extends DialogBox { } }); replacePartOut.addKeyUpHandler(new KeyUpHandler() { - + @Override public void onKeyUp(KeyUpEvent event) { updateUI(); @@ -95,7 +95,7 @@ public class MultiRenameDialog extends DialogBox { updateUI(); } }); - + FlowPanel buttonPanel = new FlowPanel(); DockPanel dockPanel = new DockPanel(); add(dockPanel); @@ -122,16 +122,16 @@ public class MultiRenameDialog extends DialogBox { @Override public void onClick(ClickEvent event) { hide(); - for(MediaTrack track:mediaTrackRenameMap) { + for (MediaTrack track : mediaTrackRenameMap) { String newUrl = getPatchedUrl(track); track.url = newUrl; mediaService.updateUrl(track, new AsyncCallback() { - + @Override public void onSuccess(Void result) { afterLinking.run(); } - + @Override public void onFailure(Throwable caught) { Window.alert(stringMessages.multiUrlChangeCannotSave()); @@ -146,7 +146,7 @@ public class MultiRenameDialog extends DialogBox { dockPanel.add(buttonPanel, DockPanel.SOUTH); mediaTrackRenameMap = new ArrayList<>(selected); - + replacePartIn.setText(maxPrefixForAll()); updateUI(); } @@ -198,13 +198,12 @@ public class MultiRenameDialog extends DialogBox { Label name = new Label(remoteFile.title); dataTable.setWidget(y, TITLE_COLUMN, name); - + Anchor link = new Anchor(remoteFile.url); link.setHref(remoteFile.url); link.setTarget("_blank"); dataTable.setWidget(y, URL_COLUMN, link); - String newUrl = getPatchedUrl(remoteFile); Anchor linknew = new Anchor(newUrl); linknew.setHref(newUrl); From ae9b9112841f82207b8d438c3740ae47d5ea4236 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 6 Jun 2018 14:49:34 +0200 Subject: [PATCH 33/63] bug4586: added null check in SailMasterConnectorImpl.notifyListeners Change-Id: I7681c5d7452f469d339e8483b6f03b7ba2b4cc74 --- .../impl/SailMasterConnectorImpl.java | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java index 56e4fd3544e..e13a7b0f143 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java @@ -223,35 +223,37 @@ public class SailMasterConnectorImpl extends SailMasterTransceiverImpl implement } protected void notifyListeners(SailMasterMessage message) { - try { - switch (message.getType()) { - case RPD: - notifyListenersRPD(message); - break; - case RAC: - notifyListenersRAC(message); - break; - case CCG: - notifyListenersCCG(message); - break; - case STL: - notifyListenersSTL(message); - break; - case CAM: - notifyListenersCAM(message); - break; - case TMD: - notifyListenersTMD(message); - break; - case WND: - notifyListenersWND(message); - break; - default: - // ignore all other messages because there are no notification patterns for those + if (message.getType() != null) { + try { + switch (message.getType()) { + case RPD: + notifyListenersRPD(message); + break; + case RAC: + notifyListenersRAC(message); + break; + case CCG: + notifyListenersCCG(message); + break; + case STL: + notifyListenersSTL(message); + break; + case CAM: + notifyListenersCAM(message); + break; + case TMD: + notifyListenersTMD(message); + break; + case WND: + notifyListenersWND(message); + break; + default: + // ignore all other messages because there are no notification patterns for those + } + } catch (Exception e) { + // broken messages are ignored + logger.log(Level.WARNING, "Exception caught during parsing of message '" + message.getMessage() + "' : " + e.getMessage(), e); } - } catch (Exception e) { - // broken messages are ignored - logger.log(Level.WARNING, "Exception caught during parsing of message '" + message.getMessage() + "' : " + e.getMessage(), e); } } From 3d992641445db89c4a3d7422b77079b503ff6590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 6 Jun 2018 15:00:06 +0200 Subject: [PATCH 34/63] bug4522 improved naming, added javadoc, added release notes --- .../sap/sailing/gwt/ui/adminconsole/MediaPanel.java | 4 ++-- ...tiRenameDialog.java => MultiURLChangeDialog.java} | 12 ++++++------ java/com.sap.sailing.www/release_notes_admin.html | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/{MultiRenameDialog.java => MultiURLChangeDialog.java} (95%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java index 6ff5ed66618..c960cb2ffc9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java @@ -41,7 +41,7 @@ import com.google.gwt.view.client.ListDataProvider; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.domain.common.media.MediaUtil; -import com.sap.sailing.gwt.ui.adminconsole.multivideo.MultiRenameDialog; +import com.sap.sailing.gwt.ui.adminconsole.multivideo.MultiURLChangeDialog; import com.sap.sailing.gwt.ui.adminconsole.multivideo.MultiVideoDialog; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; import com.sap.sailing.gwt.ui.client.MediaTracksRefresher; @@ -141,7 +141,7 @@ public class MediaPanel extends FlowPanel implements MediaTracksRefresher { if (selected.isEmpty()) { Window.alert(stringMessages.noSelection()); } else { - new MultiRenameDialog(mediaService, stringMessages, selected, errorReporter, + new MultiURLChangeDialog(mediaService, stringMessages, selected, errorReporter, new Runnable() { @Override public void run() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java similarity index 95% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java index ef1be073719..0102b782dcf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiRenameDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java @@ -36,11 +36,11 @@ import com.sap.sailing.gwt.ui.client.media.TimeFormatUtil; import com.sap.sse.gwt.client.ErrorReporter; /** - * This class allows to add multiple videos at once, by crawling index sites of a given url, and using the metadata of - * mp4 files to fill starttime and duration. Additionally it allows to add the new mediatracks directly to the races - * that are overlapping. + * This dialog allows to change multiple urls for mediatracks at once. It will determine the longest common prefix, that + * all mediatracks share. This is very usefull if a lot of videos are migrated to another server, eg. local hosted to s3 + * hosted. */ -public class MultiRenameDialog extends DialogBox { +public class MultiURLChangeDialog extends DialogBox { private static final String EMPTY_TEXT = ""; private static final int TITLE_COLUMN = 0; private static final int URL_COLUMN = 1; @@ -57,7 +57,7 @@ public class MultiRenameDialog extends DialogBox { private TextBox replacePartIn; private TextBox replacePartOut; - public MultiRenameDialog(MediaServiceAsync mediaService, StringMessages stringMessages, Set selected, + public MultiURLChangeDialog(MediaServiceAsync mediaService, StringMessages stringMessages, Set selected, ErrorReporter errorReporter, Runnable afterLinking) { this.stringMessages = stringMessages; setGlassEnabled(true); @@ -112,7 +112,7 @@ public class MultiRenameDialog extends DialogBox { cancelButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - MultiRenameDialog.this.hide(); + MultiURLChangeDialog.this.hide(); } }); diff --git a/java/com.sap.sailing.www/release_notes_admin.html b/java/com.sap.sailing.www/release_notes_admin.html index 7f8c8f6a616..cc1184ab1c9 100755 --- a/java/com.sap.sailing.www/release_notes_admin.html +++ b/java/com.sap.sailing.www/release_notes_admin.html @@ -22,6 +22,10 @@

Release Notes - Administration Console

+

June 2018

+
    +
  • Added the ability to change the url of multiple Mediatracks at once (eg. for video migration scenarios). This can be done from the adminconsole->tracked races->audio & videos tab
    • +

May 2018

  • Added the ability to add multiple mp4 videos as mediatracks at once via the new multi video dialog, located at trackedraces -> Audio & Video. From b7222a47fff01412fbc020a7d012e3d31be04ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 7 Jun 2018 14:50:13 +0200 Subject: [PATCH 35/63] ensure that a video can be disposed safely multiple times --- .../com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.java index 6e3ad26bcbd..6b2870fd10a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.java @@ -320,8 +320,10 @@ public class VideoJSPlayer extends Widget implements RequiresResize { public void disposeIf2D() { if (!panorama) { - disposeNative(); - player = null; + if (player != null) { + disposeNative(); + player = null; + } } } From aba14dfc650c5d20ebee71fff218bd5d3d5d8a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 7 Jun 2018 14:55:07 +0200 Subject: [PATCH 36/63] bug4534 initial media overlay bar impl --- .../sap/sailing/gwt/ui/client/TimePanel.java | 5 ++ .../media/AbstractMediaSelectionControl.java | 2 +- .../ui/client/media/MediaPlayerManager.java | 2 +- .../media/MediaPlayerManagerComponent.java | 11 +-- .../gwt/ui/raceboard/RaceBoardPanel.java | 31 ++++++++ .../raceboard/SideBySideComponentViewer.java | 2 +- .../client/controls/slider/TimeSlider.java | 78 +++++++++++++++++++ 7 files changed, 123 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java index b6d781fd6f4..62e6ef26328 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java @@ -25,6 +25,7 @@ import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.gwt.client.controls.slider.SliderBar; import com.sap.sse.gwt.client.controls.slider.TimeSlider; +import com.sap.sse.gwt.client.controls.slider.TimeSlider.BarOverlay; import com.sap.sse.gwt.client.player.PlayStateListener; import com.sap.sse.gwt.client.player.TimeListener; import com.sap.sse.gwt.client.player.TimeRangeChangeListener; @@ -658,4 +659,8 @@ public class TimePanel extends AbstractCompositeCom return "TimePanel"; } + public void setBarOverlays(Iterable overlays) { + timeSlider.setBarOverlays(overlays); + } + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaSelectionControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaSelectionControl.java index b493fd931fc..4d28189124d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaSelectionControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaSelectionControl.java @@ -10,7 +10,7 @@ public abstract class AbstractMediaSelectionControl implements MediaPlayerManage public AbstractMediaSelectionControl(MediaPlayerManager mediaPlayerManager, StringMessages stringMessages) { this.mediaPlayerManager = mediaPlayerManager; - this.mediaPlayerManager.setPlayerChangeListener(this); + this.mediaPlayerManager.addPlayerChangeListener(this); this.stringMessages = stringMessages; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManager.java index 95d6a4253f1..3b4ef5d4aa3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManager.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManager.java @@ -18,7 +18,7 @@ public interface MediaPlayerManager { } - void setPlayerChangeListener(PlayerChangeListener playerChangeListener); + void addPlayerChangeListener(PlayerChangeListener playerChangeListener); void playAudio(MediaTrack audioTrack); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManagerComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManagerComponent.java index 8e1ff27583f..22bec345b83 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManagerComponent.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManagerComponent.java @@ -85,7 +85,7 @@ public class MediaPlayerManagerComponent extends AbstractComponent playerChangeListener = new ArrayList<>(); public MediaPlayerManagerComponent(Component parent, ComponentContext context, MediaPlayerLifecycle mediaPlayerLifecycle, @@ -341,8 +341,9 @@ public class MediaPlayerManagerComponent extends AbstractComponent component : componentsForSideBySideViewer) { addChildComponent(component); } @@ -433,6 +447,23 @@ public class RaceBoardPanel } } + protected void updateRaceTimePanelOverlay() { + ArrayList overlays = new ArrayList(); + Set playing = mediaPlayerManagerComponent.getPlayingVideoTracks(); + for (MediaTrack track : mediaPlayerManagerComponent.getAssignedMediaTracks()) { + double start = track.startTime.asMillis(); + TimePoint endTp = track.deriveEndTime(); + double end; + if (endTp == null) { + end = Double.MAX_VALUE; + } else { + end = endTp.asMillis(); + } + overlays.add(new BarOverlay(start, end, playing.contains(track))); + } + racetimePanel.setBarOverlays(overlays); + } + private void setupUserManagementControlPanel(UserService userService) { mainCss.ensureInjected(); final FlyoutAuthenticationView display = new RaceBoardAuthenticationView(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SideBySideComponentViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SideBySideComponentViewer.java index 3151b540fe9..c823807bb36 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SideBySideComponentViewer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SideBySideComponentViewer.java @@ -93,7 +93,7 @@ public class SideBySideComponentViewer implements UserStatusEventHandler { this.markPassingsPanel = markPassingsPanel; this.markPositionPanel = markPositionPanel; markPositionPanel.setComponentViewer(this); - mediaPlayerManagerComponent.setPlayerChangeListener(new PlayerChangeListener() { + mediaPlayerManagerComponent.addPlayerChangeListener(new PlayerChangeListener() { public void notifyStateChange() { String caption; String tooltip; diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java index 010c215cb37..cc7a3cf5683 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java @@ -32,8 +32,16 @@ public class TimeSlider extends SliderBar { private final int TICKCOUNT = 10; + private List overlays; + + /** + * The elements used to display additional markers on the slider bar. + */ + private List overLayElements = new ArrayList(); + public TimeSlider() { calculatedTimeTicks = new ArrayList(); + overlays = new ArrayList<>(); isZoomed = false; } @@ -260,6 +268,76 @@ public class TimeSlider extends SliderBar { @Override public void onResize() { visibleLabelsInterval = (TICKCOUNT / Math.max(getOffsetWidth() / 35, 1)) + 1; + drawBarOverlays(); super.onResize(); } + + public void setBarOverlays(Iterable overlays) { + this.overlays.clear(); + Util.addAll(overlays, this.overlays); + } + + private void drawBarOverlays() { + if (isAttached() && isMinMaxInitialized()) { + int numOverlays = overlays.size(); + // Draw the markers + int lineWidth = lineElement.getOffsetWidth(); + if (numOverlays > 0) { + // Create the markers or make them visible + int mediaTrack = 0; + int trackHeight = 4; + for (int i = 0; i < numOverlays; i++) { + BarOverlay overlay = overlays.get(i); + Element overlayElem = null; + if (i < overLayElements.size()) { + overlayElem = overLayElements.get(i); + } else { // Create the new markes + overlayElem = DOM.createDiv(); + overlayElem.getStyle().setPosition(Position.ABSOLUTE); + overlayElem.getStyle().setDisplay(Display.NONE); + // ensure we are rendered behind the other markers! + DOM.insertChild(getElement(), overlayElem, 0); + overLayElements.add(overlayElem); + } + // Position the marker and make it visible + overlayElem.getStyle().setVisibility(Visibility.HIDDEN); + overlayElem.getStyle().setProperty("display", ""); + double markerStartLinePosition = (overlay.start - minValue) * lineWidth / getTotalRange(); + double end = overlay.end; + if (maxValue < overlay.end) { + end = maxValue; + } + double markerEndLinePosition = (maxValue - end) * lineWidth / getTotalRange(); + overlayElem.getStyle().setLeft(markerStartLinePosition + lineLeftOffset, Unit.PX); + overlayElem.getStyle().setRight(markerEndLinePosition, Unit.PX); + overlayElem.getStyle().setHeight(trackHeight, Unit.PX); + overlayElem.getStyle().setTop(30 + mediaTrack, Unit.PX); + overlayElem.getStyle().setBackgroundColor(overlay.running ? "#FF0000" : "#CCCCCC"); + overlayElem.getStyle().setVisibility(Visibility.VISIBLE); + trackHeight += trackHeight + 1; + } + + // Hide unused markers + for (int i = numOverlays; i < overLayElements.size(); i++) { + overLayElements.get(i).getStyle().setDisplay(Display.NONE); + } + } else { // Hide all markers + for (Element elem : overLayElements) { + elem.getStyle().setDisplay(Display.NONE); + } + } + } + } + + public static class BarOverlay { + public final Double start; + public final Double end; + public final boolean running; + public BarOverlay(Double start, Double end, boolean running) { + super(); + this.start = start; + this.end = end; + this.running = running; + } + } } \ No newline at end of file From 196999d6a5588f627777098b8b0e99f9bd5af5df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 7 Jun 2018 17:11:32 +0200 Subject: [PATCH 37/63] bug4534 added title to video highlights --- .../com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java | 2 +- .../com/sap/sse/gwt/client/controls/slider/TimeSlider.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java index 191ac8e42cb..261021d657c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java @@ -459,7 +459,7 @@ public class RaceBoardPanel } else { end = endTp.asMillis(); } - overlays.add(new BarOverlay(start, end, playing.contains(track))); + overlays.add(new BarOverlay(start, end, playing.contains(track), track.title)); } racetimePanel.setBarOverlays(overlays); } diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java index cc7a3cf5683..774a517d862 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java @@ -302,6 +302,7 @@ public class TimeSlider extends SliderBar { // Position the marker and make it visible overlayElem.getStyle().setVisibility(Visibility.HIDDEN); overlayElem.getStyle().setProperty("display", ""); + overlayElem.setTitle(overlay.info); double markerStartLinePosition = (overlay.start - minValue) * lineWidth / getTotalRange(); double end = overlay.end; if (maxValue < overlay.end) { @@ -333,11 +334,13 @@ public class TimeSlider extends SliderBar { public final Double start; public final Double end; public final boolean running; - public BarOverlay(Double start, Double end, boolean running) { + public final String info; + public BarOverlay(Double start, Double end, boolean running, String info) { super(); this.start = start; this.end = end; this.running = running; + this.info = info; } } } \ No newline at end of file From 2990a040285b06947e85bfca158366ef99ead1cc Mon Sep 17 00:00:00 2001 From: Vladislav Chumak Date: Thu, 7 Jun 2018 17:31:11 +0200 Subject: [PATCH 38/63] Corrected calculation within getRelativeBearingToNextMark() --- .../domain/maneuverdetection/impl/ManeuverDetectorImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java index 878a659c261..6c3d01cf7cc 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java @@ -38,7 +38,6 @@ import com.sap.sailing.domain.tracking.ManeuverCurveBoundaries; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.SpeedWithBearingStep; import com.sap.sailing.domain.tracking.SpeedWithBearingStepsIterable; -import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.impl.CompleteManeuverCurveImpl; @@ -439,7 +438,7 @@ public class ManeuverDetectorImpl implements ManeuverDetector { */ private Bearing getRelativeBearingToNextMark(TimePoint timePoint, Bearing boatCourse) { Bearing result = null; - TrackedLeg legAfter = trackedRace.getCurrentLeg(timePoint); + TrackedLegOfCompetitor legAfter = trackedRace.getTrackedLeg(competitor, timePoint); if (legAfter != null && legAfter.getLeg().getTo() != null) { Position nextMarkPosition = trackedRace.getApproximatePosition(legAfter.getLeg().getTo(), timePoint); Position maneuverEndPosition = track.getEstimatedPosition(timePoint, false); From 7eea19e0c460456154a183fcab3ffcb05af91c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 7 Jun 2018 18:48:33 +0200 Subject: [PATCH 39/63] bug4534 fixed sizing bug for baroverlays --- .../src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java index 774a517d862..c75b3973cda 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java @@ -315,7 +315,7 @@ public class TimeSlider extends SliderBar { overlayElem.getStyle().setTop(30 + mediaTrack, Unit.PX); overlayElem.getStyle().setBackgroundColor(overlay.running ? "#FF0000" : "#CCCCCC"); overlayElem.getStyle().setVisibility(Visibility.VISIBLE); - trackHeight += trackHeight + 1; + mediaTrack += trackHeight + 1; } // Hide unused markers From 38ca3c3503411eb318d252d4f25f47e1a9466b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 8 Jun 2018 10:41:03 +0200 Subject: [PATCH 40/63] bug4534 added greedy algorithm to baroverlays to save display space on non overlapping bars --- .../client/controls/slider/TimeSlider.java | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java index c75b3973cda..de77f358432 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java @@ -1,7 +1,10 @@ package com.sap.sse.gwt.client.controls.slider; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Style.Display; @@ -284,8 +287,8 @@ public class TimeSlider extends SliderBar { int lineWidth = lineElement.getOffsetWidth(); if (numOverlays > 0) { // Create the markers or make them visible - int mediaTrack = 0; int trackHeight = 4; + Map knownLevels = new HashMap<>(); for (int i = 0; i < numOverlays; i++) { BarOverlay overlay = overlays.get(i); Element overlayElem = null; @@ -312,10 +315,11 @@ public class TimeSlider extends SliderBar { overlayElem.getStyle().setLeft(markerStartLinePosition + lineLeftOffset, Unit.PX); overlayElem.getStyle().setRight(markerEndLinePosition, Unit.PX); overlayElem.getStyle().setHeight(trackHeight, Unit.PX); - overlayElem.getStyle().setTop(30 + mediaTrack, Unit.PX); + int level = determineBestLevel(overlay.start, overlay.end, knownLevels); + knownLevels.put(overlay, level); + overlayElem.getStyle().setTop(32 + level * (trackHeight + 1), Unit.PX); overlayElem.getStyle().setBackgroundColor(overlay.running ? "#FF0000" : "#CCCCCC"); overlayElem.getStyle().setVisibility(Visibility.VISIBLE); - mediaTrack += trackHeight + 1; } // Hide unused markers @@ -330,6 +334,24 @@ public class TimeSlider extends SliderBar { } } + private int determineBestLevel(Double start, Double end, Map knownHeights) { + nextheight: for (int testLevel = 0; testLevel < Integer.MAX_VALUE; testLevel++) { + for(Entry possibleCollision:knownHeights.entrySet()) { + if(possibleCollision.getValue() == testLevel) { + //starts before or at end + if(possibleCollision.getKey().start <= end) { + if(possibleCollision.getKey().end >= start) { + //ends after start, we have a collision + continue nextheight; + } + } + } + } + return testLevel; + } + return 0; + } + public static class BarOverlay { public final Double start; public final Double end; From 136bf4858a0328e1c3e6dce77b96b7bbf80824e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 8 Jun 2018 11:03:51 +0200 Subject: [PATCH 41/63] bug4534 improved spacing algorithm vor bar overlays --- .../sse/gwt/client/controls/slider/TimeSlider.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java index de77f358432..bb3efbaf563 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java @@ -335,21 +335,27 @@ public class TimeSlider extends SliderBar { } private int determineBestLevel(Double start, Double end, Map knownHeights) { - nextheight: for (int testLevel = 0; testLevel < Integer.MAX_VALUE; testLevel++) { + int bestCollisionLevel = 0; + int bestCollisionCount = Integer.MAX_VALUE; + for (int testLevel = 0; testLevel < 5; testLevel++) { + int collisionCount = 0; for(Entry possibleCollision:knownHeights.entrySet()) { if(possibleCollision.getValue() == testLevel) { //starts before or at end if(possibleCollision.getKey().start <= end) { if(possibleCollision.getKey().end >= start) { //ends after start, we have a collision - continue nextheight; + collisionCount++; } } } } - return testLevel; + if(collisionCount < bestCollisionCount) { + bestCollisionLevel = testLevel; + bestCollisionCount = collisionCount; + } } - return 0; + return bestCollisionLevel; } public static class BarOverlay { From 6447f3be47525ba9652f00626bf03a3fa8ed9e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 8 Jun 2018 11:25:44 +0200 Subject: [PATCH 42/63] bug4534 ensure that overlay bars will not have negative left style, as they would then leave the designated timeslider area --- .../src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java index bb3efbaf563..1946304f697 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/slider/TimeSlider.java @@ -312,7 +312,7 @@ public class TimeSlider extends SliderBar { end = maxValue; } double markerEndLinePosition = (maxValue - end) * lineWidth / getTotalRange(); - overlayElem.getStyle().setLeft(markerStartLinePosition + lineLeftOffset, Unit.PX); + overlayElem.getStyle().setLeft(Math.max(0, markerStartLinePosition + lineLeftOffset), Unit.PX); overlayElem.getStyle().setRight(markerEndLinePosition, Unit.PX); overlayElem.getStyle().setHeight(trackHeight, Unit.PX); int level = determineBestLevel(overlay.start, overlay.end, knownLevels); From 5d94f4a76d186341acf84e7f90c0a24c11916e39 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Fri, 8 Jun 2018 11:49:54 +0200 Subject: [PATCH 43/63] Fixed a bug that resulted in the dialog styles to not be applied in the user profile settings page --- .../profile/settingstab/UserProfileSettingsViewImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/settingstab/UserProfileSettingsViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/settingstab/UserProfileSettingsViewImpl.java index e067634c11a..775446ccbac 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/settingstab/UserProfileSettingsViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/settingstab/UserProfileSettingsViewImpl.java @@ -6,6 +6,7 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.home.shared.usermanagement.decorator.AuthorizedContentDecoratorDesktop; +import com.sap.sse.gwt.resources.CommonControlsCSS; import com.sap.sse.security.ui.authentication.app.NeedsAuthenticationContext; public class UserProfileSettingsViewImpl extends Composite implements UserProfileSettingsView { @@ -25,6 +26,12 @@ public class UserProfileSettingsViewImpl extends Composite implements UserProfil initWidget(uiBinder.createAndBindUi(this)); } + @Override + protected void onLoad() { + super.onLoad(); + CommonControlsCSS.ensureInjected(); + } + @Override public NeedsAuthenticationContext getDecorator() { return decoratorUi; From 8ad8cd55dbd2704a8e9491a385c04d7f3308b828 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 8 Jun 2018 13:59:20 +0200 Subject: [PATCH 44/63] cleaning up warnings in DataMining SSE UI; fixed bug in registerResultPresenter Change-Id: I7901fcd564ef356b7aa3555ad7ed8976099cf19e --- java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF | 1 + .../client/presentation/AbstractTabbedResultsPresenter.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF index 6e9a40d0b25..60067bcd7df 100644 --- a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF @@ -20,3 +20,4 @@ Export-Package: com.sap.sse.datamining.ui.client, com.sap.sse.datamining.ui.client.selection.filter, com.sap.sse.datamining.ui.client.settings Bundle-ActivationPolicy: lazy +Automatic-Module-Name: com.sap.sse.datamining.ui diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java index 08adc67653a..18ae8a52c58 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java @@ -204,8 +204,8 @@ public abstract class AbstractTabbedResultsPresenter extends AbstractDataMiningC */ protected void registerResultPresenter(Class resultType, ResultsPresenter resultPresenter) throws IllegalStateException { - if (!registeredResultPresenterMap.containsKey(resultType)) { - String className = resultType.getName(); + String className = resultType.getName(); + if (!registeredResultPresenterMap.containsKey(className)) { registeredResultPresenterMap.put(className, resultPresenter); } else { throw new IllegalStateException( From a2d5dba61c5564043d1109600a350e46f8bd2e13 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 8 Jun 2018 14:28:28 +0200 Subject: [PATCH 45/63] fixed SDM launch config's class path after moving datamining ui to own bundle Change-Id: Iddcd4226367c8d03de381fe5994ebcca82d53232 --- .../GWT Sailing SDM.launch | 148 +++++++++--------- 1 file changed, 75 insertions(+), 73 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch b/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch index 8166321d280..866c15484c9 100644 --- a/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch +++ b/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch @@ -36,79 +36,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fd6289b3cced736f347238342106af05be7dbf27 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 8 Jun 2018 14:33:47 +0200 Subject: [PATCH 46/63] also fixing classic DevMode launch config regarding necessary datamining classpath changes Change-Id: I77d88e2658d3bdc3a77dac7a0b2465dac9c33b60 --- java/com.sap.sailing.gwt.ui/GWT Sailing DevMode.launch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/GWT Sailing DevMode.launch b/java/com.sap.sailing.gwt.ui/GWT Sailing DevMode.launch index 396f4347155..cfc89089464 100644 --- a/java/com.sap.sailing.gwt.ui/GWT Sailing DevMode.launch +++ b/java/com.sap.sailing.gwt.ui/GWT Sailing DevMode.launch @@ -107,6 +107,8 @@ + + From ea48b766e360aff8531950685703cd8503f26a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 8 Jun 2018 14:43:14 +0200 Subject: [PATCH 47/63] bug4552 improved documentation, added description text for users, added some warnings in case no prefix could be determined --- .../multivideo/MultiURLChangeDialog.java | 16 +++++++++++----- .../sailing/gwt/ui/client/StringMessages.java | 2 ++ .../gwt/ui/client/StringMessages.properties | 4 +++- .../gwt/ui/client/StringMessages_de.properties | 4 +++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java index 0102b782dcf..3c0e7ae22ec 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java @@ -37,7 +37,7 @@ import com.sap.sse.gwt.client.ErrorReporter; /** * This dialog allows to change multiple urls for mediatracks at once. It will determine the longest common prefix, that - * all mediatracks share. This is very usefull if a lot of videos are migrated to another server, eg. local hosted to s3 + * all mediatracks share. This is very useful if a lot of videos are migrated to another server, eg. local hosted to s3 * hosted. */ public class MultiURLChangeDialog extends DialogBox { @@ -64,15 +64,17 @@ public class MultiURLChangeDialog extends DialogBox { FlowPanel mainContent = new FlowPanel(); // placeholder for description if required - Label descriptionLabel = new Label(""); + Label descriptionLabel = new Label(this.stringMessages.multiUrlChangeExplain()); descriptionLabel.getElement().getStyle().setPadding(0.5, Unit.EM); mainContent.add(descriptionLabel); - + mainContent.add(new Label(stringMessages.multiUrlChangeFind())); replacePartIn = new TextBox(); + replacePartIn.getElement().getStyle().setWidth(25, Unit.PCT); mainContent.add(replacePartIn); mainContent.add(new Label(stringMessages.multiUrlChangeReplace())); replacePartOut = new TextBox(); + replacePartOut.getElement().getStyle().setWidth(25, Unit.PCT); replacePartOut.setText("http://replace_me_with_baseurl/"); mainContent.add(replacePartOut); @@ -147,7 +149,11 @@ public class MultiURLChangeDialog extends DialogBox { mediaTrackRenameMap = new ArrayList<>(selected); - replacePartIn.setText(maxPrefixForAll()); + final String maxPrefixForAll = maxPrefixForAll(); + if (maxPrefixForAll.length() == 0) { + Window.alert(this.stringMessages.multiUrlNoPrefixWarning()); + } + replacePartIn.setText(maxPrefixForAll); updateUI(); } @@ -184,7 +190,7 @@ public class MultiURLChangeDialog extends DialogBox { dataTable.clear(); dataTable.setWidget(y, TITLE_COLUMN, new Label(stringMessages.title())); dataTable.setWidget(y, URL_COLUMN, new Label(stringMessages.url())); - dataTable.setWidget(y, URL_COLUMN, new Label(stringMessages.multiUrlChangeNewURL())); + dataTable.setWidget(y, URL_COLUMN_NEW, new Label(stringMessages.multiUrlChangeNewURL())); dataTable.setWidget(y, DURATION_COLUMN, new Label(stringMessages.duration())); dataTable.setWidget(y, STARTTIME_COLUMN, new Label(stringMessages.startTime())); dataTable.setWidget(y, MIMETYPE_COLUMN, new Label(stringMessages.mimeType())); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index c351e75ebe6..bb17f13ce6c 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -2190,4 +2190,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String multiUrlChangeCannotSave(); String multiUrlChangeSave(); String multiUrlChangeNewURL(); + String multiUrlNoPrefixWarning(); + String multiUrlChangeExplain(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index e580c3eb0cd..d0a08d8e461 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -2178,4 +2178,6 @@ multiUrlChangeReplace=and replace multiUrlChangeFind=find multiUrlChangeCannotSave=An error occured while saving multiUrlChangeSave=Save url changes -multiUrlChangeNewURL=new url \ No newline at end of file +multiUrlChangeNewURL=new url +multiUrlNoPrefixWarning=No common prefix was found, this usually means that not all selected videos are hosted at the same location currenly. Proceed at own risk! +multiUrlChangeExplain=This dialog will bulk replace common parts at the start of mediatrack urls. Make sure all urls start with the same prefix! Also please take a look at the new url column, and test the resulting urls before! pressing save! \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 1425b176c15..fe8a71b2f92 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -2174,4 +2174,6 @@ multiUrlChangeReplace=und ersetzen multiUrlChangeFind=suchen multiUrlChangeCannotSave=Es ist ein Fehler beim Speichern aufgetreten multiUrlChangeSave=Änderungen der URLs speichern -multiUrlChangeNewURL=Neue Url \ No newline at end of file +multiUrlChangeNewURL=Neue Url +multiUrlNoPrefixWarning=Es wurde kein gemeinsamer Prefix gefunden, dies deutet darauf hin, dass nicht alle ausgewählten Videos vom gleichen Host kommen. Auf eigene Gefahr fortsetzten! +multiUrlChangeExplain=Dieser Dialog ermöglicht es mehrere URL-Anfänge gleichzeitig auszutauschen. Hierzu müssen diese den gleichen Start haben. Bitte umbedingt die Spalte mit den neuen URLs beachten und diese testen bevor gespeichert wird! \ No newline at end of file From 124f8e7cf5725544e11daa840e9af38015c4c9f1 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 10 Jun 2018 22:01:19 +0200 Subject: [PATCH 48/63] added stop and interrupt methods to ThreadManager Change-Id: I74d7992e17ebdbee9061129b4b0932c2f0517994 --- .../sap/sse/threadmanager/ThreadManager.java | 57 ++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sse.threadmanager/src/com/sap/sse/threadmanager/ThreadManager.java b/java/com.sap.sse.threadmanager/src/com/sap/sse/threadmanager/ThreadManager.java index e85f92b4d14..73066ab3b5a 100644 --- a/java/com.sap.sse.threadmanager/src/com/sap/sse/threadmanager/ThreadManager.java +++ b/java/com.sap.sse.threadmanager/src/com/sap/sse/threadmanager/ThreadManager.java @@ -51,7 +51,7 @@ public class ThreadManager { Thread.enumerate(threads); for (Thread t : threads) { if (t != null && t.getName().equals(name)) { - t.suspend(); + t.stop(); result.put("status", "OK"); found = true; } @@ -66,7 +66,60 @@ public class ThreadManager { return response; } - @SuppressWarnings("deprecation") // using Thread.suspend() + @SuppressWarnings("deprecation") // using Thread.stop() + @Path("{name}/stop") + @GET + @Produces("application/json;charset=UTF-8") + public Response stop(@PathParam("name") String name) { + final Response response; + JSONObject result = new JSONObject(); + Thread[] threads = new Thread[10000]; + boolean found = false; + Thread.enumerate(threads); + for (Thread t : threads) { + if (t != null && t.getName().equals(name)) { + t.stop(); + result.put("status", "OK"); + found = true; + } + } + String json = result.toJSONString(); + if (!found) { + result.put("status", "Not found"); + response = Response.status(Status.NOT_FOUND).entity(json).build(); + } else { + response = Response.ok(json, MediaType.APPLICATION_JSON).build(); + } + return response; + } + + @Path("{name}/interrupt") + @GET + @Produces("application/json;charset=UTF-8") + public Response interrupt(@PathParam("name") String name) { + final Response response; + JSONObject result = new JSONObject(); + Thread[] threads = new Thread[10000]; + boolean found = false; + Thread.enumerate(threads); + for (Thread t : threads) { + if (t != null && t.getName().equals(name)) { + t.interrupt(); + result.put("status", "OK"); + found = true; + } + } + String json = result.toJSONString(); + if (!found) { + result.put("status", "Not found"); + response = Response.status(Status.NOT_FOUND).entity(json).build(); + } else { + response = Response.ok(json, MediaType.APPLICATION_JSON).build(); + } + return response; + } + + @SuppressWarnings("deprecation") // using Thread.resume() @Path("{name}/resume") @GET @Produces("application/json;charset=UTF-8") From f94d89373d7bb8c249cdab656a14580c059df67b Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 10 Jun 2018 22:23:02 +0200 Subject: [PATCH 49/63] whitespace/formatting changes only Change-Id: Id32825b0e3cc2a6615e0280d4f38cac41de03be1 --- .../sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java index bd7b5d9ce55..efa52377638 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java @@ -129,7 +129,7 @@ public class SingleRaceLeaderboardPanel extends LeaderboardPanel Date: Sun, 10 Jun 2018 23:12:45 +0200 Subject: [PATCH 50/63] minor refactoring for readability Change-Id: I6cb2583e3ffc415a162ca9ca48f1a5bdf7fdfd46 --- .../com/sap/sailing/domain/common/dto/LeaderboardDTO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardDTO.java index aba1729a86c..7ebe1c0382a 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardDTO.java @@ -127,13 +127,13 @@ public class LeaderboardDTO extends AbstractLeaderboardDTO implements Serializab if (rows != null) { LeaderboardRowDTO leaderboardRow = rows.get(competitor); if (leaderboardRow != null) { - if (this.canBoatsOfCompetitorsChangePerRace == false) { - result = leaderboardRow.boat; - } else { + if (this.canBoatsOfCompetitorsChangePerRace) { LeaderboardEntryDTO leaderboardEntry = leaderboardRow.fieldsByRaceColumnName.get(raceColumnName); if (leaderboardEntry != null) { result = leaderboardEntry.boat; } + } else { + result = leaderboardRow.boat; } } } From e6df81d21cd074ab020ae4fdc5777c2b51a822f2 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 10 Jun 2018 23:13:33 +0200 Subject: [PATCH 51/63] formatting only Change-Id: Ideabf768c9c1d586809014c4864d6b5bddfcecd5 --- .../gwt/ui/client/shared/racemap/RaceMap.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java index c9411936e8c..ef4ef34addd 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java @@ -2020,21 +2020,18 @@ public class RaceMap extends AbstractCompositeComponent impleme boatOverlay.draw(); } } - return usedExistingCanvas; } private DisplayMode displayHighlighted(CompetitorDTO competitorDTO) { boolean competitorisSelected = competitorSelection.isSelected(competitorDTO); - if(!settings.isShowOnlySelectedCompetitors()){ - if(competitorisSelected){ + if (!settings.isShowOnlySelectedCompetitors()) { + if (competitorisSelected) { return DisplayMode.SELECTED; - } - else{ - if(isSomeOtherCompetitorSelected()){ + } else { + if (isSomeOtherCompetitorSelected()) { return DisplayMode.NOT_SELECTED; - } - else{ + } else { return DisplayMode.DEFAULT; } } From 68f8187145e0a08177532035a7997f696d1f3a5d Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sun, 10 Jun 2018 23:13:50 +0200 Subject: [PATCH 52/63] bug4602: require a race column to contain the preSelectedRace in order to adopt its competitor-to-boat mappings Change-Id: Id47adf1631bdc34d068b3a05e7e1c4c2d47ff405 --- .../sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java index efa52377638..0932272924c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java @@ -130,7 +130,7 @@ public class SingleRaceLeaderboardPanel extends LeaderboardPanel Date: Mon, 11 Jun 2018 07:09:27 +0000 Subject: [PATCH 53/63] Updated building and deploying (markdown) --- wiki/info/landscape/building-and-deploying.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/info/landscape/building-and-deploying.md b/wiki/info/landscape/building-and-deploying.md index 67f6d81161b..7a5e07f3158 100644 --- a/wiki/info/landscape/building-and-deploying.md +++ b/wiki/info/landscape/building-and-deploying.md @@ -88,7 +88,7 @@ For iOS and Android there are two different build processes in place. After chan The iOS app build is largely described by contents of a ``cfg/`` directory which is symbolically linked to from the root of the git hierarchy and is actually located under ``ios/SAPTracker/cfg``. It is independent on any Maven builds and therefore unrelated to any POM files (``pom.xml``) as used in the back-end OSGi and Android builds. Other than for the previous MiOS approach we can therefore build the contents of the ``master`` branch more or less directly. Another "sacrifice" we have to make to the iOS build is having to link ``src/`` symbolically from the root of our git to ``ios/SAPTracker/src``, but this seems adequate given the branch handling which is now much simplified over the previous Maven build where we had to separate the ``pom.xml`` contents between iOS build branches and the ``master`` branch. -Still, we use the branch ``central-ios-release-build`` to prepare for the build. We usually merge ``ubilabs--ios--develop`` into ``master`` and then ``master`` into ``central-ios-release-build``. Builds off the latter branch can be tested using [this Jenkins job](https://xmake-mobile-dev.wdf.sap.corp:8443/job/sapsailingcapture-OD-darwinintel64_dev-darwinintel64_dev/). Run a [Build with Parameters](https://xmake-mobile-dev.wdf.sap.corp:8443/job/sapsailingcapture-OD-darwinintel64_dev-darwinintel64_dev/build?delay=0sec) and enter ``central-ios-release-build`` as the TREEISH. The build should succeed and produce the .ipa file somewhere in the [build's target output](https://xmake-mobile-dev.wdf.sap.corp:8443/job/sapsailingcapture-OD-darwinintel64_dev-darwinintel64_dev/ws/gen/out/Exported-IPAs-Release-iphoneos/) +Still, we use the branch ``central-ios-release-build`` to prepare for the build. We usually merge ``ubilabs--ios--develop`` into ``master`` and then ``master`` into ``central-ios-release-build``. Builds off the latter branch can be tested using [this Jenkins job](https://xmake-mobile-dev.wdf.sap.corp/job/sapsailingprogram/job/sapsailingcapture-OD-darwinintel64_dev-darwinintel64_dev/). Run a [Build with Parameters](https://xmake-mobile-dev.wdf.sap.corp/job/sapsailingprogram/job/sapsailingcapture-OD-darwinintel64_dev-darwinintel64_dev/build?delay=0sec) and enter ``central-ios-release-build`` as the TREEISH. The build should succeed and produce the .ipa file somewhere in the [build's target output](https://xmake-mobile-dev.wdf.sap.corp/job/sapsailingprogram/job/sapsailingcapture-OD-darwinintel64_dev-darwinintel64_dev/ws/gen/out/Exported-IPAs-Release-iphoneos/) When the test build was successful, the branch contents need to be merged into the central git repository's branch ``fa/rel-1.x``, e.g., ``fa/rel-1.0``. Pushing immediately to this branch to the SAP-internal git is not permitted by Gerrit rules. Instead, it is necessary to push to ``refs/for/fa/rel-1.x``. Furthermore, the commit to be pushed needs to have a ``Change-Id:`` and a ``CR-Id:`` tag in the commit's comment. The ``Change-Id:`` is produced by a commit hook that can be installed in each developer's local git environment by using the following command: 
    gitdir=$(git rev-parse --git-dir); scp -p -P 29418 d000000@git.wdf.sap.corp:hooks/commit-msg ${gitdir}/hooks/
    From 4a45b7a8046b02fb4f85e2148853829c5846268b Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 11 Jun 2018 09:26:24 +0200 Subject: [PATCH 54/63] Bug 4564: Removed GWT.debugger --- .../resulthandling/ExpeditionDataImportResponse.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/resulthandling/ExpeditionDataImportResponse.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/resulthandling/ExpeditionDataImportResponse.java index 3912961e708..7b9c2b71146 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/resulthandling/ExpeditionDataImportResponse.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/resulthandling/ExpeditionDataImportResponse.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import com.google.gwt.core.shared.GWT; import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONObject; import com.sap.sailing.domain.common.dto.ExpeditionAllInOneConstants; @@ -16,7 +15,6 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class ExpeditionDataImportResponse extends AbstractDataImportResponse { public static final ExpeditionDataImportResponse parse(String json) { - GWT.debugger(); return AbstractDataImportResponse.parse(json, "ExpeditionDataImportResponse"); } From 157060867c6c3dd0f453085cbfbb082d6a30ad5a Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 11 Jun 2018 09:47:24 +0200 Subject: [PATCH 55/63] Bug 4552: Fixed some typos in messages --- .../com/sap/sailing/gwt/ui/client/StringMessages.properties | 2 +- .../sap/sailing/gwt/ui/client/StringMessages_de.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index d0a08d8e461..62ac48d7318 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -2179,5 +2179,5 @@ multiUrlChangeFind=find multiUrlChangeCannotSave=An error occured while saving multiUrlChangeSave=Save url changes multiUrlChangeNewURL=new url -multiUrlNoPrefixWarning=No common prefix was found, this usually means that not all selected videos are hosted at the same location currenly. Proceed at own risk! +multiUrlNoPrefixWarning=No common prefix was found, this usually means that not all selected videos are hosted at the same location currently. Proceed at own risk! multiUrlChangeExplain=This dialog will bulk replace common parts at the start of mediatrack urls. Make sure all urls start with the same prefix! Also please take a look at the new url column, and test the resulting urls before! pressing save! \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index fe8a71b2f92..3d1d04d5e1a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -2175,5 +2175,5 @@ multiUrlChangeFind=suchen multiUrlChangeCannotSave=Es ist ein Fehler beim Speichern aufgetreten multiUrlChangeSave=Änderungen der URLs speichern multiUrlChangeNewURL=Neue Url -multiUrlNoPrefixWarning=Es wurde kein gemeinsamer Prefix gefunden, dies deutet darauf hin, dass nicht alle ausgewählten Videos vom gleichen Host kommen. Auf eigene Gefahr fortsetzten! -multiUrlChangeExplain=Dieser Dialog ermöglicht es mehrere URL-Anfänge gleichzeitig auszutauschen. Hierzu müssen diese den gleichen Start haben. Bitte umbedingt die Spalte mit den neuen URLs beachten und diese testen bevor gespeichert wird! \ No newline at end of file +multiUrlNoPrefixWarning=Es wurde kein gemeinsamer Präfix gefunden, dies deutet darauf hin, dass nicht alle ausgewählten Videos vom gleichen Host kommen. Auf eigene Gefahr fortsetzen! +multiUrlChangeExplain=Dieser Dialog ermöglicht es, mehrere URL-Anfänge gleichzeitig auszutauschen. Hierzu müssen diese den gleichen Präfix besitzen. Bitte unbedingt die Spalte mit den neuen URLs beachten und diese testen bevor gespeichert wird! \ No newline at end of file From eb0c6469f86931e9c52886efa95094e51b4ced81 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 11 Jun 2018 09:49:30 +0200 Subject: [PATCH 56/63] Bug 4552: Improved release notes --- java/com.sap.sailing.www/release_notes_admin.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.www/release_notes_admin.html b/java/com.sap.sailing.www/release_notes_admin.html index cc1184ab1c9..4f9c9f92fbd 100755 --- a/java/com.sap.sailing.www/release_notes_admin.html +++ b/java/com.sap.sailing.www/release_notes_admin.html @@ -24,7 +24,9 @@

    June 2018

      -
    • Added the ability to change the url of multiple Mediatracks at once (eg. for video migration scenarios). This can be done from the adminconsole->tracked races->audio & videos tab
      • +
    • Added the ability to change the url of multiple Mediatracks with a common prefix at once. + This is useful e.g. for video migration scenarios when movin videaos from one server to another. + This can be done from the adminconsole->tracked races->audio & videos tab

    May 2018

      From 9ed72af3fa02ecf3cec8ee770468b7548a705867 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 11 Jun 2018 10:49:37 +0200 Subject: [PATCH 57/63] Bug 4534: Added release notes --- .../places/whatsnew/resources/SailingAnalyticsNotes.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html index 0c722066a09..a2ad010324d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html @@ -4,6 +4,11 @@

      What's New - SAP Sailing Analytics

      +
      June 2018
      +
        +
      • In RaceBoard.html the availability of media is now visualized under the time slider.
        • +
      +
      April 2018
      • In the raceboard a new maneuver table has been added next to the wind and competitor charts. From 157892693f450bdc4700da4aae419cb9845939de Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 11 Jun 2018 11:46:30 +0200 Subject: [PATCH 58/63] Fixed serialization problem in leaderboard --- ...greeBearingImpl_CustomFieldSerializer.java | 3 +- ...greeBearingImpl_CustomFieldSerializer.java | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sse/common/impl/DegreeBearingImpl_CustomFieldSerializer.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/impl/DegreeBearingImpl_CustomFieldSerializer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/impl/DegreeBearingImpl_CustomFieldSerializer.java index b39e568c4b1..ea7abef9bb6 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/impl/DegreeBearingImpl_CustomFieldSerializer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/impl/DegreeBearingImpl_CustomFieldSerializer.java @@ -4,8 +4,9 @@ import com.google.gwt.user.client.rpc.CustomFieldSerializer; import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; import com.google.gwt.user.client.rpc.SerializationStreamWriter; -import com.sap.sse.common.impl.DegreeBearingImpl; +import com.sap.sailing.domain.common.impl.DegreeBearingImpl; +@SuppressWarnings("deprecation") public class DegreeBearingImpl_CustomFieldSerializer extends CustomFieldSerializer { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sse/common/impl/DegreeBearingImpl_CustomFieldSerializer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sse/common/impl/DegreeBearingImpl_CustomFieldSerializer.java new file mode 100644 index 00000000000..8509ee2b299 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sse/common/impl/DegreeBearingImpl_CustomFieldSerializer.java @@ -0,0 +1,48 @@ +package com.google.gwt.user.client.rpc.core.com.sap.sse.common.impl; + +import com.google.gwt.user.client.rpc.CustomFieldSerializer; +import com.google.gwt.user.client.rpc.SerializationException; +import com.google.gwt.user.client.rpc.SerializationStreamReader; +import com.google.gwt.user.client.rpc.SerializationStreamWriter; +import com.sap.sse.common.impl.DegreeBearingImpl; + +public class DegreeBearingImpl_CustomFieldSerializer extends CustomFieldSerializer { + + @Override + public void serializeInstance(SerializationStreamWriter streamWriter, DegreeBearingImpl instance) + throws SerializationException { + serialize(streamWriter, instance); + } + + public static void serialize(SerializationStreamWriter streamWriter, DegreeBearingImpl instance) + throws SerializationException { + streamWriter.writeDouble(instance.getDegrees()); + } + + @Override + public boolean hasCustomInstantiateInstance() { + return true; + } + + @Override + public DegreeBearingImpl instantiateInstance(SerializationStreamReader streamReader) + throws SerializationException { + return instantiate(streamReader); + } + + public static DegreeBearingImpl instantiate(SerializationStreamReader streamReader) + throws SerializationException { + return new DegreeBearingImpl(streamReader.readDouble()); + } + + @Override + public void deserializeInstance(SerializationStreamReader streamReader, DegreeBearingImpl instance) + throws SerializationException { + deserialize(streamReader, instance); + } + + public static void deserialize(SerializationStreamReader streamReader, DegreeBearingImpl instance) { + // Done by instantiateInstance + } + +} From 003f46868dbec522a7db5537ddac673703d6d491 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 11 Jun 2018 13:01:03 +0200 Subject: [PATCH 59/63] Fixed StackTrace being logged during GWT serialization. Due to the message some of our enums were not serializable because of missing default constructors, but it used to work fine. So this change just fixed the log entries. --- .../sap/sailing/gwt/home/communication/event/LabelType.java | 5 +++++ .../gwt/home/communication/eventview/HasRegattaMetadata.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/LabelType.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/LabelType.java index fa384b7c7a4..bf4a34f9bf3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/LabelType.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/LabelType.java @@ -71,6 +71,11 @@ public enum LabelType { private final String labelType; + private LabelType() { + // For GWT serialization only + labelType = null; + } + private LabelType(String labelType) { this.labelType = labelType; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/HasRegattaMetadata.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/HasRegattaMetadata.java index 6dbef6d59cd..817238e2ddd 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/HasRegattaMetadata.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/HasRegattaMetadata.java @@ -11,6 +11,11 @@ public interface HasRegattaMetadata { private final LabelType stateMarker; + private RegattaState() { + // For GWT serialization only + stateMarker = null; + } + private RegattaState(LabelType stateMarker) { this.stateMarker = stateMarker; } From cefe91dfe329ccca867484437bf82f2aef4381c4 Mon Sep 17 00:00:00 2001 From: Raimund Wege Date: Mon, 11 Jun 2018 13:58:25 +0200 Subject: [PATCH 60/63] Activated manual code signing style --- .../src/xcode/SAPTracker.xcodeproj/project.pbxproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ios/SAPTracker/src/xcode/SAPTracker.xcodeproj/project.pbxproj b/ios/SAPTracker/src/xcode/SAPTracker.xcodeproj/project.pbxproj index 1cbf7b592b3..f87656767a3 100755 --- a/ios/SAPTracker/src/xcode/SAPTracker.xcodeproj/project.pbxproj +++ b/ios/SAPTracker/src/xcode/SAPTracker.xcodeproj/project.pbxproj @@ -1690,9 +1690,8 @@ TargetAttributes = { 7F83F14F19F154F000C53328 = { CreatedOnToolsVersion = 6.0.1; - DevelopmentTeam = RRE8EFVCE3; LastSwiftMigration = 0820; - ProvisioningStyle = Automatic; + ProvisioningStyle = Manual; }; 7F83F16419F154F000C53328 = { CreatedOnToolsVersion = 6.0.1; @@ -2298,6 +2297,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SAPTracker/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -2320,6 +2320,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SAPTracker/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; From ccb1bc6ccdb6906e7fd72799d4e19114f69db436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 11 Jun 2018 15:43:01 +0200 Subject: [PATCH 61/63] bug4552 smaller text adjustments --- .../ui/adminconsole/multivideo/MultiURLChangeDialog.java | 1 - .../com/sap/sailing/gwt/ui/client/StringMessages.properties | 6 +++--- .../sap/sailing/gwt/ui/client/StringMessages_de.properties | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java index 3c0e7ae22ec..4da6830a727 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/multivideo/MultiURLChangeDialog.java @@ -65,7 +65,6 @@ public class MultiURLChangeDialog extends DialogBox { FlowPanel mainContent = new FlowPanel(); // placeholder for description if required Label descriptionLabel = new Label(this.stringMessages.multiUrlChangeExplain()); - descriptionLabel.getElement().getStyle().setPadding(0.5, Unit.EM); mainContent.add(descriptionLabel); mainContent.add(new Label(stringMessages.multiUrlChangeFind())); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 1c0f3dc2488..276103ac8f5 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -2063,10 +2063,10 @@ multiVideoDoNoAdd=Do not add multiVideoOffsetInput=Global video offset in milliseconds: multiVideoDescription=The webserver is required to provide index listing (subfolders supported if indexed) to allow file discovery. After an initial analysis of the metadata contained in the mp4 files, the videos that should be added, need to be selected via the checkbox column on the left. The "Add Audio/Video" button will create media tracks for all selected files, and add those files to all races selected in the right column. multiUrlChangeMediaTrack=Adjust multipe media track urls -multiUrlChangeReplace=and replace -multiUrlChangeFind=find +multiUrlChangeReplace=Replace with +multiUrlChangeFind=Find multiUrlChangeCannotSave=An error occured while saving multiUrlChangeSave=Save url changes multiUrlChangeNewURL=new url multiUrlNoPrefixWarning=No common prefix was found, this usually means that not all selected videos are hosted at the same location currently. Proceed at own risk! -multiUrlChangeExplain=This dialog will bulk replace common parts at the start of mediatrack urls. Make sure all urls start with the same prefix! Also please take a look at the new url column, and test the resulting urls before! pressing save! \ No newline at end of file +multiUrlChangeExplain=This dialog will bulk replace common parts at the start of mediatrack urls. Make sure all urls start with the same prefix! Also please take a look at the new url column, and test the resulting urls before pressing save! \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index f0c3a0053d3..a665f93adfc 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -2059,8 +2059,8 @@ multiVideoDoNoAdd=Nicht hinzufügen multiVideoOffsetInput=Globales Videooffset in Millisekunden: multiVideoDescription=Ein Webserver mit Folderindex wird benötigt (Unterordner werden unterstützt, sofern diese auch indiziert sind), um die Erkennung von Datein zu ermöglichen. Nach einer initialen Analyse der Metadaten von den mp4 Dateien, müssen die gewünschen Videos in der linken Spalte ausgewählt werden. Der "Audio/Video hinzufügen" Knopf erstellt für die ausgewählten Videos Mediatracks, und fügt diese zu allen Rennen hinzu, die in der rechten Spalte ausgewählt wurden. multiUrlChangeMediaTrack=Mehrere Mediatrack URLs anpassen -multiUrlChangeReplace=und ersetzen -multiUrlChangeFind=suchen +multiUrlChangeReplace=Ersetzen mit +multiUrlChangeFind=Suchen multiUrlChangeCannotSave=Es ist ein Fehler beim Speichern aufgetreten multiUrlChangeSave=Änderungen der URLs speichern multiUrlChangeNewURL=Neue Url From 90fb8dd7332ceaa7808b9dda5b912dcf913f1fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 11 Jun 2018 15:58:14 +0200 Subject: [PATCH 62/63] bug4534 improved release notes --- .../places/whatsnew/resources/SailingAnalyticsNotes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html index a2ad010324d..3d7634a9da3 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/whatsnew/resources/SailingAnalyticsNotes.html @@ -6,7 +6,7 @@
        June 2018
          -
        • In RaceBoard.html the availability of media is now visualized under the time slider.
          • +
        • In RaceBoard.html the availability of media is now visualized under the time slider via a bar overlay. When hovering the bar, the title of the video is shown.
        April 2018
        From 96bb80ebe557be1ec8e1224d2091853f0b88818f Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 11 Jun 2018 20:55:09 +0200 Subject: [PATCH 63/63] bug4604: avoid IndexOutOfBoundsException for single-line "courses" Change-Id: I784e8c316e02245fdda1669975da83af7a453307 --- .../markpassingcalculation/impl/CandidateFinderImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java index 4ac0edc9c15..3d7a67bb366 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImpl.java @@ -1410,7 +1410,8 @@ public class CandidateFinderImpl implements CandidateFinder { * @param markPositionCache * a mark position cache for this finder's {@link #race} for time point {@code t} * @return the marks of a waypoint with two marks in the order port, starboard (when approaching the waypoint from - * the direction of the waypoint beforehand. + * the direction of the waypoint beforehand, or {@code (null, null)} in case the direction cannot be determined, + * e.g., because the waypoint with passing instructions "Line" is the only waypoint in the course. */ private Util.Pair getPortAndStarboardMarks(TimePoint t, Waypoint w, MarkPositionAtTimePointCache markPositionCache) { assert t.equals(markPositionCache.getTimePoint()); @@ -1428,7 +1429,7 @@ public class CandidateFinderImpl implements CandidateFinder { } final List legs = race.getRace().getCourse().getLegs(); final int indexOfWaypoint = race.getRace().getCourse().getIndexOfWaypoint(w); - if (indexOfWaypoint < 0) { + if (indexOfWaypoint < 0 || legs.isEmpty()) { return new Util.Pair(null, null); } final boolean isStartLine = indexOfWaypoint == 0;