From 575fd0608ad0bfb6ce3d1273c661e0254be3af05 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Wed, 7 Dec 2016 15:15:46 +0100 Subject: [PATCH 001/197] fixed wrong start time while time edit in unscheduled --- .../ui/fragments/raceinfo/StartTimeFragment.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java index 5978dc7c4a0..bb7d89f51b5 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java @@ -506,8 +506,8 @@ public class StartTimeFragment extends BaseFragment mTimePicker.setIs24HourView(true); int hours = time.get(Calendar.HOUR_OF_DAY); int minutes = time.get(Calendar.MINUTE); - if (getArguments() != null && getArguments().getInt(START_MODE, START_MODE_PRESETUP) != MODE_TIME_PANEL && mRaceId == null - && mStartTimeOffset == null) { + if (getArguments() != null && getArguments().getInt(START_MODE, START_MODE_PRESETUP) != MODE_TIME_PANEL + && getArguments().getSerializable(MainScheduleFragment.START_TIME) == null) { // In 10 minutes from now, but always a 5-minute-mark. time.add(Calendar.MINUTE, 10); hours = time.get(Calendar.HOUR_OF_DAY); @@ -623,7 +623,7 @@ public class StartTimeFragment extends BaseFragment break; case R.id.set_start_time_relative: - changeFragment(MillisecondsTimePoint.now(), new MillisecondsDurationImpl(mTimeOffset.getValue() * 60 * 1000), identifier); + changeFragment(mStartTime, new MillisecondsDurationImpl(mTimeOffset.getValue() * 60 * 1000), identifier); break; case R.id.sync_to_minute: @@ -772,9 +772,12 @@ public class StartTimeFragment extends BaseFragment viewId = R.id.race_content; } args.putAll(getArguments()); - args.putSerializable(MainScheduleFragment.START_TIME, startTime); - args.putSerializable(MainScheduleFragment.START_TIME_DIFF, startTimeDiff); - args.putSerializable(MainScheduleFragment.DEPENDENT_RACE, identifier); + if (startTimeDiff == null) { + args.putSerializable(MainScheduleFragment.START_TIME, startTime); + } else { + args.putSerializable(MainScheduleFragment.START_TIME_DIFF, startTimeDiff); + args.putSerializable(MainScheduleFragment.DEPENDENT_RACE, identifier); + } } fragment.setArguments(args); transaction.replace(viewId, fragment); From f812da7e476b0abe372ec826fc3b80324d730c45 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Wed, 7 Dec 2016 15:16:16 +0100 Subject: [PATCH 002/197] reset time, if new start time is in next hour --- .../app/ui/fragments/raceinfo/StartTimeFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java index bb7d89f51b5..e31ea696019 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java @@ -515,6 +515,7 @@ public class StartTimeFragment extends BaseFragment minutes = (int) (Math.ceil((minutes / 5.0)) * 5.0); if (minutes >= 60) { hours++; + minutes = 0; } } mTimePicker.setCurrentHour(hours); From 2e7234b0eeb420eea25ebd0c0804b3decebe63d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 18 Jun 2018 17:31:59 +0200 Subject: [PATCH 003/197] bug4508 initial rest implementation --- .../gateway/jaxrs/api/MarkRessource.java | 221 ++++++++++++++++++ .../gateway/jaxrs/api/RestApiApplication.java | 1 + 2 files changed, 222 insertions(+) create mode 100644 java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java new file mode 100644 index 00000000000..cf10b8331f6 --- /dev/null +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -0,0 +1,221 @@ +package com.sap.sailing.server.gateway.jaxrs.api; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.JSONValue; +import org.json.simple.parser.ParseException; + +import com.sap.sailing.domain.abstractlog.race.RaceLog; +import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; +import com.sap.sailing.domain.abstractlog.race.analyzing.impl.LastPublishedCourseDesignFinder; +import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl; +import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; +import com.sap.sailing.domain.abstractlog.regatta.events.impl.RegattaLogDefineMarkEventImpl; +import com.sap.sailing.domain.base.ControlPoint; +import com.sap.sailing.domain.base.Course; +import com.sap.sailing.domain.base.CourseBase; +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.base.impl.ControlPointWithTwoMarksImpl; +import com.sap.sailing.domain.base.impl.CourseDataImpl; +import com.sap.sailing.domain.base.impl.CourseImpl; +import com.sap.sailing.domain.base.impl.MarkImpl; +import com.sap.sailing.domain.common.CourseDesignerMode; +import com.sap.sailing.domain.common.LeaderboardNameConstants; +import com.sap.sailing.domain.common.NotFoundException; +import com.sap.sailing.domain.common.PassingInstruction; +import com.sap.sailing.domain.common.racelog.tracking.DoesNotHaveRegattaLogException; +import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; +import com.sap.sailing.domain.leaderboard.Leaderboard; +import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter; +import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapterFactory; +import com.sap.sailing.domain.regattalike.HasRegattaLike; +import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; +import com.sap.sailing.server.gateway.deserialization.impl.Helpers; +import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; +import com.sap.sse.common.Util.Pair; +import com.sap.sse.common.impl.MillisecondsTimePoint; + +@Path("/v1/mark") +public class MarkRessource extends AbstractSailingServerResource { + @POST + @Path("/addMarkToRegatta") + @Consumes(MediaType.APPLICATION_JSON) + @Produces("application/json;charset=UTF-8") + public Response addMarkToRegatta(String json) throws Exception { + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + + Object requestBody = JSONValue.parseWithException(json); + JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); + + String markName = (String) requestObject.get("markName"); + + UUID markId = UUID.randomUUID(); + MarkImpl mark = new MarkImpl(markId, markName); + String regattaName = (String) requestObject.get("regattaName"); + RegattaLog regattaLog = getRegattaLogInternal(regattaName); + RegattaLogDefineMarkEventImpl event = new RegattaLogDefineMarkEventImpl(MillisecondsTimePoint.now(), + getService().getServerAuthor(), MillisecondsTimePoint.now(), UUID.randomUUID(), mark); + regattaLog.add(event); + + JSONObject answer = new JSONObject(); + answer.put("markId", markId.toString()); + return Response.ok(answer.toJSONString()).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8") + .build(); + } + + @POST + @Path("/addMarkFix") + @Consumes(MediaType.APPLICATION_JSON) + @Produces("application/json;charset=UTF-8") + public Response addMarkFix(String json) + throws DoesNotHaveRegattaLogException, ParseException, JsonDeserializationException { + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_MARK_POSITIONS.getStringPermission(Mode.CREATE)); + + Object requestBody = JSONValue.parseWithException(json); + JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); + + String leaderboardName = (String) requestObject.get("leaderboardName"); + String raceColumnName = (String) requestObject.get("raceColumnName"); + String fleetName = (String) requestObject.get("fleetName"); + String markId = (String) requestObject.get("markId"); + String lonDeg = (String) requestObject.get("lonDeg"); + String latDeg = (String) requestObject.get("latDeg"); + String timeMillis = (String) requestObject.get("timeMillis"); + + RaceLogTrackingAdapter raceLogTrackingAdapter = RaceLogTrackingAdapterFactory.INSTANCE + .getAdapter(getService().getBaseDomainFactory()); + final Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName); + if (leaderboard != null) { + final RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName); + if (raceColumn != null) { + final RegattaLog regattaLog = raceColumn.getRegattaLog(); + final Fleet fleet = raceColumn.getFleetByName(fleetName); + if (fleet != null) { + for (final Mark mark : raceColumn.getAvailableMarks(fleet)) { + if (mark.getId().toString().equals(markId)) { + GPSFix gpsFix = GPSFixImpl.create(Double.parseDouble(lonDeg), Double.parseDouble(latDeg), + Long.parseLong(timeMillis)); + raceLogTrackingAdapter.pingMark(regattaLog, mark, gpsFix, getService()); + return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8") + .build(); + } + } + } + } + } + return Response.notModified().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + } + + @POST + @Path("/addCourseDefinitionToRaceLog") + @Consumes(MediaType.APPLICATION_JSON) + @Produces("application/json;charset=UTF-8") + public Response addCourseDefinitionToRaceLog(String json) + throws DoesNotHaveRegattaLogException, NotFoundException, ParseException, JsonDeserializationException { + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + + Object requestBody = JSONValue.parseWithException(json); + JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); + + String leaderboardName = (String) requestObject.get("leaderboardName"); + String raceColumnName = (String) requestObject.get("raceColumnName"); + String fleetName = (String) requestObject.get("fleetName"); + + RaceLog raceLog = getRaceLog(leaderboardName, raceColumnName, fleetName); + String courseName = "Course of " + raceColumnName; + if (!LeaderboardNameConstants.DEFAULT_FLEET_NAME.equals(fleetName)) { + courseName += " - " + fleetName; + } + CourseBase lastPublishedCourse = new LastPublishedCourseDesignFinder(raceLog, + /* onlyCoursesWithValidWaypointList */ false).analyze(); + if (lastPublishedCourse == null) { + lastPublishedCourse = new CourseDataImpl(courseName); + } + + JSONArray controlPointsRaw = (JSONArray) requestObject.get("controlPoints"); + List> controlPoints = new ArrayList<>(); + for (Object controlPointUnsafe : controlPointsRaw) { + JSONObject controlPointRaw = Helpers.toJSONObjectSafe(controlPointUnsafe); + + final String passingInstructionString = (String) controlPointRaw.get("passingInstruction"); + PassingInstruction passing = PassingInstruction.valueOfIgnoringCase(passingInstructionString); + + JSONArray marksRaw = (JSONArray) controlPointRaw.get("marks"); + if (marksRaw.size() == 1) { + String markName = (String) marksRaw.get(0); + Mark mark = getService().getBaseDomainFactory().getExistingMarkByIdAsString(markName); + controlPoints.add(new Pair<>(mark, passing)); + } else { + String markNameA = (String) marksRaw.get(0); + String markNameB = (String) marksRaw.get(1); + Mark markA = getService().getBaseDomainFactory().getExistingMarkByIdAsString(markNameA); + Mark markB = getService().getBaseDomainFactory().getExistingMarkByIdAsString(markNameB); + controlPoints.add(new Pair<>( + new ControlPointWithTwoMarksImpl(markA, markB, markA.getName() + "-" + markB.getName()), + passing)); + } + } + + Course course = new CourseImpl(courseName, lastPublishedCourse.getWaypoints()); + + try { + course.update(controlPoints, getService().getBaseDomainFactory()); + } catch (Exception e) { + throw new RuntimeException(e); + } + RaceLogEvent event = new RaceLogCourseDesignChangedEventImpl(MillisecondsTimePoint.now(), + getService().getServerAuthor(), raceLog.getCurrentPassId(), course, CourseDesignerMode.ADMIN_CONSOLE); + raceLog.add(event); + return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + } + + private RaceLog getRaceLog(String leaderboardName, String raceColumnName, String fleetName) + throws NotFoundException { + RaceColumn raceColumn = getRaceColumn(leaderboardName, raceColumnName); + Fleet fleet = getFleetByName(raceColumn, fleetName); + return raceColumn.getRaceLog(fleet); + } + + private Fleet getFleetByName(RaceColumn raceColumn, String fleetName) throws NotFoundException { + Fleet fleet = raceColumn.getFleetByName(fleetName); + if (fleet == null) { + throw new NotFoundException("fleet with name " + fleetName + " not found"); + } + return fleet; + } + + private RaceColumn getRaceColumn(String leaderboardName, String raceColumnName) throws NotFoundException { + Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName); + if (leaderboard == null) { + throw new NotFoundException("leaderboard with name " + leaderboardName + " not found"); + } + RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName); + if (raceColumn == null) { + throw new NotFoundException("raceColumn with name " + raceColumnName + " not found"); + } + return raceColumn; + } + + private RegattaLog getRegattaLogInternal(String leaderboardName) throws DoesNotHaveRegattaLogException { + Leaderboard l = getService().getLeaderboardByName(leaderboardName); + if (!(l instanceof HasRegattaLike)) { + throw new DoesNotHaveRegattaLogException(); + } + return ((HasRegattaLike) l).getRegattaLike().getRegattaLog(); + } + +} diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java index 8f89926dc16..0ace661e632 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java @@ -28,6 +28,7 @@ public class RestApiApplication extends Application { classes.add(PingResource.class); classes.add(TrackedRaceListResource.class); classes.add(StatisticsResource.class); + classes.add(MarkRessource.class); // Exception Mappers classes.add(ShiroAuthorizationExceptionTo401ResponseMapper.class); From be5b5852964f2bc8adbeb50ae5843ff5f070c4ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 19 Jun 2018 16:26:44 +0200 Subject: [PATCH 004/197] bug4508 updateSeries Rest initial impl --- .../gateway/jaxrs/api/MarkRessource.java | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java index cf10b8331f6..8a1032b1046 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -28,6 +28,7 @@ import com.sap.sailing.domain.base.CourseBase; 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.base.Regatta; import com.sap.sailing.domain.base.impl.ControlPointWithTwoMarksImpl; import com.sap.sailing.domain.base.impl.CourseDataImpl; import com.sap.sailing.domain.base.impl.CourseImpl; @@ -36,6 +37,7 @@ import com.sap.sailing.domain.common.CourseDesignerMode; import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.NotFoundException; import com.sap.sailing.domain.common.PassingInstruction; +import com.sap.sailing.domain.common.dto.FleetDTO; import com.sap.sailing.domain.common.racelog.tracking.DoesNotHaveRegattaLogException; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; @@ -46,8 +48,10 @@ import com.sap.sailing.domain.regattalike.HasRegattaLike; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.impl.Helpers; import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; +import com.sap.sailing.server.operationaltransformation.UpdateSeries; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.common.impl.RGBColor; @Path("/v1/mark") public class MarkRessource extends AbstractSailingServerResource { @@ -183,6 +187,61 @@ public class MarkRessource extends AbstractSailingServerResource { return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } + @POST + @Path("/updateOrCreateSeries") + @Consumes(MediaType.APPLICATION_JSON) + @Produces("application/json;charset=UTF-8") + public Response updateOrCreateSeries(String json) throws ParseException, JsonDeserializationException { + Object requestBody = JSONValue.parseWithException(json); + JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); + String regattaName = (String) requestObject.get("regattaName"); + + Regatta regatta = getService().getRegattaByName(regattaName); + if (regatta != null) { +// SecurityUtils.getSubject() +// .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); + } + + + String seriesName = (String) requestObject.get("seriesName"); + String seriesNameNew = (String) requestObject.get("seriesNameNew"); + boolean isMedal = (boolean) requestObject.get("isMedal"); + boolean isFleetsCanRunInParallel = (boolean) requestObject.get("isFleetsCanRunInParallel"); + boolean startsWithZeroScore = (boolean) requestObject.get("startsWithZeroScore"); + boolean firstColumnIsNonDiscardableCarryForward = (boolean) requestObject.get("firstColumnIsNonDiscardableCarryForward"); + boolean hasSplitFleetContiguousScoring = (boolean) requestObject.get("hasSplitFleetContiguousScoring"); + + Integer maximumNumberOfDiscards = null; + if (requestObject.containsKey("maximumNumberOfDiscards")) { + maximumNumberOfDiscards = (int) (long) requestObject.get("maximumNumberOfDiscards"); + } + + int[] resultDiscardingThresholds = null; + if(requestObject.containsKey("resultDiscardingThresholds")) { + JSONArray resultDiscardingThresholdsRaw = (JSONArray) requestObject.get("resultDiscardingThresholds"); + resultDiscardingThresholds = new int[resultDiscardingThresholdsRaw.size()]; + for (int i = 0; i < resultDiscardingThresholdsRaw.size(); i++) { + resultDiscardingThresholds[i] = (int) (long) resultDiscardingThresholdsRaw.get(i); + } + } + + JSONArray fleetsRaw = (JSONArray) requestObject.get("fleets"); + List fleets = new ArrayList<>(); + for(Object fleetRaw:fleetsRaw) { + JSONObject fleet = Helpers.toJSONObjectSafe(fleetRaw); + String fleetName = (String) fleet.get("fleetName"); + int orderNo = (int) (long) fleet.get("orderNo"); + String htmlColor = (String) fleet.get("htmlColor"); + fleets.add(new FleetDTO(fleetName, orderNo, new RGBColor(htmlColor))); + } + getService().apply(new UpdateSeries(regatta.getRegattaIdentifier(), seriesName, seriesNameNew, isMedal, + isFleetsCanRunInParallel, resultDiscardingThresholds, startsWithZeroScore, + firstColumnIsNonDiscardableCarryForward, hasSplitFleetContiguousScoring, maximumNumberOfDiscards, + fleets)); + + return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + } + private RaceLog getRaceLog(String leaderboardName, String raceColumnName, String fleetName) throws NotFoundException { RaceColumn raceColumn = getRaceColumn(leaderboardName, raceColumnName); From 8e9b749b0b87aab6710f5bb727261af6bc0c5cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 19 Jun 2018 16:32:26 +0200 Subject: [PATCH 005/197] bug4508 moved updateOrCreateSeries to ReggataRessource --- .../gateway/jaxrs/api/MarkRessource.java | 55 ---------------- .../gateway/jaxrs/api/RegattasResource.java | 63 +++++++++++++++++++ 2 files changed, 63 insertions(+), 55 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java index 8a1032b1046..4e3ed6c71a2 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -187,61 +187,6 @@ public class MarkRessource extends AbstractSailingServerResource { return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } - @POST - @Path("/updateOrCreateSeries") - @Consumes(MediaType.APPLICATION_JSON) - @Produces("application/json;charset=UTF-8") - public Response updateOrCreateSeries(String json) throws ParseException, JsonDeserializationException { - Object requestBody = JSONValue.parseWithException(json); - JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); - String regattaName = (String) requestObject.get("regattaName"); - - Regatta regatta = getService().getRegattaByName(regattaName); - if (regatta != null) { -// SecurityUtils.getSubject() -// .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); - } - - - String seriesName = (String) requestObject.get("seriesName"); - String seriesNameNew = (String) requestObject.get("seriesNameNew"); - boolean isMedal = (boolean) requestObject.get("isMedal"); - boolean isFleetsCanRunInParallel = (boolean) requestObject.get("isFleetsCanRunInParallel"); - boolean startsWithZeroScore = (boolean) requestObject.get("startsWithZeroScore"); - boolean firstColumnIsNonDiscardableCarryForward = (boolean) requestObject.get("firstColumnIsNonDiscardableCarryForward"); - boolean hasSplitFleetContiguousScoring = (boolean) requestObject.get("hasSplitFleetContiguousScoring"); - - Integer maximumNumberOfDiscards = null; - if (requestObject.containsKey("maximumNumberOfDiscards")) { - maximumNumberOfDiscards = (int) (long) requestObject.get("maximumNumberOfDiscards"); - } - - int[] resultDiscardingThresholds = null; - if(requestObject.containsKey("resultDiscardingThresholds")) { - JSONArray resultDiscardingThresholdsRaw = (JSONArray) requestObject.get("resultDiscardingThresholds"); - resultDiscardingThresholds = new int[resultDiscardingThresholdsRaw.size()]; - for (int i = 0; i < resultDiscardingThresholdsRaw.size(); i++) { - resultDiscardingThresholds[i] = (int) (long) resultDiscardingThresholdsRaw.get(i); - } - } - - JSONArray fleetsRaw = (JSONArray) requestObject.get("fleets"); - List fleets = new ArrayList<>(); - for(Object fleetRaw:fleetsRaw) { - JSONObject fleet = Helpers.toJSONObjectSafe(fleetRaw); - String fleetName = (String) fleet.get("fleetName"); - int orderNo = (int) (long) fleet.get("orderNo"); - String htmlColor = (String) fleet.get("htmlColor"); - fleets.add(new FleetDTO(fleetName, orderNo, new RGBColor(htmlColor))); - } - getService().apply(new UpdateSeries(regatta.getRegattaIdentifier(), seriesName, seriesNameNew, isMedal, - isFleetsCanRunInParallel, resultDiscardingThresholds, startsWithZeroScore, - firstColumnIsNonDiscardableCarryForward, hasSplitFleetContiguousScoring, maximumNumberOfDiscards, - fleets)); - - return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); - } - private RaceLog getRaceLog(String leaderboardName, String raceColumnName, String fleetName) throws NotFoundException { RaceColumn raceColumn = getRaceColumn(leaderboardName, raceColumnName); 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 15c76506ba3..acb7e0dd291 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 @@ -14,6 +14,7 @@ import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; +import javax.ws.rs.Consumes; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -30,6 +31,8 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; import org.json.simple.JSONArray; import org.json.simple.JSONObject; +import org.json.simple.JSONValue; +import org.json.simple.parser.ParseException; import com.sap.sailing.datamining.SailingPredefinedQueries; import com.sap.sailing.domain.base.Boat; @@ -52,6 +55,7 @@ import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; import com.sap.sailing.domain.common.WindSource; +import com.sap.sailing.domain.common.dto.FleetDTO; import com.sap.sailing.domain.common.security.Permission; import com.sap.sailing.domain.common.security.Permission.Mode; import com.sap.sailing.domain.common.tracking.GPSFix; @@ -65,6 +69,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.sailing.server.gateway.deserialization.JsonDeserializationException; +import com.sap.sailing.server.gateway.deserialization.impl.Helpers; import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; import com.sap.sailing.server.gateway.serialization.JsonSerializer; import com.sap.sailing.server.gateway.serialization.coursedata.impl.ControlPointJsonSerializer; @@ -101,6 +107,7 @@ import com.sap.sailing.server.gateway.serialization.impl.TeamJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.TrackedRaceJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.WindJsonSerializer; import com.sap.sailing.server.operationaltransformation.AddColumnToSeries; +import com.sap.sailing.server.operationaltransformation.UpdateSeries; import com.sap.sse.InvalidDateException; import com.sap.sse.common.Distance; import com.sap.sse.common.Duration; @@ -109,6 +116,7 @@ import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.common.impl.RGBColor; import com.sap.sse.common.util.RoundingUtil; import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier; import com.sap.sse.security.SecurityService; @@ -1639,4 +1647,59 @@ public class RegattasResource extends AbstractSailingServerResource { } return result; } + + @POST + @Path("/updateOrCreateSeries") + @Consumes(MediaType.APPLICATION_JSON) + @Produces("application/json;charset=UTF-8") + public Response updateOrCreateSeries(String json) throws ParseException, JsonDeserializationException { + Object requestBody = JSONValue.parseWithException(json); + JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); + String regattaName = (String) requestObject.get("regattaName"); + + Regatta regatta = getService().getRegattaByName(regattaName); + if (regatta != null) { +// SecurityUtils.getSubject() +// .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); + } + + + String seriesName = (String) requestObject.get("seriesName"); + String seriesNameNew = (String) requestObject.get("seriesNameNew"); + boolean isMedal = (boolean) requestObject.get("isMedal"); + boolean isFleetsCanRunInParallel = (boolean) requestObject.get("isFleetsCanRunInParallel"); + boolean startsWithZeroScore = (boolean) requestObject.get("startsWithZeroScore"); + boolean firstColumnIsNonDiscardableCarryForward = (boolean) requestObject.get("firstColumnIsNonDiscardableCarryForward"); + boolean hasSplitFleetContiguousScoring = (boolean) requestObject.get("hasSplitFleetContiguousScoring"); + + Integer maximumNumberOfDiscards = null; + if (requestObject.containsKey("maximumNumberOfDiscards")) { + maximumNumberOfDiscards = (int) (long) requestObject.get("maximumNumberOfDiscards"); + } + + int[] resultDiscardingThresholds = null; + if(requestObject.containsKey("resultDiscardingThresholds")) { + JSONArray resultDiscardingThresholdsRaw = (JSONArray) requestObject.get("resultDiscardingThresholds"); + resultDiscardingThresholds = new int[resultDiscardingThresholdsRaw.size()]; + for (int i = 0; i < resultDiscardingThresholdsRaw.size(); i++) { + resultDiscardingThresholds[i] = (int) (long) resultDiscardingThresholdsRaw.get(i); + } + } + + JSONArray fleetsRaw = (JSONArray) requestObject.get("fleets"); + List fleets = new ArrayList<>(); + for(Object fleetRaw:fleetsRaw) { + JSONObject fleet = Helpers.toJSONObjectSafe(fleetRaw); + String fleetName = (String) fleet.get("fleetName"); + int orderNo = (int) (long) fleet.get("orderNo"); + String htmlColor = (String) fleet.get("htmlColor"); + fleets.add(new FleetDTO(fleetName, orderNo, new RGBColor(htmlColor))); + } + getService().apply(new UpdateSeries(regatta.getRegattaIdentifier(), seriesName, seriesNameNew, isMedal, + isFleetsCanRunInParallel, resultDiscardingThresholds, startsWithZeroScore, + firstColumnIsNonDiscardableCarryForward, hasSplitFleetContiguousScoring, maximumNumberOfDiscards, + fleets)); + + return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + } } From f7b47943222407ba98b79745cb5f5ae3e46ed697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 19 Jun 2018 16:38:13 +0200 Subject: [PATCH 006/197] bug4508 fixed warning --- .../sap/sailing/server/gateway/jaxrs/api/MarkRessource.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java index 4e3ed6c71a2..cf10b8331f6 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -28,7 +28,6 @@ import com.sap.sailing.domain.base.CourseBase; 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.base.Regatta; import com.sap.sailing.domain.base.impl.ControlPointWithTwoMarksImpl; import com.sap.sailing.domain.base.impl.CourseDataImpl; import com.sap.sailing.domain.base.impl.CourseImpl; @@ -37,7 +36,6 @@ import com.sap.sailing.domain.common.CourseDesignerMode; import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.NotFoundException; import com.sap.sailing.domain.common.PassingInstruction; -import com.sap.sailing.domain.common.dto.FleetDTO; import com.sap.sailing.domain.common.racelog.tracking.DoesNotHaveRegattaLogException; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; @@ -48,10 +46,8 @@ import com.sap.sailing.domain.regattalike.HasRegattaLike; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.impl.Helpers; import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; -import com.sap.sailing.server.operationaltransformation.UpdateSeries; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; -import com.sap.sse.common.impl.RGBColor; @Path("/v1/mark") public class MarkRessource extends AbstractSailingServerResource { From bad0dd9ea0ec98bf007305f6998f1ecbd7282986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 19 Jun 2018 18:01:08 +0200 Subject: [PATCH 007/197] bug4508 initial impl for addCompetitorToRace api --- .../gateway/jaxrs/api/MarkRessource.java | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java index cf10b8331f6..33e5d13a973 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -1,7 +1,12 @@ package com.sap.sailing.server.gateway.jaxrs.api; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; import java.util.UUID; import javax.ws.rs.Consumes; @@ -22,6 +27,9 @@ import com.sap.sailing.domain.abstractlog.race.analyzing.impl.LastPublishedCours import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; import com.sap.sailing.domain.abstractlog.regatta.events.impl.RegattaLogDefineMarkEventImpl; +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.ControlPoint; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.CourseBase; @@ -36,6 +44,7 @@ import com.sap.sailing.domain.common.CourseDesignerMode; import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.NotFoundException; import com.sap.sailing.domain.common.PassingInstruction; +import com.sap.sailing.domain.common.racelog.tracking.CompetitorRegistrationOnRaceLogDisabledException; import com.sap.sailing.domain.common.racelog.tracking.DoesNotHaveRegattaLogException; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; @@ -46,6 +55,7 @@ import com.sap.sailing.domain.regattalike.HasRegattaLike; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.impl.Helpers; import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; +import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -183,6 +193,64 @@ public class MarkRessource extends AbstractSailingServerResource { return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } + @POST + @Path("/addCompetitorToRace") + @Consumes(MediaType.APPLICATION_JSON) + @Produces("application/json;charset=UTF-8") + public Response addCompetitorToRace(String json) throws DoesNotHaveRegattaLogException, NotFoundException, + ParseException, JsonDeserializationException, CompetitorRegistrationOnRaceLogDisabledException { + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + Object requestBody = JSONValue.parseWithException(json); + JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); + + String leaderboardName = (String) requestObject.get("leaderboardName"); + String raceColumnName = (String) requestObject.get("raceColumnName"); + String fleetName = (String) requestObject.get("fleetName"); + + JSONArray competitorsRaw = (JSONArray) requestObject.get("competitors"); + Map competitorsToRegister = new HashMap<>(); + for (int i = 0; i < competitorsRaw.size(); i++) { + JSONObject competitorRaw = (JSONObject) competitorsRaw.get(i); + String competitorId = (String) competitorRaw.get("competitorId"); + String boatId = (String) competitorRaw.get("boatId"); + Competitor competitor = getService().getCompetitorAndBoatStore() + .getExistingCompetitorByIdAsString(competitorId); + Boat boat = getService().getCompetitorAndBoatStore().getExistingBoatByIdAsString(boatId); + competitorsToRegister.put(competitor, boat); + } + RaceColumn raceColumn = getRaceColumn(leaderboardName, raceColumnName); + Fleet fleet = getFleetByName(raceColumn, fleetName); + Map competitorsRegisteredInRaceLog = new HashMap<>(); + for (final Entry e : raceColumn.getCompetitorsRegisteredInRacelog(fleet).entrySet()) { + competitorsRegisteredInRaceLog.put((CompetitorWithBoat) e.getKey(), e.getValue()); + } + final Iterable competitorSetToRemove = filterCompetitorDuplicates(competitorsToRegister, + competitorsRegisteredInRaceLog); + raceColumn.deregisterCompetitors(competitorSetToRemove, fleet); + // we assume that the competitors id of type Competitor here, so we need to find the corresponding boat + for (Entry competitorToRegister : competitorsToRegister.entrySet()) { + raceColumn.registerCompetitor(competitorToRegister.getKey(), competitorToRegister.getValue(), fleet); + } + return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + } + + private Iterable filterCompetitorDuplicates( + Map competitorToBoatMappingsToRegister, + Map competitorToBoatMappingsRegistered) { + final Set competitorsToUnregister = new HashSet<>(); + Util.addAll(competitorToBoatMappingsRegistered.keySet(), competitorsToUnregister); + for (final Entry e : competitorToBoatMappingsRegistered.entrySet()) { + Competitor competitor = e.getKey(); + if (competitorToBoatMappingsToRegister.get(competitor) == e.getValue()) { + // User wants to map competitor to boat, and that mapping already exists; neither add nor remove this + // registration but leave as is: + competitorToBoatMappingsToRegister.remove(competitor); + competitorsToUnregister.remove(competitor); + } + } + return competitorsToUnregister; + } + private RaceLog getRaceLog(String leaderboardName, String raceColumnName, String fleetName) throws NotFoundException { RaceColumn raceColumn = getRaceColumn(leaderboardName, raceColumnName); From 10483358bf9d080512e2ac901a7e430db98466fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 19 Jun 2018 18:08:17 +0200 Subject: [PATCH 008/197] bug4508 added ability to setup regattas in events to be with canBoatsOfCompetitorsChangePerRace, defaulting to false as before --- .../server/gateway/jaxrs/api/EventsResource.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java index 82856580f9e..2311a530738 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java @@ -134,7 +134,8 @@ public class EventsResource extends AbstractSailingServerResource { @FormParam("createleaderboardgroup") String createLeaderboardGroupParam, @FormParam("createregatta") String createRegattaParam, @FormParam("boatclassname") String boatClassNameParam, - @FormParam("numberofraces") String numberOfRacesParam) throws ParseException, NotFoundException, + @FormParam("numberofraces") String numberOfRacesParam, + @FormParam("canBoatsOfCompetitorsChangePerRace") boolean canBoatsOfCompetitorsChangePerRace) throws ParseException, NotFoundException, NumberFormatException, IOException, org.json.simple.parser.ParseException, InvalidDateException { if (enforceSecurityChecks) { SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermission(Mode.CREATE)); @@ -147,7 +148,7 @@ public class EventsResource extends AbstractSailingServerResource { startDateAsMillis, endDateParam, endDateAsMillis, venueNameParam, /* venue latitude */ venueLat, /* venue longitude */ venueLng, isPublicParam, officialWebsiteURLParam, baseURLParam, leaderboardGroupIdsListParam, createLeaderboardGroupParam, createRegattaParam, - boatClassNameParam, numberOfRacesParam); + boatClassNameParam, numberOfRacesParam, canBoatsOfCompetitorsChangePerRace); final JSONObject jsonResponse = new JSONObject(); jsonResponse.put("eventid", eventAndLeaderboardGroupAndLeaderboard.getA().getId().toString()); jsonResponse.put("eventname", eventAndLeaderboardGroupAndLeaderboard.getA().getName()); @@ -334,7 +335,7 @@ public class EventsResource extends AbstractSailingServerResource { private RegattaLeaderboard validateAndCreateRegatta(String regattaNameParam, String boatClassNameParam, String scoringSchemeParam, UUID courseAreaId, String buoyZoneRadiusInHullLengthsParam, String useStartTimeInterferenceParam, String controlTrackingFromStartAndFinishTimesParam, - String rankingMetricParam, List leaderboardDiscardThresholdsParam, String numberOfRacesParam) + String rankingMetricParam, List leaderboardDiscardThresholdsParam, String numberOfRacesParam, boolean canBoatsOfCompetitorsChangePerRace) throws ParseException, NotFoundException { boolean controlTrackingFromStartAndFinishTimes = controlTrackingFromStartAndFinishTimesParam == null ? false : Boolean.parseBoolean(controlTrackingFromStartAndFinishTimesParam); boolean useStartTimeInterference = useStartTimeInterferenceParam == null ? true : Boolean.parseBoolean(useStartTimeInterferenceParam); @@ -354,7 +355,6 @@ public class EventsResource extends AbstractSailingServerResource { RegattaCreationParametersDTO regattaCreationParametersDTO = new RegattaCreationParametersDTO( createDefaultSeriesCreationParameters(regattaName, numberOfRaces)); UUID regattaId = UUID.randomUUID(); - boolean canBoatsOfCompetitorsChangePerRace = false; addRegatta(regattaName, canBoatsOfCompetitorsChangePerRace, controlTrackingFromStartAndFinishTimes, useStartTimeInterference, buoyZoneRadiusInHullLengths, courseAreaId, boatClassName, /* startDate */ null, /* endDate */ null, scoringScheme, rankingMetric, regattaId, regattaCreationParametersDTO, leaderboardDiscardThresholds, numberOfRaces); @@ -366,6 +366,7 @@ public class EventsResource extends AbstractSailingServerResource { } /** + * @param canBoatsOfCompetitorsChangePerRace * @return the event created as first component; if a leaderboard group was to be created, the leaderboard group * created as the second component or {@code null} otherwise; the regatta leaderboard as the third component * in case a regatta was to be created, or {@code null} otherwise @@ -375,7 +376,7 @@ public class EventsResource extends AbstractSailingServerResource { String venueNameParam, String venueLat, String venueLng, String isPublicParam, String officialWebsiteURLParam, String baseURLParam, List leaderboardGroupIdsListParam, String createLeaderboardGroupParam, String createRegattaParam, String boatClassName, - String numberOfRacesParam) throws ParseException, NotFoundException, NumberFormatException, IOException, + String numberOfRacesParam, boolean canBoatsOfCompetitorsChangePerRace) throws ParseException, NotFoundException, NumberFormatException, IOException, org.json.simple.parser.ParseException, InvalidDateException { boolean isPublic = isPublicParam == null ? false : Boolean.parseBoolean(isPublicParam); boolean createRegatta = createRegattaParam == null ? true : Boolean.parseBoolean(createRegattaParam); @@ -413,7 +414,7 @@ public class EventsResource extends AbstractSailingServerResource { /* scoringSchemeParam */ null, courseArea.getId(), /* buoyZoneRadiusInHullLengthsParam */ null, /* useStartTimeInterferenceParam */ null, /* controlTrackingFromStartAndFinishTimesParam */ null, /* rankingMetricParam */ null, /* leaderboardDiscardThresholdsParam */ null, - numberOfRacesParam); + numberOfRacesParam, canBoatsOfCompetitorsChangePerRace); if (leaderboardGroup != null) { getService().apply(new UpdateLeaderboardGroup(leaderboardGroup.getName(), leaderboardGroup.getName(), leaderboardGroup.getDescription(), leaderboardGroup.getDisplayName(), From 932e1469219164f6d7756468802065aab1da91fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 19 Jun 2018 18:26:50 +0200 Subject: [PATCH 009/197] bug4508 fixed test cases --- .../server/gateway/test/jaxrs/EventResourceTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java index 61c29225db0..7212f2fd7e1 100644 --- a/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java +++ b/java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/EventResourceTest.java @@ -125,7 +125,7 @@ public class EventResourceTest extends AbstractJaxRsApiTest { /* venueNameParam */ randomName, /* venueLat */ null, /* venueLng */ null, /* isPublicParam */ null, /* officialWebsiteURLParam */ null, /* baseURLParam */ null, /* leaderboardGroupIdsListParam */ null, /* createLeaderboardGroupParam */ "true", /* createRegattaParam */ "false", - /* boatClassNameParam */ null, /* numberOfRacesParam */ null); + /* boatClassNameParam */ null, /* numberOfRacesParam */ null, false); } private Response createEvent() throws ParseException, NotFoundException, NumberFormatException, IOException, @@ -135,7 +135,7 @@ public class EventResourceTest extends AbstractJaxRsApiTest { /* venueNameParam */ randomName, /* venueLat */ null, /* venueLng */ null, /* isPublicParam */ null, /* officialWebsiteURLParam */ null, /* baseURLParam */ null, /* leaderboardGroupIdsListParam */ null, /* createLeaderboardGroupParam */ "false", /* createRegattaParam */ "false", - /* boatClassNameParam */ null, /* numberOfRacesParam */ null); + /* boatClassNameParam */ null, /* numberOfRacesParam */ null, false); } private Response createEventAtLocation(Position location) throws ParseException, NotFoundException, @@ -146,7 +146,7 @@ public class EventResourceTest extends AbstractJaxRsApiTest { /* venueLng */ "" + location.getLngDeg(), /* isPublicParam */ null, /* officialWebsiteURLParam */ null, /* baseURLParam */ null, /* leaderboardGroupIdsListParam */ null, /* createLeaderboardGroupParam */ "false", /* createRegattaParam */ "false", - /* boatClassNameParam */ null, /* numberOfRacesParam */ null); + /* boatClassNameParam */ null, /* numberOfRacesParam */ null, false); } private Response createEventWithLeaderboardGroupAndRegatta() throws ParseException, NotFoundException, @@ -156,7 +156,7 @@ public class EventResourceTest extends AbstractJaxRsApiTest { /* venueNameParam */ randomName, /* venueLat */ null, /* venueLng */ null, /* isPublicParam */ null, /* officialWebsiteURLParam */ null, /* baseURLParam */ null, /* leaderboardGroupIdsListParam */ null, /* createLeaderboardGroupParam */ "true", /* createRegattaParam */ "true", - /* boatClassNameParam */ "A_CAT", /* numberOfRacesParam */ null); + /* boatClassNameParam */ "A_CAT", /* numberOfRacesParam */ null, false); } private Response getLeaderboard(String name) { From 01266860c70c3143d75361c9f48186af7b1ff2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 9 Jul 2018 18:43:52 +0200 Subject: [PATCH 010/197] bug4508 extended documentation for new apis --- .../api/v1/addCompetitorToRace.html | 52 ++++++++++++ .../api/v1/addCourseDefinitionToRaceLog.html | 83 +++++++++++++++++++ .../webservices/api/v1/addMarkFix.html | 49 +++++++++++ .../webservices/api/v1/addMarkToRegatta.html | 46 ++++++++++ .../webservices/api/v1/eventCreateEvent.html | 1 + .../webservices/api/v1/index.html | 24 ++++++ .../api/v1/regattaUpdateOrCreateSeries.html | 61 ++++++++++++++ 7 files changed, 316 insertions(+) create mode 100644 java/com.sap.sailing.server.gateway/webservices/api/v1/addCompetitorToRace.html create mode 100644 java/com.sap.sailing.server.gateway/webservices/api/v1/addCourseDefinitionToRaceLog.html create mode 100644 java/com.sap.sailing.server.gateway/webservices/api/v1/addMarkFix.html create mode 100644 java/com.sap.sailing.server.gateway/webservices/api/v1/addMarkToRegatta.html create mode 100644 java/com.sap.sailing.server.gateway/webservices/api/v1/regattaUpdateOrCreateSeries.html diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/addCompetitorToRace.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/addCompetitorToRace.html new file mode 100644 index 00000000000..19b2fd86d0a --- /dev/null +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/addCompetitorToRace.html @@ -0,0 +1,52 @@ + + + + + + + + SAP Sailing Analytics Webservices API Version 1.0 + + +

SAP Sailing Analytics Webservices API Version 1.0

+

URL: /api/v1/mark/addCompetitorToRace

+ +Description: +

Updates the competitor registration, note that requires to be passed the whole set every time it is called, +and will perform a delta to the stored state. This will also allow to remove competitors

+
+ + + + + + + + + + + + + + + + + +
Webservice Type:REST
Output format:Json
Request method:POST
Examples: + Request: { + "leaderboardName":"test", + "raceColumnName":"R1", + "fleetName":"Default", + "competitors":[ + { + "competitorId":"b9a8a600-c829-0133-a4ec-448a5b8481d8", + "boatId":"c4d04422-19fd-49ec-b1bb-d3871a72527a" + } + ] + } + Response: Status 200 +
+
+Back to Web Service Overview + + diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/addCourseDefinitionToRaceLog.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/addCourseDefinitionToRaceLog.html new file mode 100644 index 00000000000..e0aa2aa08d1 --- /dev/null +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/addCourseDefinitionToRaceLog.html @@ -0,0 +1,83 @@ + + + + + + + + SAP Sailing Analytics Webservices API Version 1.0 + + +

SAP Sailing Analytics Webservices API Version 1.0

+

URL: /api/v1/mark/addCourseDefinitionToRaceLog

+ +Description: +

Allows to create a Coursedefinition that is then inserted into the racelog

+
+ + + + + + + + + + + + + + + + + +
Webservice Type:REST
Output format:Json
Request method:POST
Examples: + Request: { + "fleetName":"Default", + "leaderboardName":"test", + "raceColumnName":"R1", + "controlPoints": [ + { + "passingInstruction":"Gate", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab", "305ffb4b-c23d-42a1-be45-123123123123"] + }, + { + "passingInstruction":"Port", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab"] + }, + { + "passingInstruction":"Starboard", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab"] + }, + { + "passingInstruction":"Line", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab", "305ffb4b-c23d-42a1-be45-123123123123"] + }, + { + "passingInstruction":"Offset", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab", "305ffb4b-c23d-42a1-be45-123123123123"] + }, + { + "passingInstruction":"FixedBearing", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab"] + }, + { + "passingInstruction":"Single_Unknown", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab"] + }, + { + "passingInstruction":"None", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab"] + }, + { + "passingInstruction":"None", + "marks":["305ffb4b-c23d-42a1-be45-f76a2bad8fab", "305ffb4b-c23d-42a1-be45-123123123123"] + } + ] + } + Response: Status 200 if changed +
+
+Back to Web Service Overview + + diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/addMarkFix.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/addMarkFix.html new file mode 100644 index 00000000000..21f6db212d9 --- /dev/null +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/addMarkFix.html @@ -0,0 +1,49 @@ + + + + + + + + SAP Sailing Analytics Webservices API Version 1.0 + + +

SAP Sailing Analytics Webservices API Version 1.0

+

URL: /api/v1/mark/addMarkFix

+ +Description: +

Adds a fix to a specified Mark, the Marks uuid must be known

+
+ + + + + + + + + + + + + + + + + +
Webservice Type:REST
Output format:Json
Request method:POST
Examples: + Request: { + "markId":"305ffb4b-c23d-42a1-be45-f76a2bad8fab", + "lonDeg":"1", + "latDeg":"1", + "timeMillis":"0", + "fleetName":"Default", + "leaderboardName":"test", + "raceColumnName":"R1" + } + Response: Status 200 if changed +
+
+Back to Web Service Overview + + diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/addMarkToRegatta.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/addMarkToRegatta.html new file mode 100644 index 00000000000..e5cd274dc50 --- /dev/null +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/addMarkToRegatta.html @@ -0,0 +1,46 @@ + + + + + + + + SAP Sailing Analytics Webservices API Version 1.0 + + +

SAP Sailing Analytics Webservices API Version 1.0

+

URL: /api/v1/mark/addMarkToRegatta

+ +Description: +

Adds a Mark to a specified Regatta

+
+ + + + + + + + + + + + + + + + + +
Webservice Type:REST
Output format:Json
Request method:POST
Examples: + Request: { + "markName":"MyMark", + "regattaName":"test" + } + Response: { + "markId":uuidOfGeneratedMark + } +
+
+Back to Web Service Overview + + diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/eventCreateEvent.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/eventCreateEvent.html index 0f9317d5776..7f7f3111e7e 100755 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/eventCreateEvent.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/eventCreateEvent.html @@ -58,6 +58,7 @@ consumption of this service simple.

boatclassname must be provided if createretatta=true; can be the display name or an alias name of a boat class to use for the new regatta
numberofraces tells how many races shall be created in the default series; by default the series remains empty
+
canBoatsOfCompetitorsChangePerRace If true, boats and competitors can change per race, also it is necessary to register them in this case for each race!
diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html index 2b8218015f4..20ae273605d 100644 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html @@ -133,6 +133,10 @@ name to make sure you get to the event you're interested in. /api/v1/regattas/{regattaname}/competitors Obtains the competitors participating in a regatta + + /api/v1/regattas/updateOrCreateSeries + Creates a Series in an regatta, and configures the Series it contains + /api/v1/regattas/{regattaname}/competitors/createandadd Creates a competitor and adds it to the regatta @@ -254,6 +258,26 @@ name to make sure you get to the event you're interested in. /api/v1/wind/putWind Allows to add wind values to 1-x races, similar to AdminConsole + + + /api/v1/mark/addCompetitorToRace + Updates the competitor registrations + + + + /api/v1/mark/addCourseDefinitionToRaceLog + Allows to create a Coursedefinition that is then inserted into the racelog + + + + /api/v1/mark/addMarkFix + Adds a fix to a specified Mark, the Marks uuid must be known + + + + /api/v1/mark/addMarkToRegatta + Adds a Mark to a specified Regatta +
diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/regattaUpdateOrCreateSeries.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/regattaUpdateOrCreateSeries.html new file mode 100644 index 00000000000..d828571628c --- /dev/null +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/regattaUpdateOrCreateSeries.html @@ -0,0 +1,61 @@ + + + + + + + + SAP Sailing Analytics Webservices API Version 1.0 + + +

SAP Sailing Analytics Webservices API Version 1.0

+

URL: /api/v1/regattas/updateOrCreateSeries

+ +Description: +

Creates a Series in an regatta, and configures the Series it contains

+
+ + + + + + + + + + + + + + + + + +
Webservice Type:REST
Output format:Json
Request method:POST
Examples: + resultDiscardingThresholds and maximumNumberOfDiscards are optional + + Request: { + "regattaName":"test", + "seriesName":"NewRestCreatedSeries2", + "seriesNameNew":"NewRestCreatedSeries2", + "isMedal":false, + "isFleetsCanRunInParallel":false, + "startsWithZeroScore":true, + "firstColumnIsNonDiscardableCarryForward":false, + "hasSplitFleetContiguousScoring":false, + "maximumNumberOfDiscards":1, + "resultDiscardingThresholds":[1,2], + "fleets":[ + { + "fleetName":"Gold 1", + "orderNo":1, + "htmlColor":"#FF0000" + } + ] + } + Response: Status 200 +
+
+Back to Web Service Overview + + From a41d68571158efdcd4e21973ee90ca02eba2a4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 11 Jul 2018 13:12:59 +0200 Subject: [PATCH 011/197] bug4508 fixed typo in documentation link --- .../webservices/api/v1/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html index 20ae273605d..f38a50d8dbf 100644 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html @@ -265,7 +265,7 @@ name to make sure you get to the event you're interested in. - /api/v1/mark/addCourseDefinitionToRaceLog + /api/v1/mark/addCourseDefinitionToRaceLog Allows to create a Coursedefinition that is then inserted into the racelog From 84af394f30f5a35ba52c4081f1a1c091cffe8bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 19 Jul 2018 18:39:14 +0200 Subject: [PATCH 012/197] bug4508 fixed parameter eventname actually being eventName in documentation of api --- .../webservices/api/v1/eventCreateEvent.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/eventCreateEvent.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/eventCreateEvent.html index 7f7f3111e7e..f2ed5192668 100755 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/eventCreateEvent.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/eventCreateEvent.html @@ -38,7 +38,7 @@ consumption of this service simple.

Optional parameters: -
eventname name of the event; defaults to a name constructed from the user name +
eventName name of the event; defaults to a name constructed from the user name and a timestamp
eventdescription the event description text; defaults to the event name
startdate the event start date in ISO format (e.g., 2017-08-17T10:00:00+0200)
From f8de09726d5b4f85c71e5d5549d31db31ec6aaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 20 Jul 2018 08:32:29 +0200 Subject: [PATCH 013/197] bug4508 replaced tabs with spaces --- .../v1/regattasCompetitorsCreateAndAdd.html | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/regattasCompetitorsCreateAndAdd.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/regattasCompetitorsCreateAndAdd.html index d98ee361996..48495d4a607 100755 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/regattasCompetitorsCreateAndAdd.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/regattasCompetitorsCreateAndAdd.html @@ -1,11 +1,11 @@ - - - - - SAP Sailing Analytics Webservices API Version 1.0 + + + + + SAP Sailing Analytics Webservices API Version 1.0

SAP Sailing Analytics Webservices API Version 1.0

@@ -17,36 +17,36 @@ parameter; defaults will be obtained from the authenticated user invoking the se All slashes contained within the {regattaname} parameter must be replaced by "__" (double underscore).


- - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
Webservice Type:POST
Output format:The competitor as a JSON document
Mandatory parameters:boatclass the name of the competitor's boat class
Optional parameters: -
sailid the sail number to use
-
nationalityIOC three-letter IOC country code
-
timeontimefactor a double value telling the ToT / TMF / time-on-time factor for handicap racing
-
timeondistanceallowancepernauticalmileasmillis distance-based allowance in milliseconds for handicap racing (ToD)
-
searchtag a search tag for the competitor
-
Request method:POST
Example:curl -X POST -H "Authorization: Bearer KMTuXevrA0CYyM6O1W2E0QB9gVeP8tIpgjafJOvj/6A=" "http://127.0.0.1:8888/sailingserver/api/v1/regattas/Smartphone%20Tracking%20Test%2022.06/competitors/createandadd?boatclass=49er&sailid=GER+123&nationalityIOC=GER"
Webservice Type:POST
Output format:The competitor as a JSON document
Mandatory parameters:boatclass the name of the competitor's boat class
Optional parameters: +
sailid the sail number to use
+
nationalityIOC three-letter IOC country code
+
timeontimefactor a double value telling the ToT / TMF / time-on-time factor for handicap racing
+
timeondistanceallowancepernauticalmileasmillis distance-based allowance in milliseconds for handicap racing (ToD)
+
searchtag a search tag for the competitor
+
Request method:POST
Example:curl -X POST -H "Authorization: Bearer KMTuXevrA0CYyM6O1W2E0QB9gVeP8tIpgjafJOvj/6A=" "http://127.0.0.1:8888/sailingserver/api/v1/regattas/Smartphone%20Tracking%20Test%2022.06/competitors/createandadd?boatclass=49er&sailid=GER+123&nationalityIOC=GER"
Back to Web Service Overview From 73e51b7ed8cde08bec2e58517fa96a271e090075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 20 Jul 2018 08:48:18 +0200 Subject: [PATCH 014/197] bug4508 added new parameters competitorName and competitorEmail, fixed formating, fixed unnecessary hard cast --- .../gateway/jaxrs/api/RegattasResource.java | 468 ++++++++++-------- .../v1/regattasCompetitorsCreateAndAdd.html | 2 + 2 files changed, 271 insertions(+), 199 deletions(-) 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 d2210c0f412..a904600be20 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 @@ -35,7 +35,6 @@ import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; import com.sap.sailing.datamining.SailingPredefinedQueries; -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.Course; @@ -131,7 +130,7 @@ public class RegattasResource extends AbstractSailingServerResource { private static final Logger logger = Logger.getLogger(RegattasResource.class.getName()); private DataMiningResource dataMiningResource; - + private DataMiningResource getDataMiningResource() { if (dataMiningResource == null) { dataMiningResource = getResourceContext().getResource(DataMiningResource.class); @@ -140,41 +139,49 @@ public class RegattasResource extends AbstractSailingServerResource { } private Response getBadRegattaErrorResponse(String regattaName) { - return Response.status(Status.NOT_FOUND).entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + return Response.status(Status.NOT_FOUND) + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") .type(MediaType.TEXT_PLAIN).build(); } private Response getBadBoatClassResponse(String boatClassName) { - return Response.status(Status.NOT_FOUND).entity("Could not use a boat class with name '" + StringEscapeUtils.escapeHtml(boatClassName) + "'.") + return Response.status(Status.NOT_FOUND) + .entity("Could not use a boat class with name '" + StringEscapeUtils.escapeHtml(boatClassName) + "'.") .type(MediaType.TEXT_PLAIN).build(); } private Response getBadCompetitorIdResponse(Serializable competitorId) { - return Response.status(Status.NOT_FOUND).entity("Could not find a competitor with ID '" + StringEscapeUtils.escapeHtml(competitorId.toString()) + "'.") + return Response + .status(Status.NOT_FOUND).entity("Could not find a competitor with ID '" + + StringEscapeUtils.escapeHtml(competitorId.toString()) + "'.") .type(MediaType.TEXT_PLAIN).build(); } private Response getBadRaceErrorResponse(String regattaName, String raceName) { return Response.status(Status.NOT_FOUND) - .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "' in regatta '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "' in regatta '" + + StringEscapeUtils.escapeHtml(regattaName) + "'.") .type(MediaType.TEXT_PLAIN).build(); } - + private Response getBadSeriesErrorResponse(String regattaName, String seriesName) { return Response.status(Status.NOT_FOUND) - .entity("Could not find a series with name '" + StringEscapeUtils.escapeHtml(seriesName) + "' in regatta '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .entity("Could not find a series with name '" + StringEscapeUtils.escapeHtml(seriesName) + + "' in regatta '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") .type(MediaType.TEXT_PLAIN).build(); } - + private Response getNoTrackedRaceErrorResponse(String regattaName, String raceName) { return Response.status(Status.NOT_FOUND) - .entity("No tracked race for race with name '" + StringEscapeUtils.escapeHtml(raceName) + "' in regatta '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .entity("No tracked race for race with name '" + StringEscapeUtils.escapeHtml(raceName) + + "' in regatta '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") .type(MediaType.TEXT_PLAIN).build(); } private Response getNotEnoughDataAvailabeErrorResponse(String regattaName, String raceName) { return Response.status(Status.NOT_FOUND) - .entity("No wind or polar data for race with name '" + StringEscapeUtils.escapeHtml(raceName) + "' in regatta '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .entity("No wind or polar data for race with name '" + StringEscapeUtils.escapeHtml(raceName) + + "' in regatta '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") .type(MediaType.TEXT_PLAIN).build(); } @@ -200,8 +207,8 @@ public class RegattasResource extends AbstractSailingServerResource { if (regatta == null) { response = getBadRegattaErrorResponse(regattaName); } else { - SeriesJsonSerializer seriesJsonSerializer = new SeriesJsonSerializer(new FleetJsonSerializer( - new ColorJsonSerializer())); + SeriesJsonSerializer seriesJsonSerializer = new SeriesJsonSerializer( + new FleetJsonSerializer(new ColorJsonSerializer())); JsonSerializer regattaSerializer = new RegattaJsonSerializer(seriesJsonSerializer, null, null); JSONObject serializedRegatta = regattaSerializer.serialize(regatta); String json = serializedRegatta.toJSONString(); @@ -228,9 +235,10 @@ public class RegattasResource extends AbstractSailingServerResource { } else { NationalityJsonSerializer nationalityJsonSerializer = new NationalityJsonSerializer(); BoatJsonSerializer boatJsonSerializer = new BoatJsonSerializer(new BoatClassJsonSerializer()); - CompetitorJsonSerializer competitorJsonSerializer = new CompetitorJsonSerializer(new TeamJsonSerializer( - new PersonJsonSerializer(nationalityJsonSerializer)), boatJsonSerializer); - JsonSerializer regattaSerializer = new RegattaJsonSerializer(null, competitorJsonSerializer, boatJsonSerializer); + CompetitorJsonSerializer competitorJsonSerializer = new CompetitorJsonSerializer( + new TeamJsonSerializer(new PersonJsonSerializer(nationalityJsonSerializer)), boatJsonSerializer); + JsonSerializer regattaSerializer = new RegattaJsonSerializer(null, competitorJsonSerializer, + boatJsonSerializer); JSONObject serializedRegatta = regattaSerializer.serialize(regatta); String json = serializedRegatta.toJSONString(); response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); @@ -258,11 +266,14 @@ public class RegattasResource extends AbstractSailingServerResource { if (race == null) { response = getBadRaceErrorResponse(regattaName, raceName); } else { - CompetitorAndBoatJsonSerializer competitorAndBoatJsonSerializer = CompetitorAndBoatJsonSerializer.create(); - JsonSerializer raceEntriesSerializer = new RaceEntriesJsonSerializer(competitorAndBoatJsonSerializer); + CompetitorAndBoatJsonSerializer competitorAndBoatJsonSerializer = CompetitorAndBoatJsonSerializer + .create(); + JsonSerializer raceEntriesSerializer = new RaceEntriesJsonSerializer( + competitorAndBoatJsonSerializer); JSONObject serializedRaceEntries = raceEntriesSerializer.serialize(race); String json = serializedRaceEntries.toJSONString(); - response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8") + .build(); } } return response; @@ -307,7 +318,8 @@ public class RegattasResource extends AbstractSailingServerResource { competitorId = competitorIdAsString; } - final Competitor competitor = getService().getCompetitorAndBoatStore().getExistingCompetitorById(competitorId); + final Competitor competitor = getService().getCompetitorAndBoatStore() + .getExistingCompetitorById(competitorId); if (competitor == null) { response = getBadCompetitorIdResponse(competitorId); } else { @@ -326,7 +338,8 @@ public class RegattasResource extends AbstractSailingServerResource { @QueryParam("nationalityIOC") String nationalityThreeLetterIOCCode, @QueryParam("timeontimefactor") Double timeOnTimeFactor, @QueryParam("timeondistanceallowancepernauticalmileasmillis") Long timeOnDistanceAllowancePerNauticalMileAsMillis, - @QueryParam("searchtag") String searchTag) { + @QueryParam("searchtag") String searchTag, @QueryParam("competitorName") String competitorName, + @QueryParam("competitorEmail") String competitorEmail) { final Subject subject = SecurityUtils.getSubject(); subject.checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); Response response; @@ -337,21 +350,40 @@ public class RegattasResource extends AbstractSailingServerResource { response = getBadBoatClassResponse(boatClassName); } else { final User user = getService(SecurityService.class).getCurrentUser(); - final Boat boat = new BoatImpl(UUID.randomUUID(), user.getName(), - getService().getBaseDomainFactory().getOrCreateBoatClass(boatClassName, /* typicallyStartsUpwind */ true), - sailId); - final CompetitorWithBoat competitor = getService().getCompetitorAndBoatStore().getOrCreateCompetitorWithBoat(UUID.randomUUID(), - user.getFullName() == null ? user.getName() : user.getFullName(), /* shortName */ null, - /* displayColor */ null, user.getEmail(), /* flagImageURI */ null, - new TeamImpl(user.getName(), Collections.singleton(new PersonImpl(user.getFullName() == null ? user.getName() : user.getFullName(), + final String shortName; + final String name; + if (competitorName != null) { + name = competitorName; + shortName = competitorName; + } else { + shortName = user.getName(); + name = user.getFullName() == null ? shortName : user.getFullName(); + } + final String email; + if (competitorEmail != null) { + email = competitorEmail; + } else { + email = user.getEmail(); + } + + final DynamicBoat boat = new BoatImpl(UUID.randomUUID(), shortName, getService().getBaseDomainFactory() + .getOrCreateBoatClass(boatClassName, /* typicallyStartsUpwind */ true), sailId); + + final TeamImpl team = new TeamImpl(shortName, + Collections.singleton(new PersonImpl(name, getService().getBaseDomainFactory().getOrCreateNationality(nationalityThreeLetterIOCCode), /* dateOfBirth */ null, /* description */ null)), - /* coach */ null), timeOnTimeFactor, - timeOnDistanceAllowancePerNauticalMileAsMillis == null ? null : new MillisecondsDurationImpl(timeOnDistanceAllowancePerNauticalMileAsMillis), - searchTag, (DynamicBoat) boat); + /* coach */ null); + final Duration timeOnDistanceAllowancePerNauticalMile = timeOnDistanceAllowancePerNauticalMileAsMillis == null + ? null + : new MillisecondsDurationImpl(timeOnDistanceAllowancePerNauticalMileAsMillis); + final CompetitorWithBoat competitor = getService().getCompetitorAndBoatStore() + .getOrCreateCompetitorWithBoat(UUID.randomUUID(), name, /* shortName */ null, + /* displayColor */ null, email, /* flagImageURI */ null, team, timeOnTimeFactor, + timeOnDistanceAllowancePerNauticalMile, searchTag, boat); regatta.registerCompetitor(competitor); - response = Response.ok(CompetitorJsonSerializer.create().serialize(competitor).toJSONString()). - header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + response = Response.ok(CompetitorJsonSerializer.create().serialize(competitor).toJSONString()) + .header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } return response; } @@ -375,7 +407,8 @@ public class RegattasResource extends AbstractSailingServerResource { competitorId = competitorIdAsString; } - final Competitor competitor = getService().getCompetitorAndBoatStore().getExistingCompetitorById(competitorId); + final Competitor competitor = getService().getCompetitorAndBoatStore() + .getExistingCompetitorById(competitorId); if (competitor == null) { response = getBadCompetitorIdResponse(competitorId); } else { @@ -422,8 +455,8 @@ public class RegattasResource extends AbstractSailingServerResource { try { from = parseTimePoint(fromtime, fromtimeasmillis, trackedRace.getStartOfRace() == null ? new MillisecondsTimePoint(0) : - /* 24h before race start */new MillisecondsTimePoint(trackedRace.getStartOfRace() - .asMillis() - 24 * 3600 * 1000)); + /* 24h before race start */new MillisecondsTimePoint( + trackedRace.getStartOfRace().asMillis() - 24 * 3600 * 1000)); } catch (InvalidDateException e1) { return Response.status(Status.INTERNAL_SERVER_ERROR).entity("Could not parse the 'from' time.") .type(MediaType.TEXT_PLAIN).build(); @@ -446,8 +479,9 @@ public class RegattasResource extends AbstractSailingServerResource { jsonCompetitor.put("id", competitor.getId() != null ? competitor.getId().toString() : null); jsonCompetitor.put("name", competitor.getName()); jsonCompetitor.put("sailNumber", trackedRace.getBoatOfCompetitor(competitor).getSailID()); - jsonCompetitor.put("color", competitor.getColor() != null ? competitor.getColor().getAsHtml() : null); - if(competitor.getFlagImage() != null) { + jsonCompetitor.put("color", + competitor.getColor() != null ? competitor.getColor().getAsHtml() : null); + if (competitor.getFlagImage() != null) { jsonCompetitor.put("flagImage", competitor.getFlagImage().toString()); } GPSFixTrack track = trackedRace.getTrack(competitor); @@ -460,7 +494,7 @@ public class RegattasResource extends AbstractSailingServerResource { } else { fixIter = track.getFixesIterator(from, /* inclusive */true); } - GPSFixMoving fix = null; + GPSFixMoving fix = null; boolean lastAdded = false; while (fixIter.hasNext()) { fix = fixIter.next(); @@ -479,10 +513,11 @@ public class RegattasResource extends AbstractSailingServerResource { addCompetitorFixToJsonFixes(jsonFixes, fix, tack); lastAdded = true; } - + if (addLastKnown && !lastAdded) { // find a fix earlier than the interval requested: - Iterator earlierFixIter = track.getFixesDescendingIterator(from, /* inclusive */false); + Iterator earlierFixIter = track.getFixesDescendingIterator(from, + /* inclusive */false); final GPSFixMoving earlierFix; if (earlierFixIter.hasNext()) { earlierFix = earlierFixIter.next(); @@ -497,8 +532,12 @@ public class RegattasResource extends AbstractSailingServerResource { // don't output tack } } - if (earlierFix != null && (fix == null || earlierFix.getTimePoint().until(from).compareTo(to.until(fix.getTimePoint())) <= 0)) { - addCompetitorFixToJsonFixes(jsonFixes, earlierFix, tack); // the earlier fix is closer to the interval's beginning than fix is to its end + if (earlierFix != null && (fix == null || earlierFix.getTimePoint().until(from) + .compareTo(to.until(fix.getTimePoint())) <= 0)) { + addCompetitorFixToJsonFixes(jsonFixes, earlierFix, tack); // the earlier fix is + // closer to the + // interval's beginning + // than fix is to its end } else if (fix != null) { addCompetitorFixToJsonFixes(jsonFixes, fix, tack); } @@ -513,7 +552,8 @@ public class RegattasResource extends AbstractSailingServerResource { jsonRace.put("competitors", jsonCompetitors); String json = jsonRace.toJSONString(); - response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8") + .build(); } } return response; @@ -522,13 +562,10 @@ public class RegattasResource extends AbstractSailingServerResource { private JSONObject addCompetitorFixToJsonFixes(JSONArray jsonFixes, GPSFixMoving fix, Tack tack) { JSONObject jsonFix = new JSONObject(); jsonFix.put("timepoint-ms", fix.getTimePoint().asMillis()); - jsonFix.put("lat-deg", RoundingUtil.latLngDecimalFormatter.format(fix - .getPosition().getLatDeg())); - jsonFix.put("lng-deg", RoundingUtil.latLngDecimalFormatter.format(fix - .getPosition().getLngDeg())); + jsonFix.put("lat-deg", RoundingUtil.latLngDecimalFormatter.format(fix.getPosition().getLatDeg())); + jsonFix.put("lng-deg", RoundingUtil.latLngDecimalFormatter.format(fix.getPosition().getLngDeg())); jsonFix.put("truebearing-deg", fix.getSpeed().getBearing().getDegrees()); - jsonFix.put("speed-kts", - RoundingUtil.knotsDecimalFormatter.format(fix.getSpeed().getKnots())); + jsonFix.put("speed-kts", RoundingUtil.knotsDecimalFormatter.format(fix.getSpeed().getKnots())); if (tack != null) { jsonFix.put("tack", tack.name()); } @@ -607,7 +644,7 @@ public class RegattasResource extends AbstractSailingServerResource { } else { fixIter = track.getFixesIterator(from, /* inclusive */true); } - GPSFix fix = null; + GPSFix fix = null; boolean lastAdded = false; while (fixIter.hasNext()) { fix = fixIter.next(); @@ -618,7 +655,7 @@ public class RegattasResource extends AbstractSailingServerResource { addMarkFixToJsonFixes(jsonFixes, fix); lastAdded = true; } - + if (addLastKnown && !lastAdded) { // find a fix earlier than the interval requested: Iterator earlierFixIter = track.getFixesDescendingIterator(from, /* inclusive */false); @@ -628,13 +665,15 @@ public class RegattasResource extends AbstractSailingServerResource { } else { earlierFix = null; } - if (earlierFix != null && (fix == null || earlierFix.getTimePoint().until(from).compareTo(to.until(fix.getTimePoint())) <= 0)) { - addMarkFixToJsonFixes(jsonFixes, earlierFix); // the earlier fix is closer to the interval's beginning than fix is to its end + if (earlierFix != null && (fix == null + || earlierFix.getTimePoint().until(from).compareTo(to.until(fix.getTimePoint())) <= 0)) { + addMarkFixToJsonFixes(jsonFixes, earlierFix); // the earlier fix is closer to the interval's + // beginning than fix is to its end } else if (fix != null) { addMarkFixToJsonFixes(jsonFixes, fix); } } - + } finally { track.unlockAfterRead(); } @@ -651,10 +690,8 @@ public class RegattasResource extends AbstractSailingServerResource { private JSONObject addMarkFixToJsonFixes(JSONArray jsonFixes, GPSFix fix) { JSONObject jsonFix = new JSONObject(); jsonFix.put("timepoint-ms", fix.getTimePoint().asMillis()); - jsonFix.put("lat-deg", - RoundingUtil.latLngDecimalFormatter.format(fix.getPosition().getLatDeg())); - jsonFix.put("lng-deg", - RoundingUtil.latLngDecimalFormatter.format(fix.getPosition().getLngDeg())); + jsonFix.put("lat-deg", RoundingUtil.latLngDecimalFormatter.format(fix.getPosition().getLatDeg())); + jsonFix.put("lng-deg", RoundingUtil.latLngDecimalFormatter.format(fix.getPosition().getLngDeg())); jsonFixes.add(jsonFix); return jsonFix; } @@ -680,18 +717,19 @@ public class RegattasResource extends AbstractSailingServerResource { response = getBadRaceErrorResponse(regattaName, raceName); } else { Course course = race.getCourse(); - CourseBaseJsonSerializer serializer = new CourseBaseJsonSerializer(new WaypointJsonSerializer( - new ControlPointJsonSerializer(new MarkJsonSerializer(), new GateJsonSerializer( - new MarkJsonSerializer())))); + CourseBaseJsonSerializer serializer = new CourseBaseJsonSerializer( + new WaypointJsonSerializer(new ControlPointJsonSerializer(new MarkJsonSerializer(), + new GateJsonSerializer(new MarkJsonSerializer())))); JSONObject jsonCourse = serializer.serialize(course); String json = jsonCourse.toJSONString(); - response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8") + .build(); } } return response; } - + /** * Gets the target time of the race * @@ -723,17 +761,19 @@ public class RegattasResource extends AbstractSailingServerResource { TargetTimeInfo targetTime; try { targetTime = trackedRace.getEstimatedTimeToComplete(timePoint); - final TargetTimeInfoSerializer serializer = new TargetTimeInfoSerializer(new WindJsonSerializer(new PositionJsonSerializer())); + final TargetTimeInfoSerializer serializer = new TargetTimeInfoSerializer( + new WindJsonSerializer(new PositionJsonSerializer())); JSONObject jsonCourse = serializer.serialize(targetTime); String json = jsonCourse.toJSONString(); - response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + response = Response.ok(json) + .header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } catch (NotEnoughDataHasBeenAddedException | NoWindException e) { response = getNotEnoughDataAvailabeErrorResponse(regattaName, raceName); } } else { response = getNoTrackedRaceErrorResponse(regattaName, raceName); } - + } } return response; @@ -765,16 +805,16 @@ public class RegattasResource extends AbstractSailingServerResource { jsonRaceTimes.put("name", trackedRace.getRace().getName()); jsonRaceTimes.put("regatta", regatta.getName()); - jsonRaceTimes.put("startOfRace-ms", trackedRace.getStartOfRace() == null ? null : trackedRace - .getStartOfRace().asMillis()); - jsonRaceTimes.put("startOfTracking-ms", trackedRace.getStartOfTracking() == null ? null : trackedRace - .getStartOfTracking().asMillis()); + jsonRaceTimes.put("startOfRace-ms", + trackedRace.getStartOfRace() == null ? null : trackedRace.getStartOfRace().asMillis()); + jsonRaceTimes.put("startOfTracking-ms", + trackedRace.getStartOfTracking() == null ? null : trackedRace.getStartOfTracking().asMillis()); jsonRaceTimes.put("newestTrackingEvent-ms", trackedRace.getTimePointOfNewestEvent() == null ? null : trackedRace.getTimePointOfNewestEvent().asMillis()); - jsonRaceTimes.put("endOfTracking-ms", trackedRace.getEndOfTracking() == null ? null : trackedRace - .getEndOfTracking().asMillis()); - jsonRaceTimes.put("endOfRace-ms", trackedRace.getEndOfRace() == null ? null : trackedRace - .getEndOfRace().asMillis()); + jsonRaceTimes.put("endOfTracking-ms", + trackedRace.getEndOfTracking() == null ? null : trackedRace.getEndOfTracking().asMillis()); + jsonRaceTimes.put("endOfRace-ms", + trackedRace.getEndOfRace() == null ? null : trackedRace.getEndOfRace().asMillis()); jsonRaceTimes.put("delayToLive-ms", trackedRace.getDelayToLiveInMillis()); JSONArray jsonMarkPassingTimes = new JSONArray(); @@ -820,10 +860,8 @@ public class RegattasResource extends AbstractSailingServerResource { TimePoint firstPassingTime = firstPassingTimepoints.get(legNumber - 1); if (firstPassingTime != null) { jsonLegInfo.put("type", trackedLeg.getLegType(firstPassingTime)); - jsonLegInfo.put( - "bearing-deg", - RoundingUtil.bearingDecimalFormatter.format(trackedLeg.getLegBearing( - firstPassingTime).getDegrees())); + jsonLegInfo.put("bearing-deg", RoundingUtil.bearingDecimalFormatter + .format(trackedLeg.getLegBearing(firstPassingTime).getDegrees())); } } catch (NoWindException e) { // do nothing @@ -841,7 +879,8 @@ public class RegattasResource extends AbstractSailingServerResource { jsonRaceTimes.put("currentServerTime-ms", now.getTime()); String json = jsonRaceTimes.toJSONString(); - response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8") + .build(); } } return response; @@ -850,19 +889,20 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races/{racename}/windsources") - public Response getWindSources(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + public Response getWindSources(@PathParam("regattaname") String regattaName, + @PathParam("racename") String raceName) { Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { RaceDefinition race = findRaceByName(regatta, raceName); if (race == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { TrackedRace trackedRace = findTrackedRace(regattaName, raceName); JSONArray windSourcesAvailable = new JSONArray(); @@ -874,7 +914,8 @@ public class RegattasResource extends AbstractSailingServerResource { windSourcesAvailable.add(windSourceJson); } } - return Response.ok(windSourcesAvailable.toString()).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + return Response.ok(windSourcesAvailable.toString()) + .header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } } return response; @@ -892,18 +933,18 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else if (!((fromtime != null && totime != null) || (fromtimeasmillis != null && totimeasmillis != null))) { - response = Response.status(Status.NOT_FOUND) - .entity("Either the 'fromtime' and 'totime' or the 'fromtimeasmillis' and 'totimeasmillis' parameter must be set.").type(MediaType.TEXT_PLAIN) - .build(); + response = Response.status(Status.NOT_FOUND).entity( + "Either the 'fromtime' and 'totime' or the 'fromtimeasmillis' and 'totimeasmillis' parameter must be set.") + .type(MediaType.TEXT_PLAIN).build(); } else { RaceDefinition race = findRaceByName(regatta, raceName); if (race == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { TrackedRace trackedRace = findTrackedRace(regattaName, raceName); @@ -912,8 +953,8 @@ public class RegattasResource extends AbstractSailingServerResource { try { from = parseTimePoint(fromtime, fromtimeasmillis, trackedRace.getStartOfRace() == null ? new MillisecondsTimePoint(0) : - /* 24h before race start */new MillisecondsTimePoint(trackedRace.getStartOfRace() - .asMillis() - 24 * 3600 * 1000)); + /* 24h before race start */new MillisecondsTimePoint( + trackedRace.getStartOfRace().asMillis() - 24 * 3600 * 1000)); } catch (InvalidDateException e1) { return Response.status(Status.INTERNAL_SERVER_ERROR).entity("Could not parse the 'from' time.") .type(MediaType.TEXT_PLAIN).build(); @@ -926,9 +967,11 @@ public class RegattasResource extends AbstractSailingServerResource { } // Crop request interval to startOfTracking / [endOfTracking|timePointOfLastEvent] final TimePoint finalFrom = Util.getLatestOfTimePoints(from, trackedRace.getStartOfTracking()); - final TimePoint finalTo = Util.getEarliestOfTimePoints(to, Util.getEarliestOfTimePoints(trackedRace.getEndOfTracking(), trackedRace.getTimePointOfNewestEvent())); + final TimePoint finalTo = Util.getEarliestOfTimePoints(to, Util.getEarliestOfTimePoints( + trackedRace.getEndOfTracking(), trackedRace.getTimePointOfNewestEvent())); TrackedRaceJsonSerializer serializer = new TrackedRaceJsonSerializer( - ws->new DefaultWindTrackJsonSerializer(/* maxNumberOfFixes */ 10000, finalFrom, finalTo, ws), windSource, windSourceId); + ws -> new DefaultWindTrackJsonSerializer(/* maxNumberOfFixes */ 10000, finalFrom, finalTo, ws), + windSource, windSourceId); JSONObject jsonWindTracks = serializer.serialize(trackedRace); String json = jsonWindTracks.toJSONString(); @@ -948,31 +991,29 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { RaceDefinition race = findRaceByName(regatta, raceName); if (race == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { TrackedRace trackedRace = findTrackedRace(regattaName, raceName); final TimePoint timePoint; try { - timePoint = parseTimePoint( - time, - timeasmillis, - trackedRace.getStartOfRace() == null ? new MillisecondsTimePoint(0) : trackedRace - .getStartOfRace()); + timePoint = parseTimePoint(time, timeasmillis, + trackedRace.getStartOfRace() == null ? new MillisecondsTimePoint(0) + : trackedRace.getStartOfRace()); } catch (InvalidDateException e1) { return Response.status(Status.INTERNAL_SERVER_ERROR).entity("Could not parse the 'from' time.") .type(MediaType.TEXT_PLAIN).build(); } BearingJsonSerializer serializer = new BearingJsonSerializer(); - JSONObject jsonBearing = serializer.serialize(trackedRace.getDirectionFromStartToNextMark(timePoint) - .getFrom()); + JSONObject jsonBearing = serializer + .serialize(trackedRace.getDirectionFromStartToNextMark(timePoint).getFrom()); String json = jsonBearing.toJSONString(); return Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } @@ -983,19 +1024,20 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races/{racename}/markpassings") - public Response getMarkPassings(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + public Response getMarkPassings(@PathParam("regattaname") String regattaName, + @PathParam("racename") String raceName) { Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { RaceDefinition race = findRaceByName(regatta, raceName); if (race == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { TrackedRace trackedRace = findTrackedRace(regattaName, raceName); AbstractTrackedRaceDataJsonSerializer serializer = new MarkPassingsJsonSerializer(); @@ -1015,17 +1057,18 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { RaceDefinition race = findRaceByName(regatta, raceName); if (race == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { TrackedRace trackedRace = findTrackedRace(regattaName, raceName); - ManeuversJsonSerializer serializer = new ManeuversJsonSerializer(CompetitorAndBoatJsonSerializer.create(), + ManeuversJsonSerializer serializer = new ManeuversJsonSerializer( + CompetitorAndBoatJsonSerializer.create(), new ManeuverJsonSerializer(new GPSFixJsonSerializer(), new DistanceJsonSerializer())); JSONObject jsonMarkPassings = serializer.serialize(trackedRace); String json = jsonMarkPassings.toJSONString(); @@ -1034,7 +1077,7 @@ public class RegattasResource extends AbstractSailingServerResource { } return response; } - + @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races/{racename}/completeManeuverCurvesWithEstimationData") @@ -1138,8 +1181,8 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { JSONObject jsonRaceResults = new JSONObject(); jsonRaceResults.put("regatta", regatta.getName()); @@ -1156,7 +1199,7 @@ public class RegattasResource extends AbstractSailingServerResource { } return response; } - + @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races/{racename}/competitors/legs") @@ -1166,14 +1209,14 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { RaceDefinition race = findRaceByName(regatta, raceName); if (race == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { TrackedRace trackedRace = findTrackedRace(regattaName, raceName); TimePoint timePoint = trackedRace.getTimePointOfNewestEvent() == null ? MillisecondsTimePoint.now() @@ -1182,8 +1225,8 @@ public class RegattasResource extends AbstractSailingServerResource { JSONObject jsonRaceResults = new JSONObject(); jsonRaceResults.put("name", trackedRace.getRace().getName()); jsonRaceResults.put("regatta", regatta.getName()); - jsonRaceResults.put("startOfRace-ms", trackedRace.getStartOfRace() == null ? null : trackedRace - .getStartOfRace().asMillis()); + jsonRaceResults.put("startOfRace-ms", + trackedRace.getStartOfRace() == null ? null : trackedRace.getStartOfRace().asMillis()); JSONArray jsonLegs = new JSONArray(); Course course = trackedRace.getRace().getCourse(); @@ -1192,9 +1235,12 @@ public class RegattasResource extends AbstractSailingServerResource { for (TrackedLeg leg : trackedRace.getTrackedLegs()) { JSONObject jsonLeg = new JSONObject(); jsonLeg.put("from", leg.getLeg().getFrom().getName()); - jsonLeg.put("fromWaypointId", leg.getLeg().getFrom().getId() != null ? leg.getLeg().getFrom().getId().toString() : null); + jsonLeg.put("fromWaypointId", + leg.getLeg().getFrom().getId() != null ? leg.getLeg().getFrom().getId().toString() + : null); jsonLeg.put("to", leg.getLeg().getTo().getName()); - jsonLeg.put("toWaypointId", leg.getLeg().getTo().getId() != null ? leg.getLeg().getTo().getId().toString() : null); + jsonLeg.put("toWaypointId", + leg.getLeg().getTo().getId() != null ? leg.getLeg().getTo().getId().toString() : null); try { jsonLeg.put("upOrDownwindLeg", leg.isUpOrDownwindLeg(timePoint)); } catch (NoWindException e) { @@ -1207,34 +1253,39 @@ public class RegattasResource extends AbstractSailingServerResource { JSONObject jsonCompetitorInLeg = new JSONObject(); TrackedLegOfCompetitor trackedLegOfCompetitor = leg.getTrackedLeg(competitor); if (trackedLegOfCompetitor != null) { - jsonCompetitorInLeg.put("id", competitor.getId() != null ? competitor.getId() - .toString() : null); + jsonCompetitorInLeg.put("id", + competitor.getId() != null ? competitor.getId().toString() : null); jsonCompetitorInLeg.put("name", competitor.getName()); - jsonCompetitorInLeg.put("sailNumber", trackedRace.getBoatOfCompetitor(competitor).getSailID()); - jsonCompetitorInLeg.put("color", competitor.getColor() != null ? competitor.getColor() - .getAsHtml() : null); + jsonCompetitorInLeg.put("sailNumber", + trackedRace.getBoatOfCompetitor(competitor).getSailID()); + jsonCompetitorInLeg.put("color", + competitor.getColor() != null ? competitor.getColor().getAsHtml() : null); Speed averageSpeedOverGround = trackedLegOfCompetitor .getAverageSpeedOverGround(timePoint); if (averageSpeedOverGround != null) { - jsonCompetitorInLeg.put("averageSOG-kts", - RoundingUtil.knotsDecimalFormatter.format(averageSpeedOverGround - .getKnots())); + jsonCompetitorInLeg.put("averageSOG-kts", RoundingUtil.knotsDecimalFormatter + .format(averageSpeedOverGround.getKnots())); } try { - Integer numberOfTacks = trackedLegOfCompetitor.getNumberOfTacks(timePoint, /* waitForLatest */ + Integer numberOfTacks = trackedLegOfCompetitor.getNumberOfTacks(timePoint, /* + * waitForLatest + */ false); - Integer numberOfJibes = trackedLegOfCompetitor.getNumberOfJibes(timePoint, /* waitForLatest */ + Integer numberOfJibes = trackedLegOfCompetitor.getNumberOfJibes(timePoint, /* + * waitForLatest + */ false); - Integer numberOfPenaltyCircles = trackedLegOfCompetitor.getNumberOfPenaltyCircles( - timePoint, /* waitForLatest */false); + Integer numberOfPenaltyCircles = trackedLegOfCompetitor + .getNumberOfPenaltyCircles(timePoint, /* waitForLatest */false); jsonCompetitorInLeg.put("tacks", numberOfTacks); jsonCompetitorInLeg.put("jibes", numberOfJibes); jsonCompetitorInLeg.put("penaltyCircles", numberOfPenaltyCircles); } catch (NoWindException e) { logger.log(Level.FINE, "No wind information while trying to determing maneuvers for competitor " - + competitor.getName(), e); + + competitor.getName(), + e); } TimePoint startTime = trackedLegOfCompetitor.getStartTime(); @@ -1257,16 +1308,15 @@ public class RegattasResource extends AbstractSailingServerResource { startOfRace, finishTime != null ? finishTime : timePoint); if (distanceSinceGun != null) { jsonCompetitorInLeg.put("distanceSinceGun-m", - RoundingUtil.distanceDecimalFormatter.format(distanceSinceGun - .getMeters())); + RoundingUtil.distanceDecimalFormatter + .format(distanceSinceGun.getMeters())); } } Distance distanceTraveled = trackedLegOfCompetitor.getDistanceTraveled(timePoint); if (distanceTraveled != null) { jsonCompetitorInLeg.put("distanceTraveled-m", - RoundingUtil.distanceDecimalFormatter.format(distanceTraveled - .getMeters())); + RoundingUtil.distanceDecimalFormatter.format(distanceTraveled.getMeters())); } Distance distanceTraveledIncludingGateStart = trackedLegOfCompetitor .getDistanceTraveledConsideringGateStart(timePoint); @@ -1285,10 +1335,15 @@ public class RegattasResource extends AbstractSailingServerResource { throw re; } } - Duration gapToLeaderDuration = trackedLegOfCompetitor.getGapToLeader(timePoint, rankingInfo, WindPositionMode.LEG_MIDDLE); - jsonCompetitorInLeg.put("gapToLeader-s", gapToLeaderDuration != null ? gapToLeaderDuration.asSeconds() : 0.0); - Distance gapToLeaderDistance = trackedLegOfCompetitor.getWindwardDistanceToCompetitorFarthestAhead(timePoint, WindPositionMode.LEG_MIDDLE, rankingInfo); - jsonCompetitorInLeg.put("gapToLeader-m", gapToLeaderDistance != null ? gapToLeaderDistance.getMeters() : 0.0); + Duration gapToLeaderDuration = trackedLegOfCompetitor.getGapToLeader(timePoint, + rankingInfo, WindPositionMode.LEG_MIDDLE); + jsonCompetitorInLeg.put("gapToLeader-s", + gapToLeaderDuration != null ? gapToLeaderDuration.asSeconds() : 0.0); + Distance gapToLeaderDistance = trackedLegOfCompetitor + .getWindwardDistanceToCompetitorFarthestAhead(timePoint, + WindPositionMode.LEG_MIDDLE, rankingInfo); + jsonCompetitorInLeg.put("gapToLeader-m", + gapToLeaderDistance != null ? gapToLeaderDistance.getMeters() : 0.0); jsonCompetitorInLeg.put("started", trackedLegOfCompetitor.hasStartedLeg(timePoint)); jsonCompetitorInLeg.put("finished", trackedLegOfCompetitor.hasFinishedLeg(timePoint)); jsonCompetitors.add(jsonCompetitorInLeg); @@ -1318,14 +1373,14 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { RaceDefinition race = findRaceByName(regatta, raceName); if (race == null) { response = Response.status(Status.NOT_FOUND) - .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) - .build(); + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.") + .type(MediaType.TEXT_PLAIN).build(); } else { Leaderboard leaderboard = getService().getLeaderboardByName(regattaName); TrackedRace trackedRace = findTrackedRace(regattaName, raceName); @@ -1369,8 +1424,8 @@ public class RegattasResource extends AbstractSailingServerResource { jsonCompetitorInLeg.put("id", competitor.getId() != null ? competitor.getId().toString() : null); jsonCompetitorInLeg.put("name", competitor.getName()); jsonCompetitorInLeg.put("sailNumber", trackedRace.getBoatOfCompetitor(competitor).getSailID()); - jsonCompetitorInLeg.put("color", competitor.getColor() != null ? competitor.getColor().getAsHtml() - : null); + jsonCompetitorInLeg.put("color", + competitor.getColor() != null ? competitor.getColor().getAsHtml() : null); jsonCompetitorInLeg.put("rank", rank++); final Integer overallRank = overallRankPerCompetitor.get(competitor); if (overallRank != null) { @@ -1381,7 +1436,8 @@ public class RegattasResource extends AbstractSailingServerResource { if (competitorTrack != null) { final SpeedWithBearing estimatedSpeed = competitorTrack.getEstimatedSpeed(timePoint); if (estimatedSpeed != null) { - jsonCompetitorInLeg.put("speedOverGround-kts", roundDouble(estimatedSpeed.getKnots(), 2)); + jsonCompetitorInLeg.put("speedOverGround-kts", + roundDouble(estimatedSpeed.getKnots(), 2)); } } } @@ -1400,14 +1456,15 @@ public class RegattasResource extends AbstractSailingServerResource { roundDouble(distanceTraveledConsideringGateStart.getMeters(), 2)); } - Duration gapToLeader = currentLegOfCompetitor.getGapToLeader(timePoint, - rankingInfo, WindPositionMode.LEG_MIDDLE); + Duration gapToLeader = currentLegOfCompetitor.getGapToLeader(timePoint, rankingInfo, + WindPositionMode.LEG_MIDDLE); if (gapToLeader != null) { jsonCompetitorInLeg.put("gapToLeader-s", roundDouble(gapToLeader.asSeconds(), 2)); } Distance windwardDistanceToCompetitorFarthestAhead = currentLegOfCompetitor - .getWindwardDistanceToCompetitorFarthestAhead(timePoint, WindPositionMode.LEG_MIDDLE, rankingInfo); + .getWindwardDistanceToCompetitorFarthestAhead(timePoint, WindPositionMode.LEG_MIDDLE, + rankingInfo); if (windwardDistanceToCompetitorFarthestAhead != null) { jsonCompetitorInLeg.put("gapToLeader-m", roundDouble(windwardDistanceToCompetitorFarthestAhead.getMeters(), 2)); @@ -1431,12 +1488,13 @@ public class RegattasResource extends AbstractSailingServerResource { } return response; } - + @GET @Produces("application/json;charset=UTF-8") @Path("datamining") public Response getRegattaPredefinedQueries() { - List predefinedRegattaQueries = getDataMiningResource().getPredefinedRegattaDataMiningQueries(); + List predefinedRegattaQueries = getDataMiningResource() + .getPredefinedRegattaDataMiningQueries(); return getDataMiningResource().predefinedQueryIdentifiersToJSON(predefinedRegattaQueries); } @@ -1445,7 +1503,7 @@ public class RegattasResource extends AbstractSailingServerResource { @Path("{regattaname}/datamining/" + SailingPredefinedQueries.QUERY_AVERAGE_SPEED_PER_COMPETITOR_LEGTYPE) public Response avgSpeedPerCompetitorAndLegType(@PathParam("regattaname") String regattaName) { Response response; - + Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = getBadRegattaErrorResponse(regattaName); @@ -1457,10 +1515,12 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") - @Path("{regattaname}/races/{racename}/datamining/" + SailingPredefinedQueries.QUERY_AVERAGE_SPEED_PER_COMPETITOR_LEGTYPE) - public Response avgSpeedPerCompetitorAndLegType(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + @Path("{regattaname}/races/{racename}/datamining/" + + SailingPredefinedQueries.QUERY_AVERAGE_SPEED_PER_COMPETITOR_LEGTYPE) + public Response avgSpeedPerCompetitorAndLegType(@PathParam("regattaname") String regattaName, + @PathParam("racename") String raceName) { Response response; - + Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = getBadRegattaErrorResponse(regattaName); @@ -1480,7 +1540,7 @@ public class RegattasResource extends AbstractSailingServerResource { @Path("{regattaname}/datamining/" + SailingPredefinedQueries.QUERY_DISTANCE_TRAVELED_PER_COMPETITOR_LEGTYPE) public Response sumDistancePerCompetitorAndLegType(@PathParam("regattaname") String regattaName) { Response response; - + Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = getBadRegattaErrorResponse(regattaName); @@ -1492,10 +1552,12 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") - @Path("{regattaname}/races/{racename}/datamining/" + SailingPredefinedQueries.QUERY_DISTANCE_TRAVELED_PER_COMPETITOR_LEGTYPE) - public Response sumDistancePerCompetitorAndLegType(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + @Path("{regattaname}/races/{racename}/datamining/" + + SailingPredefinedQueries.QUERY_DISTANCE_TRAVELED_PER_COMPETITOR_LEGTYPE) + public Response sumDistancePerCompetitorAndLegType(@PathParam("regattaname") String regattaName, + @PathParam("racename") String raceName) { Response response; - + Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = getBadRegattaErrorResponse(regattaName); @@ -1515,7 +1577,7 @@ public class RegattasResource extends AbstractSailingServerResource { @Path("{regattaname}/datamining/" + SailingPredefinedQueries.QUERY_MANEUVERS_PER_COMPETITOR) public Response sumManeuversPerCompetitor(@PathParam("regattaname") String regattaName) { Response response; - + Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = getBadRegattaErrorResponse(regattaName); @@ -1528,9 +1590,10 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races/{racename}/datamining/" + SailingPredefinedQueries.QUERY_MANEUVERS_PER_COMPETITOR) - public Response sumManeuversPerCompetitor(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + public Response sumManeuversPerCompetitor(@PathParam("regattaname") String regattaName, + @PathParam("racename") String raceName) { Response response; - + Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = getBadRegattaErrorResponse(regattaName); @@ -1550,7 +1613,7 @@ public class RegattasResource extends AbstractSailingServerResource { @Path("{regattaname}/datamining/" + SailingPredefinedQueries.QUERY_AVERAGE_SPEED_PER_COMPETITOR) public Response avgSpeedPerCompetitor(@PathParam("regattaname") String regattaName) { Response response; - + Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { response = getBadRegattaErrorResponse(regattaName); @@ -1563,7 +1626,8 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races/{racename}/datamining/" + SailingPredefinedQueries.QUERY_AVERAGE_SPEED_PER_COMPETITOR) - public Response avgSpeedPerCompetitor(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + public Response avgSpeedPerCompetitor(@PathParam("regattaname") String regattaName, + @PathParam("racename") String raceName) { Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { @@ -1581,7 +1645,7 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") - @Path("{regattaname}/datamining/"+ SailingPredefinedQueries.QUERY_DISTANCE_TRAVELED_PER_COMPETITOR) + @Path("{regattaname}/datamining/" + SailingPredefinedQueries.QUERY_DISTANCE_TRAVELED_PER_COMPETITOR) public Response sumDistancePerCompetitor(@PathParam("regattaname") String regattaName) { Response response; Regatta regatta = findRegattaByName(regattaName); @@ -1595,8 +1659,10 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") - @Path("{regattaname}/races/{racename}/datamining/" + SailingPredefinedQueries.QUERY_DISTANCE_TRAVELED_PER_COMPETITOR) - public Response sumDistancePerCompetitor(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + @Path("{regattaname}/races/{racename}/datamining/" + + SailingPredefinedQueries.QUERY_DISTANCE_TRAVELED_PER_COMPETITOR) + public Response sumDistancePerCompetitor(@PathParam("regattaname") String regattaName, + @PathParam("racename") String raceName) { Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { @@ -1611,7 +1677,7 @@ public class RegattasResource extends AbstractSailingServerResource { } return response; } - + @POST @Produces("application/json;charset=UTF-8") @Path("{regattaname}/addracecolumns") @@ -1630,9 +1696,10 @@ public class RegattasResource extends AbstractSailingServerResource { } else { final String raceNamePrefix = prefix == null ? "R" : prefix; int oneBasedNumberOfLast = Util.size(series.getRaceColumns()); - for (int i = 1; i <= (numberOfRaces==null?1:numberOfRaces); i++) { + for (int i = 1; i <= (numberOfRaces == null ? 1 : numberOfRaces); i++) { final int oneBasedNumberOfNext = findNextFreeRaceName(series, raceNamePrefix, oneBasedNumberOfLast); - final RaceColumnInSeries raceColumn = addRaceColumn(regattaName, series.getName(), getRaceName(raceNamePrefix, oneBasedNumberOfNext)); + final RaceColumnInSeries raceColumn = addRaceColumn(regattaName, series.getName(), + getRaceName(raceNamePrefix, oneBasedNumberOfNext)); final JSONObject raceColumnDataAsJson = new JSONObject(); raceColumnDataAsJson.put("seriesname", raceColumn.getSeries().getName()); raceColumnDataAsJson.put("racename", raceColumn.getName()); @@ -1640,7 +1707,8 @@ public class RegattasResource extends AbstractSailingServerResource { oneBasedNumberOfLast = oneBasedNumberOfNext; } String json = jsonResponse.toJSONString(); - response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + response = Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8") + .build(); } } return response; @@ -1650,7 +1718,8 @@ public class RegattasResource extends AbstractSailingServerResource { @Path("{regattaname}/removeracecolumn") public Response addRaceColumns(@PathParam("regattaname") String regattaName, @QueryParam("racecolumn") String raceColumnName) { - SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + SecurityUtils.getSubject() + .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); final Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { @@ -1674,9 +1743,9 @@ public class RegattasResource extends AbstractSailingServerResource { } private String getRaceName(final String raceNamePrefix, final int number) { - return raceNamePrefix+number; + return raceNamePrefix + number; } - + private int findNextFreeRaceName(Series series, String raceNamePrefix, int oneBasedNumberOfLast) { int result = oneBasedNumberOfLast; boolean clash = false; @@ -1695,7 +1764,8 @@ public class RegattasResource extends AbstractSailingServerResource { } private RaceColumnInSeries addRaceColumn(String regattaName, String seriesName, String columnName) { - SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + SecurityUtils.getSubject() + .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); return getService().apply(new AddColumnToSeries(new RegattaName(regattaName), seriesName, columnName)); } @@ -1713,7 +1783,7 @@ public class RegattasResource extends AbstractSailingServerResource { } return result; } - + @POST @Path("/updateOrCreateSeries") @Consumes(MediaType.APPLICATION_JSON) @@ -1722,39 +1792,39 @@ public class RegattasResource extends AbstractSailingServerResource { Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); String regattaName = (String) requestObject.get("regattaName"); - + Regatta regatta = getService().getRegattaByName(regattaName); if (regatta != null) { -// SecurityUtils.getSubject() -// .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); + // SecurityUtils.getSubject() + // .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); } - - + String seriesName = (String) requestObject.get("seriesName"); String seriesNameNew = (String) requestObject.get("seriesNameNew"); boolean isMedal = (boolean) requestObject.get("isMedal"); boolean isFleetsCanRunInParallel = (boolean) requestObject.get("isFleetsCanRunInParallel"); boolean startsWithZeroScore = (boolean) requestObject.get("startsWithZeroScore"); - boolean firstColumnIsNonDiscardableCarryForward = (boolean) requestObject.get("firstColumnIsNonDiscardableCarryForward"); + boolean firstColumnIsNonDiscardableCarryForward = (boolean) requestObject + .get("firstColumnIsNonDiscardableCarryForward"); boolean hasSplitFleetContiguousScoring = (boolean) requestObject.get("hasSplitFleetContiguousScoring"); - + Integer maximumNumberOfDiscards = null; if (requestObject.containsKey("maximumNumberOfDiscards")) { maximumNumberOfDiscards = (int) (long) requestObject.get("maximumNumberOfDiscards"); } - + int[] resultDiscardingThresholds = null; - if(requestObject.containsKey("resultDiscardingThresholds")) { + if (requestObject.containsKey("resultDiscardingThresholds")) { JSONArray resultDiscardingThresholdsRaw = (JSONArray) requestObject.get("resultDiscardingThresholds"); resultDiscardingThresholds = new int[resultDiscardingThresholdsRaw.size()]; for (int i = 0; i < resultDiscardingThresholdsRaw.size(); i++) { resultDiscardingThresholds[i] = (int) (long) resultDiscardingThresholdsRaw.get(i); } } - + JSONArray fleetsRaw = (JSONArray) requestObject.get("fleets"); List fleets = new ArrayList<>(); - for(Object fleetRaw:fleetsRaw) { + for (Object fleetRaw : fleetsRaw) { JSONObject fleet = Helpers.toJSONObjectSafe(fleetRaw); String fleetName = (String) fleet.get("fleetName"); int orderNo = (int) (long) fleet.get("orderNo"); diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/regattasCompetitorsCreateAndAdd.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/regattasCompetitorsCreateAndAdd.html index 48495d4a607..4915138a711 100755 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/regattasCompetitorsCreateAndAdd.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/regattasCompetitorsCreateAndAdd.html @@ -37,6 +37,8 @@ All slashes contained within the {regattaname} parameter must be replaced by "__
timeontimefactor a double value telling the ToT / TMF / time-on-time factor for handicap racing
timeondistanceallowancepernauticalmileasmillis distance-based allowance in milliseconds for handicap racing (ToD)
searchtag a search tag for the competitor
+
competitorName the name to use for the newly created/added competitor
+
competitorEmail the email to use for the newly created/added competitor
From ec0a95268b55a2edaf66aa7eb20d2993c8eea7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 20 Jul 2018 08:58:55 +0200 Subject: [PATCH 015/197] bug4508 enabled permission checks for new api --- .../gateway/jaxrs/api/MarkRessource.java | 11 ++- .../gateway/jaxrs/api/RegattasResource.java | 73 ++++++++++--------- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java index 33e5d13a973..4266b8fa1da 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -16,6 +16,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.apache.shiro.SecurityUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; @@ -46,6 +47,8 @@ import com.sap.sailing.domain.common.NotFoundException; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.racelog.tracking.CompetitorRegistrationOnRaceLogDisabledException; import com.sap.sailing.domain.common.racelog.tracking.DoesNotHaveRegattaLogException; +import com.sap.sailing.domain.common.security.Permission; +import com.sap.sailing.domain.common.security.Permission.Mode; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.leaderboard.Leaderboard; @@ -66,7 +69,7 @@ public class MarkRessource extends AbstractSailingServerResource { @Consumes(MediaType.APPLICATION_JSON) @Produces("application/json;charset=UTF-8") public Response addMarkToRegatta(String json) throws Exception { - // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); @@ -93,7 +96,7 @@ public class MarkRessource extends AbstractSailingServerResource { @Produces("application/json;charset=UTF-8") public Response addMarkFix(String json) throws DoesNotHaveRegattaLogException, ParseException, JsonDeserializationException { - // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_MARK_POSITIONS.getStringPermission(Mode.CREATE)); + SecurityUtils.getSubject().checkPermission(Permission.MANAGE_MARK_POSITIONS.getStringPermission(Mode.CREATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); @@ -136,7 +139,7 @@ public class MarkRessource extends AbstractSailingServerResource { @Produces("application/json;charset=UTF-8") public Response addCourseDefinitionToRaceLog(String json) throws DoesNotHaveRegattaLogException, NotFoundException, ParseException, JsonDeserializationException { - // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); @@ -199,7 +202,7 @@ public class MarkRessource extends AbstractSailingServerResource { @Produces("application/json;charset=UTF-8") public Response addCompetitorToRace(String json) throws DoesNotHaveRegattaLogException, NotFoundException, ParseException, JsonDeserializationException, CompetitorRegistrationOnRaceLogDisabledException { - // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); 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 a904600be20..3e1c115a664 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 @@ -1795,46 +1795,47 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = getService().getRegattaByName(regattaName); if (regatta != null) { - // SecurityUtils.getSubject() - // .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); - } + SecurityUtils.getSubject() + .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); + String seriesName = (String) requestObject.get("seriesName"); + String seriesNameNew = (String) requestObject.get("seriesNameNew"); + boolean isMedal = (boolean) requestObject.get("isMedal"); + boolean isFleetsCanRunInParallel = (boolean) requestObject.get("isFleetsCanRunInParallel"); + boolean startsWithZeroScore = (boolean) requestObject.get("startsWithZeroScore"); + boolean firstColumnIsNonDiscardableCarryForward = (boolean) requestObject + .get("firstColumnIsNonDiscardableCarryForward"); + boolean hasSplitFleetContiguousScoring = (boolean) requestObject.get("hasSplitFleetContiguousScoring"); - String seriesName = (String) requestObject.get("seriesName"); - String seriesNameNew = (String) requestObject.get("seriesNameNew"); - boolean isMedal = (boolean) requestObject.get("isMedal"); - boolean isFleetsCanRunInParallel = (boolean) requestObject.get("isFleetsCanRunInParallel"); - boolean startsWithZeroScore = (boolean) requestObject.get("startsWithZeroScore"); - boolean firstColumnIsNonDiscardableCarryForward = (boolean) requestObject - .get("firstColumnIsNonDiscardableCarryForward"); - boolean hasSplitFleetContiguousScoring = (boolean) requestObject.get("hasSplitFleetContiguousScoring"); - - Integer maximumNumberOfDiscards = null; - if (requestObject.containsKey("maximumNumberOfDiscards")) { - maximumNumberOfDiscards = (int) (long) requestObject.get("maximumNumberOfDiscards"); - } - - int[] resultDiscardingThresholds = null; - if (requestObject.containsKey("resultDiscardingThresholds")) { - JSONArray resultDiscardingThresholdsRaw = (JSONArray) requestObject.get("resultDiscardingThresholds"); - resultDiscardingThresholds = new int[resultDiscardingThresholdsRaw.size()]; - for (int i = 0; i < resultDiscardingThresholdsRaw.size(); i++) { - resultDiscardingThresholds[i] = (int) (long) resultDiscardingThresholdsRaw.get(i); + Integer maximumNumberOfDiscards = null; + if (requestObject.containsKey("maximumNumberOfDiscards")) { + maximumNumberOfDiscards = (int) (long) requestObject.get("maximumNumberOfDiscards"); } + + int[] resultDiscardingThresholds = null; + if (requestObject.containsKey("resultDiscardingThresholds")) { + JSONArray resultDiscardingThresholdsRaw = (JSONArray) requestObject.get("resultDiscardingThresholds"); + resultDiscardingThresholds = new int[resultDiscardingThresholdsRaw.size()]; + for (int i = 0; i < resultDiscardingThresholdsRaw.size(); i++) { + resultDiscardingThresholds[i] = (int) (long) resultDiscardingThresholdsRaw.get(i); + } + } + + JSONArray fleetsRaw = (JSONArray) requestObject.get("fleets"); + List fleets = new ArrayList<>(); + for (Object fleetRaw : fleetsRaw) { + JSONObject fleet = Helpers.toJSONObjectSafe(fleetRaw); + String fleetName = (String) fleet.get("fleetName"); + int orderNo = (int) (long) fleet.get("orderNo"); + String htmlColor = (String) fleet.get("htmlColor"); + fleets.add(new FleetDTO(fleetName, orderNo, new RGBColor(htmlColor))); + } + getService().apply(new UpdateSeries(regatta.getRegattaIdentifier(), seriesName, seriesNameNew, isMedal, + isFleetsCanRunInParallel, resultDiscardingThresholds, startsWithZeroScore, + firstColumnIsNonDiscardableCarryForward, hasSplitFleetContiguousScoring, maximumNumberOfDiscards, + fleets)); } - JSONArray fleetsRaw = (JSONArray) requestObject.get("fleets"); - List fleets = new ArrayList<>(); - for (Object fleetRaw : fleetsRaw) { - JSONObject fleet = Helpers.toJSONObjectSafe(fleetRaw); - String fleetName = (String) fleet.get("fleetName"); - int orderNo = (int) (long) fleet.get("orderNo"); - String htmlColor = (String) fleet.get("htmlColor"); - fleets.add(new FleetDTO(fleetName, orderNo, new RGBColor(htmlColor))); - } - getService().apply(new UpdateSeries(regatta.getRegattaIdentifier(), seriesName, seriesNameNew, isMedal, - isFleetsCanRunInParallel, resultDiscardingThresholds, startsWithZeroScore, - firstColumnIsNonDiscardableCarryForward, hasSplitFleetContiguousScoring, maximumNumberOfDiscards, - fleets)); + return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } From 97b1e4fb269be3b07e099fdfd1c6f0255a5ef61e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 20 Jul 2018 10:59:18 +0200 Subject: [PATCH 016/197] bug4508 improved error messages if an mark cannot be resolved, returning the new course layout after update was applied in json response --- .../gateway/jaxrs/api/MarkRessource.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java index 4266b8fa1da..c7f371c8231 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -58,6 +58,12 @@ import com.sap.sailing.domain.regattalike.HasRegattaLike; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.impl.Helpers; import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource; +import com.sap.sailing.server.gateway.serialization.coursedata.impl.ControlPointJsonSerializer; +import com.sap.sailing.server.gateway.serialization.coursedata.impl.CourseBaseJsonSerializer; +import com.sap.sailing.server.gateway.serialization.coursedata.impl.CourseJsonSerializer; +import com.sap.sailing.server.gateway.serialization.coursedata.impl.GateJsonSerializer; +import com.sap.sailing.server.gateway.serialization.coursedata.impl.MarkJsonSerializer; +import com.sap.sailing.server.gateway.serialization.coursedata.impl.WaypointJsonSerializer; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -171,12 +177,21 @@ public class MarkRessource extends AbstractSailingServerResource { if (marksRaw.size() == 1) { String markName = (String) marksRaw.get(0); Mark mark = getService().getBaseDomainFactory().getExistingMarkByIdAsString(markName); + if (mark == null) { + throw new IllegalStateException("Could not resolve mark " + markName); + } controlPoints.add(new Pair<>(mark, passing)); } else { String markNameA = (String) marksRaw.get(0); String markNameB = (String) marksRaw.get(1); Mark markA = getService().getBaseDomainFactory().getExistingMarkByIdAsString(markNameA); Mark markB = getService().getBaseDomainFactory().getExistingMarkByIdAsString(markNameB); + if (markA == null) { + throw new IllegalStateException("Could not resolve mark " + markA); + } + if (markB == null) { + throw new IllegalStateException("Could not resolve mark " + markB); + } controlPoints.add(new Pair<>( new ControlPointWithTwoMarksImpl(markA, markB, markA.getName() + "-" + markB.getName()), passing)); @@ -185,6 +200,7 @@ public class MarkRessource extends AbstractSailingServerResource { Course course = new CourseImpl(courseName, lastPublishedCourse.getWaypoints()); + try { course.update(controlPoints, getService().getBaseDomainFactory()); } catch (Exception e) { @@ -193,7 +209,18 @@ public class MarkRessource extends AbstractSailingServerResource { RaceLogEvent event = new RaceLogCourseDesignChangedEventImpl(MillisecondsTimePoint.now(), getService().getServerAuthor(), raceLog.getCurrentPassId(), course, CourseDesignerMode.ADMIN_CONSOLE); raceLog.add(event); - return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + + CourseBase updatedPublishedCourse = new LastPublishedCourseDesignFinder(raceLog, + /* onlyCoursesWithValidWaypointList */ false).analyze(); + + JSONObject jsonResult = new JSONObject(); + jsonResult.put("course", + new CourseJsonSerializer(new CourseBaseJsonSerializer( + new WaypointJsonSerializer(new ControlPointJsonSerializer(new MarkJsonSerializer(), + new GateJsonSerializer(new MarkJsonSerializer()))))).serialize(updatedPublishedCourse)); + + return Response.ok(jsonResult.toJSONString()) + .header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } @POST From 3289d0568d5cbfb999228be3ab8694ab73863685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 20 Jul 2018 13:34:54 +0200 Subject: [PATCH 017/197] bug4508 fixed addMarkToRegatta call --- .../sailing/server/gateway/jaxrs/api/MarkRessource.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java index c7f371c8231..a4dda275d9c 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -40,7 +40,6 @@ import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.impl.ControlPointWithTwoMarksImpl; import com.sap.sailing.domain.base.impl.CourseDataImpl; import com.sap.sailing.domain.base.impl.CourseImpl; -import com.sap.sailing.domain.base.impl.MarkImpl; import com.sap.sailing.domain.common.CourseDesignerMode; import com.sap.sailing.domain.common.LeaderboardNameConstants; import com.sap.sailing.domain.common.NotFoundException; @@ -83,7 +82,7 @@ public class MarkRessource extends AbstractSailingServerResource { String markName = (String) requestObject.get("markName"); UUID markId = UUID.randomUUID(); - MarkImpl mark = new MarkImpl(markId, markName); + Mark mark = getService().getBaseDomainFactory().getOrCreateMark(markId, markName); String regattaName = (String) requestObject.get("regattaName"); RegattaLog regattaLog = getRegattaLogInternal(regattaName); RegattaLogDefineMarkEventImpl event = new RegattaLogDefineMarkEventImpl(MillisecondsTimePoint.now(), @@ -200,7 +199,6 @@ public class MarkRessource extends AbstractSailingServerResource { Course course = new CourseImpl(courseName, lastPublishedCourse.getWaypoints()); - try { course.update(controlPoints, getService().getBaseDomainFactory()); } catch (Exception e) { @@ -263,9 +261,8 @@ public class MarkRessource extends AbstractSailingServerResource { } return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } - - private Iterable filterCompetitorDuplicates( - Map competitorToBoatMappingsToRegister, + + private Iterable filterCompetitorDuplicates(Map competitorToBoatMappingsToRegister, Map competitorToBoatMappingsRegistered) { final Set competitorsToUnregister = new HashSet<>(); Util.addAll(competitorToBoatMappingsRegistered.keySet(), competitorsToUnregister); From 46dd886200ca85bbee7b85847893d7a1bb53a83c Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Fri, 20 Jul 2018 16:33:11 +0200 Subject: [PATCH 018/197] bug4134_2: A working version of colored windstreamlets according to minmax speed. --- .../SwarmMinMaxSpeedChangedListener.java | 5 + .../WindStreamletsRaceboardOverlay.java | 113 +++++++++++------- .../simulator/streamlets/SchmittTrigger.java | 38 ++++++ .../gwt/ui/simulator/streamlets/Swarm.java | 90 +++++++++++++- 4 files changed, 200 insertions(+), 46 deletions(-) create mode 100755 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/SwarmMinMaxSpeedChangedListener.java create mode 100755 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/SchmittTrigger.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/SwarmMinMaxSpeedChangedListener.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/SwarmMinMaxSpeedChangedListener.java new file mode 100755 index 00000000000..5bb53f1ffc6 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/SwarmMinMaxSpeedChangedListener.java @@ -0,0 +1,5 @@ +package com.sap.sailing.gwt.ui.shared.racemap; + +public interface SwarmMinMaxSpeedChangedListener { + void onSwarmMinMaxSpeedChanged(); +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java index 454418dda8f..059453c0a83 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java @@ -11,6 +11,7 @@ import com.google.gwt.canvas.dom.client.Context2d; import com.google.gwt.canvas.dom.client.TextMetrics; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.RepeatingCommand; +import com.google.gwt.i18n.client.NumberFormat; import com.google.gwt.maps.client.MapWidget; import com.google.gwt.maps.client.controls.ControlPosition; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -18,6 +19,7 @@ import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.gwt.ui.actions.GetWindInfoAction; +import com.sap.sailing.gwt.ui.client.NumberFormatterFactory; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; @@ -44,7 +46,7 @@ import com.sap.sse.gwt.client.player.Timer; * @author Axel Uhl (D043530) * */ -public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay { +public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay implements SwarmMinMaxSpeedChangedListener{ public static final String LOAD_WIND_STREAMLET_DATA_CATEGORY = "loadWindStreamletData"; private static final int animationIntervalMillis = 40; private static final long RESOLUTION_IN_MILLIS = 5000; @@ -66,6 +68,8 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay { private long latitudeCount; private double latitudeSum; + + private final NumberFormat numberFormatOneDecimal = NumberFormatterFactory.getDecimalFormat(1); public WindStreamletsRaceboardOverlay(MapWidget map, int zIndex, final Timer timer, RegattaAndRaceIdentifier raceIdentifier, SailingServiceAsync sailingService, @@ -130,45 +134,62 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay { streamletLegend.setCoordinateSpaceWidth(canvasWidth); streamletLegend.setCoordinateSpaceHeight(canvasHeight); } - private void drawLegend() { - double x, y; - x=100; - y=16; - double w = 1; - double h = 20; - int maxIdx = 300; - Context2d context2d = streamletLegend.getContext2d(); - context2d.setFillStyle("rgba(0,0,0,.3)"); - context2d.setLineWidth(1.0); - context2d.beginPath(); - context2d.fillRect(x-7.0, y-16.0, w*maxIdx+15.0, 56.0); - context2d.closePath(); - context2d.stroke(); - context2d.setFillStyle("white"); - String label = stringMessages.windSpeedInKnots(); - TextMetrics txtmet; - txtmet = context2d.measureText(label); - context2d.fillText(label, x + (w*maxIdx - txtmet.getWidth())/2.0, y - 5.0); - for(int idx=0; idx <= maxIdx; idx++) { - //double speed = idx * 24.0 / maxIdx; - double speed = 4.0 + idx * 16.0 / maxIdx; - context2d.setFillStyle(windField.getColor(speed)); - context2d.beginPath(); - context2d.fillRect(x + idx*w, y, w, h); - context2d.closePath(); - context2d.stroke(); - if (Math.abs(speed % 2.0) < (12.0/maxIdx)) { - context2d.setStrokeStyle("white"); + public void drawLegend() { + if (streamletLegend.isVisible()) { + streamletLegend.getContext2d().clearRect(0, 0, streamletLegend.getCoordinateSpaceWidth(), + streamletLegend.getCoordinateSpaceHeight()); + if (swarm != null && swarm.isColored()) { + final double x = 100; + final double y = 16; + final double w = 1; + final double h = 20; + final double speed_max = swarm.getMaxParticleSpeedInKnots(); + final double speed_min = swarm.getMinParticleSpeedInKnots(); + final double speed_spread = speed_max - speed_min; + final int scale_spread; + if (speed_spread < 0.5) { + scale_spread = 300; + } + else if (speed_spread < 1) { + scale_spread = 100; + } + else { + scale_spread = 50; + } + final int maxIdx = 300; + Context2d context2d = streamletLegend.getContext2d(); + context2d.setFillStyle("rgba(0,0,0,.3)"); context2d.setLineWidth(1.0); context2d.beginPath(); - context2d.moveTo(x + idx*w, y + h); - context2d.lineTo(x + idx*w, y + h + 7.0); + context2d.fillRect(x - 10.0, y - 16.0, w * maxIdx + 20.0, 56.0); context2d.closePath(); context2d.stroke(); context2d.setFillStyle("white"); - label = ""+Math.round(speed); + String label = stringMessages.windSpeedInKnots(); + TextMetrics txtmet; txtmet = context2d.measureText(label); - context2d.fillText(label, x + idx*w - txtmet.getWidth()/2.0, y + h + 8.0 + 8.0); + context2d.fillText(label, x + (w * maxIdx - txtmet.getWidth()) / 2.0, y - 5.0); + for (int idx = 0; idx <= maxIdx; idx++) { + final double speedSteps = speed_min + idx * (speed_max - speed_min) / maxIdx; + context2d.setFillStyle(swarm.getColorWithSpectrumBoundaries(speedSteps)); + context2d.beginPath(); + context2d.fillRect(x + idx * w, y, w, h); + context2d.closePath(); + context2d.stroke(); + if (idx % scale_spread == 0) { + context2d.setStrokeStyle("white"); + context2d.setLineWidth(1.0); + context2d.beginPath(); + context2d.moveTo(x + idx * w, y + h); + context2d.lineTo(x + idx * w, y + h + 7.0); + context2d.closePath(); + context2d.stroke(); + context2d.setFillStyle("white"); + label = numberFormatOneDecimal.format(speedSteps); + txtmet = context2d.measureText(label); + context2d.fillText(label, x + idx * w - txtmet.getWidth() / 2.0, y + h + 8.0 + 8.0); + } + } } } } @@ -180,7 +201,9 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay { this.swarm = new Swarm(this, map, timer, windField, new StreamletParameters()); } initCanvasOrigin(); + this.swarm.setColors(colored); this.swarm.start(animationIntervalMillis); + this.swarm.addSwarmMinMaxSpeedChangedListener(this); } private void scheduleWindDataRefresh() { @@ -203,8 +226,9 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay { } private void stopStreamlets() { - if (swarm != null) { + if (this.swarm != null) { this.swarm.stop(); + this.swarm.removeSwarmMinMaxSpeedChangedListener(this); } } @@ -298,13 +322,13 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay { public void setVisible(boolean isVisible) { if (getCanvas() != null) { if (isVisible) { - if (this.windField.getColors()) { - this.streamletLegend.setVisible(true); - } this.startStreamlets(); this.visible = isVisible; + if (this.swarm.isColored()) { + this.streamletLegend.setVisible(true); + } } else { - if (this.windField.getColors()) { + if (this.swarm.isColored()) { this.streamletLegend.setVisible(false); } this.stopStreamlets(); @@ -312,14 +336,15 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay { } } } - +private boolean colored; public void setColors(boolean isColored) { - this.windField.setColors(isColored); + this.colored = isColored; if ((isColored) && (firstColoring)) { firstColoring = false; - this.drawLegend(); } this.streamletLegend.setVisible(isColored); + if (swarm != null) { + swarm.setColors(isColored);} } @Override @@ -337,4 +362,8 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay { swarm.onBoundsChanged(zoomChanged, swarmPause); } } + + public void onSwarmMinMaxSpeedChanged() { + drawLegend(); + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/SchmittTrigger.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/SchmittTrigger.java new file mode 100755 index 00000000000..d6e2d158167 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/SchmittTrigger.java @@ -0,0 +1,38 @@ +package com.sap.sailing.gwt.ui.simulator.streamlets; + +public class SchmittTrigger { + private double percentage; + + public SchmittTrigger() {} + public SchmittTrigger(double percentageTriggerThreeshold) { + this.percentage = percentageTriggerThreeshold; + } + + public boolean isGreaterThanThreeshold(double input,double threesholdValue) { + if (input * (1 + percentage/100) > threesholdValue) { + return true; + } + else { + return false; + } + } + public boolean isLesserThanThreeshold(double input,double threesholdValue) { + if (input * (1 - percentage/100) < threesholdValue) { + return true; + } + else { + return false; + } + } + public boolean isValueChangeTriggered(double input, double threesholdValue) { + if (isGreaterThanThreeshold(input, threesholdValue) || isLesserThanThreeshold(input, threesholdValue)) { + return true; + } + else { + return false; + } + } + public double getTriggerPercentage() { + return percentage; + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java index 5278452dd46..47bea5ab3fa 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java @@ -1,6 +1,8 @@ package com.sap.sailing.gwt.ui.simulator.streamlets; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import com.google.gwt.canvas.client.Canvas; import com.google.gwt.canvas.dom.client.Context2d; @@ -13,6 +15,7 @@ import com.google.gwt.maps.client.events.bounds.BoundsChangeMapHandler; import com.google.gwt.user.client.Timer; import com.sap.sailing.gwt.ui.client.shared.racemap.BoundsUtil; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; +import com.sap.sailing.gwt.ui.shared.racemap.SwarmMinMaxSpeedChangedListener; import com.sap.sailing.gwt.ui.simulator.StreamletParameters; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; import com.sap.sse.gwt.client.player.TimeListener; @@ -74,6 +77,8 @@ public class Swarm implements TimeListener { timePoint = timer.getTime(); cosineOfAverageLatitude = 1.0; // default to equator diffPx = new Vector(0, 0); + swarmMinMaxSpeedChangedListeners = new HashSet<>(); + schmittTrigger = new SchmittTrigger(/*percent*/ 25); } public void start(final int animationIntervalMillis) { @@ -113,7 +118,9 @@ public class Swarm implements TimeListener { while (!done && attempts-- > 0) { particle = new Particle(); particle.currentPosition = getRandomPosition(); - if (field.inBounds(particle.currentPosition)) { + // Is the if check really needed? getRandomPosition() returns always a position that is within the + // visibleBoundsOfField. visibleBoundsOfField is always within fieldBounds. See updateBounds(). + if(field.inBounds(particle.currentPosition)) { Vector v = field.getVector(particle.currentPosition, timePoint); double weight = field.getParticleWeight(particle.currentPosition, v); if (weight >= Math.random()) { @@ -145,7 +152,6 @@ public class Swarm implements TimeListener { result = LatLng.newInstance(latDeg, lngDeg); return result; } - private Particle[] createParticles() { Particle[] newParticles = new Particle[nParticles]; for (int idx = 0; idx < newParticles.length; idx++) { @@ -234,7 +240,7 @@ public class Swarm implements TimeListener { } double particleSpeed = particle.v == null ? 0 : particle.v.length(); ctxt.setLineWidth(field.getLineWidth(particleSpeed)); - ctxt.setStrokeStyle(field.getColor(particleSpeed)); + ctxt.setStrokeStyle(getColorWithSpectrumBoundaries(particleSpeed)); ctxt.beginPath(); ctxt.moveTo(particle.previousPixelCoordinate.x, particle.previousPixelCoordinate.y); ctxt.lineTo(particle.currentPixelCoordinate.x, particle.currentPixelCoordinate.y); @@ -242,11 +248,61 @@ public class Swarm implements TimeListener { } } + private boolean colored = false; + public String getColorWithSpectrumBoundaries(double speed) { + if (colored) { + double h = (1 - (speed - minParticleSpeedInKnots)/(maxParticleSpeedInKnots - minParticleSpeedInKnots)) * 240; + return "hsl(" + Math.round(h) + ", 100%, 50%)"; + } else { + return "rgba(255,255,255," + Math.min(1.0, speed / 40) + ")"; + } + } + public void setColors(boolean isColored) { + this.colored = isColored; + } + + public boolean isColored() { + return colored; + } + + private double maxParticleSpeedInKnots = 0.0; + /** + * @return the maxParticleSpeedInKnots + */ + public double getMaxParticleSpeedInKnots() { + return maxParticleSpeedInKnots; + } + + /** + * @return the minParticleSpeedInKnots + */ + public double getMinParticleSpeedInKnots() { + return minParticleSpeedInKnots; + } + + private double minParticleSpeedInKnots = 120.0; + + private boolean isNotifyListeners = true; + + private void notifyListeners() { + if (isNotifyListeners) { + for (SwarmMinMaxSpeedChangedListener listener : swarmMinMaxSpeedChangedListeners) { + listener.onSwarmMinMaxSpeedChanged(); + } + } + } + + private final SchmittTrigger schmittTrigger; + /** * Moves each particle by its vector {@link Particle#v} multiplied by the speed which is 0.01 times the - * {@link VectorField#getMotionScale(int)} at the map's current zoom level. + * {@link VectorField#getMotionScale(int)} at the map's current zoom level. Also the max and min speed fields of the + * swarm get updated and the listeners get notified. */ private boolean execute(Vector diffPx) { + boolean isUpdateListeners = false; + double minSpeed = 120.0; + double maxSpeed = 0.0; double speed = field.getMotionScale(map.getZoom()); for (int idx = 0; idx < particles.length; idx++) { Particle particle = particles[idx]; @@ -268,6 +324,12 @@ public class Swarm implements TimeListener { particle.stepsToLive--; if ((particle.stepsToLive > 0) && (this.field.inBounds(particle.currentPosition))) { particle.v = field.getVector(particle.currentPosition, timePoint); + if (particle.v.length() > maxSpeed) { + maxSpeed = particle.v.length(); + } + if (particle.v.length() < minSpeed) { + minSpeed = particle.v.length(); + } } else { particle.v = null; } @@ -276,7 +338,17 @@ public class Swarm implements TimeListener { particles[idx] = this.createParticle(); } } + if (schmittTrigger.isValueChangeTriggered(maxSpeed, maxParticleSpeedInKnots)) { + maxParticleSpeedInKnots = maxSpeed; + isUpdateListeners = true; + } + if (schmittTrigger.isValueChangeTriggered(minSpeed, minParticleSpeedInKnots)) { + minParticleSpeedInKnots = minSpeed; + isUpdateListeners = true; + } + this.isNotifyListeners = isUpdateListeners; drawSwarm(); + notifyListeners(); return true; } @@ -288,4 +360,14 @@ public class Swarm implements TimeListener { public void timeChanged(Date newTime, Date oldTime) { timePoint = newTime; } + + private final Set swarmMinMaxSpeedChangedListeners; + public void addSwarmMinMaxSpeedChangedListener(SwarmMinMaxSpeedChangedListener listener) { + swarmMinMaxSpeedChangedListeners.add(listener); + } + public void removeSwarmMinMaxSpeedChangedListener(SwarmMinMaxSpeedChangedListener listener) { + swarmMinMaxSpeedChangedListeners.remove(listener); + } + + } From aecf28f9729e81ddf9c53a7d30e9cbb8e22b72af Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Fri, 20 Jul 2018 16:51:25 +0200 Subject: [PATCH 019/197] bug4134_2: Added spectrum spread for non-colored streamlets. --- .../com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java index 47bea5ab3fa..3233c6f51fa 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java @@ -254,7 +254,7 @@ public class Swarm implements TimeListener { double h = (1 - (speed - minParticleSpeedInKnots)/(maxParticleSpeedInKnots - minParticleSpeedInKnots)) * 240; return "hsl(" + Math.round(h) + ", 100%, 50%)"; } else { - return "rgba(255,255,255," + Math.min(1.0, speed / 40) + ")"; + return "rgba(255,255,255," + Math.min(1.0, (speed - minParticleSpeedInKnots)/(maxParticleSpeedInKnots - minParticleSpeedInKnots)) + ")"; } } public void setColors(boolean isColored) { @@ -346,7 +346,7 @@ public class Swarm implements TimeListener { minParticleSpeedInKnots = minSpeed; isUpdateListeners = true; } - this.isNotifyListeners = isUpdateListeners; + isNotifyListeners = isUpdateListeners; drawSwarm(); notifyListeners(); return true; From aa1d8cc793cf2eeaa425d365b8fae589b983dfb2 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Fri, 20 Jul 2018 17:56:46 +0200 Subject: [PATCH 020/197] bug4134_2: commentbug4134_2: commentss --- .../gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java | 1 + .../java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java | 1 + 2 files changed, 2 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java index 059453c0a83..5b51f21b779 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java @@ -157,6 +157,7 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay implemen scale_spread = 50; } final int maxIdx = 300; +// final colors[] = swarm.getColorsForSteps(maxIdx); Context2d context2d = streamletLegend.getContext2d(); context2d.setFillStyle("rgba(0,0,0,.3)"); context2d.setLineWidth(1.0); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java index 3233c6f51fa..e1e4729315c 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java @@ -368,6 +368,7 @@ public class Swarm implements TimeListener { public void removeSwarmMinMaxSpeedChangedListener(SwarmMinMaxSpeedChangedListener listener) { swarmMinMaxSpeedChangedListeners.remove(listener); } + } From b4379c00c2ea2552b4109eb63eae7ea1182b4b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 24 Jul 2018 16:22:07 +0200 Subject: [PATCH 021/197] bug4508 added denoteForTracking call, added error output for invalid regattaName in updateOrCreateSeries --- .../jaxrs/api/LeaderboardsResource.java | 25 ++++++++++ .../gateway/jaxrs/api/RegattasResource.java | 5 +- .../webservices/api/v1/index.html | 4 ++ .../v1/leaderboardRaceDenoteForTracking.html | 49 +++++++++++++++++++ 4 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceDenoteForTracking.html 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 e6fee705739..173dca94262 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 @@ -69,6 +69,7 @@ import com.sap.sailing.domain.common.CourseDesignerMode; import com.sap.sailing.domain.common.DeviceIdentifier; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.NotFoundException; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.SpeedWithBearing; @@ -82,6 +83,7 @@ import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.RaceColumnConstants; import com.sap.sailing.domain.common.racelog.RaceLogServletConstants; import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants; +import com.sap.sailing.domain.common.racelog.tracking.NotDenotableForRaceLogTrackingException; import com.sap.sailing.domain.common.racelog.tracking.NotDenotedForRaceLogTrackingException; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; import com.sap.sailing.domain.common.security.Permission; @@ -1242,4 +1244,27 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { } return response; } + + @GET + @Path("{leaderboardName}/denoteForTracking") + public Response denoteForTracking(@PathParam("leaderboardName") String leaderboardName, + @QueryParam("raceColumnName") String raceColumnName, @QueryParam("fleetName") String fleetName, + @QueryParam("raceName") String raceName) throws NotFoundException, NotDenotableForRaceLogTrackingException { + Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName); + if (leaderboard == null) { + throw new NotFoundException("leaderboard with name " + leaderboardName + " not found"); + } + RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName); + if (raceColumn == null) { + throw new NotFoundException("raceColumn with name " + raceColumnName + " not found"); + } + Fleet fleet = raceColumn.getFleetByName(fleetName); + if (fleet == null) { + throw new NotFoundException("fleet with name " + fleetName + " not found"); + } + + boolean result = getRaceLogTrackingAdapter().denoteRaceForRaceLogTracking(getService(), leaderboard, raceColumn, + fleet, raceName); + return (result ? Response.ok() : Response.notModified()).build(); + } } 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 3e1c115a664..baadce1cb46 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 @@ -1833,10 +1833,9 @@ public class RegattasResource extends AbstractSailingServerResource { isFleetsCanRunInParallel, resultDiscardingThresholds, startsWithZeroScore, firstColumnIsNonDiscardableCarryForward, hasSplitFleetContiguousScoring, maximumNumberOfDiscards, fleets)); + } else { + throw new IllegalStateException("RegattaName could not be resolved to regatta " + regattaName); } - - - return Response.ok().header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); } } diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html index f38a50d8dbf..aa6258bc3f4 100644 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html @@ -205,6 +205,10 @@ name to make sure you get to the event you're interested in. /api/v1/leaderboards/{name}/stoptracking Stops tracking for a race + + /api/v1/leaderboards/{name}/denoteForTracking + Denotes a race for tracking + /api/v1/leaderboards/{name}/marks/{id}/gps_fixes Pings the location of a mark via the RegattaLog diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceDenoteForTracking.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceDenoteForTracking.html new file mode 100644 index 00000000000..bfffdb316b7 --- /dev/null +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceDenoteForTracking.html @@ -0,0 +1,49 @@ + + + + + + + + SAP Sailing Analytics Webservices API Version 1.0 + + +

SAP Sailing Analytics Webservices API Version 1.0

+

URL: /api/v1/leaderboards/{leaderboardName}/denoteForTracking

+ +Description: +

This service will denote a race for tracking.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Webservice Type:REST
Output format:StatusCode
Mandatory parameters:raceColumnName
+ fleetName
+ raceName
+
Optional parameters:None
Request method:GET
Example:http://www.sapsailing.com/sailingserver/api/v1/leaderboards/test/denoteForTracking?raceColumnName=R1&fleetName=Default&raceName=R1
+
+Back to Web Service Overview + + From e4a76b9b40cd5bfe3a1dd1ac166896a2c649fbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 24 Jul 2018 16:41:27 +0200 Subject: [PATCH 022/197] bug4508 added security check for denoting of race rest call --- .../sailing/server/gateway/jaxrs/api/LeaderboardsResource.java | 1 + 1 file changed, 1 insertion(+) 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 173dca94262..44c55214037 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 @@ -1251,6 +1251,7 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { @QueryParam("raceColumnName") String raceColumnName, @QueryParam("fleetName") String fleetName, @QueryParam("raceName") String raceName) throws NotFoundException, NotDenotableForRaceLogTrackingException { Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName); + SecurityUtils.getSubject().checkPermission(Permission.MANAGE_TRACKED_RACES.getStringPermission(Mode.UPDATE)); if (leaderboard == null) { throw new NotFoundException("leaderboard with name " + leaderboardName + " not found"); } From 00de44d07b43523a1160a11b4998ed3d37b22c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Tue, 24 Jul 2018 17:18:52 +0200 Subject: [PATCH 023/197] bug4508 added endpoint to enable racelog based competitor registration --- .../jaxrs/api/LeaderboardsResource.java | 37 ++++++++++++++ .../webservices/api/v1/index.html | 4 ++ ...nableRaceLogForCompetitorRegistration.html | 49 +++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceEnableRaceLogForCompetitorRegistration.html 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 44c55214037..dc5b7590e10 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 @@ -45,6 +45,7 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEndOfTrackingEventImpl; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogStartOfTrackingEventImpl; +import com.sap.sailing.domain.abstractlog.race.tracking.impl.RaceLogUseCompetitorsFromRaceLogEventImpl; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogDeviceMappingEventImpl; import com.sap.sailing.domain.abstractlog.regatta.events.impl.RegattaLogCloseOpenEndedDeviceMappingEventImpl; @@ -64,6 +65,7 @@ import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.base.impl.AbstractRaceColumn; import com.sap.sailing.domain.base.impl.CourseImpl; import com.sap.sailing.domain.common.CourseDesignerMode; import com.sap.sailing.domain.common.DeviceIdentifier; @@ -1268,4 +1270,39 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { fleet, raceName); return (result ? Response.ok() : Response.notModified()).build(); } + + @GET + @Path("{leaderboardName}/enableRaceLogForCompetitorRegistration") + public Response enableRaceLogForCompetitorRegistration(@PathParam("leaderboardName") String leaderboardName, + @QueryParam("raceColumnName") String raceColumnName, @QueryParam("fleetName") String fleetName, + @QueryParam("raceName") String raceName) throws NotFoundException, NotDenotableForRaceLogTrackingException { + Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName); + SecurityUtils.getSubject().checkPermission(Permission.MANAGE_ALL_COMPETITORS.getStringPermission(Mode.UPDATE)); + if (leaderboard == null) { + throw new NotFoundException("leaderboard with name " + leaderboardName + " not found"); + } + RaceColumn raceColumn = leaderboard.getRaceColumnByName(raceColumnName); + if (raceColumn == null) { + throw new NotFoundException("raceColumn with name " + raceColumnName + " not found"); + } + Fleet fleet = raceColumn.getFleetByName(fleetName); + if (fleet == null) { + throw new NotFoundException("fleet with name " + fleetName + " not found"); + } + + final AbstractLogEventAuthor raceLogEventAuthorForRaceColumn = new LogEventAuthorImpl( + AbstractRaceColumn.class.getName(), 0); + + TimePoint now = MillisecondsTimePoint.now(); + RaceLog raceLog = raceColumn.getRaceLog(fleet); + if (raceLog == null) { + throw new IllegalStateException("Racelog for fleet is null"); + } + int passId = raceLog.getCurrentPassId(); + raceLog.add(new RaceLogUseCompetitorsFromRaceLogEventImpl(now, raceLogEventAuthorForRaceColumn, now, + UUID.randomUUID(), passId)); + return (raceColumn.isCompetitorRegistrationInRacelogEnabled(fleet) ? Response.ok() : Response.notModified()) + .build(); + } + } diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html index aa6258bc3f4..350f8e056d6 100644 --- a/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/index.html @@ -208,6 +208,10 @@ name to make sure you get to the event you're interested in. /api/v1/leaderboards/{name}/denoteForTracking Denotes a race for tracking + + + /api/v1/leaderboards/{name}/leaderboardRaceEnableRaceLogForCompetitorRegistration + Enables racelog useage for competitor registration /api/v1/leaderboards/{name}/marks/{id}/gps_fixes diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceEnableRaceLogForCompetitorRegistration.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceEnableRaceLogForCompetitorRegistration.html new file mode 100644 index 00000000000..f1d17ef8689 --- /dev/null +++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceEnableRaceLogForCompetitorRegistration.html @@ -0,0 +1,49 @@ + + + + + + + + SAP Sailing Analytics Webservices API Version 1.0 + + +

SAP Sailing Analytics Webservices API Version 1.0

+

URL: /api/v1/leaderboards/{leaderboardName}/enableRaceLogForCompetitorRegistration

+ +Description: +

This service will set a race to use racelog based competitor registrations

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Webservice Type:REST
Output format:StatusCode
Mandatory parameters:raceColumnName
+ fleetName
+ raceName
+
Optional parameters:None
Request method:GET
Example:https://sapsailing.com/sailingserver/api/v1/leaderboards/test/enableRaceLogForCompetitorRegistration?raceColumnName=R2&fleetName=Default&raceName=R2
+
+Back to Web Service Overview + + From 85bafb8fd8236d94caba83ee0b91a9494dc76e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 26 Jul 2018 09:03:14 +0200 Subject: [PATCH 024/197] bug4508 temorary deactivation of security for REST API --- .../gateway/jaxrs/api/EventsResource.java | 31 +++++++++++-------- .../jaxrs/api/LeaderboardsResource.java | 21 +++++++------ .../gateway/jaxrs/api/MarkRessource.java | 11 +++---- .../gateway/jaxrs/api/RegattasResource.java | 28 +++++++---------- .../gateway/jaxrs/api/WindResource.java | 5 +-- 5 files changed, 47 insertions(+), 49 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java index 2311a530738..cb17c54522a 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java @@ -38,7 +38,6 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.shiro.SecurityUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.osgi.framework.BundleContext; @@ -57,8 +56,6 @@ import com.sap.sailing.domain.common.dto.FleetDTO; import com.sap.sailing.domain.common.dto.RegattaCreationParametersDTO; import com.sap.sailing.domain.common.dto.SeriesCreationParametersDTO; import com.sap.sailing.domain.common.impl.DegreePosition; -import com.sap.sailing.domain.common.security.Permission; -import com.sap.sailing.domain.common.security.Permission.Mode; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.LeaderboardGroup; import com.sap.sailing.domain.leaderboard.RegattaLeaderboard; @@ -138,7 +135,7 @@ public class EventsResource extends AbstractSailingServerResource { @FormParam("canBoatsOfCompetitorsChangePerRace") boolean canBoatsOfCompetitorsChangePerRace) throws ParseException, NotFoundException, NumberFormatException, IOException, org.json.simple.parser.ParseException, InvalidDateException { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermission(Mode.CREATE)); + // SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermission(Mode.CREATE)); } final Response response; if (venueNameParam == null && (venueLat == null || venueLng == null)) { @@ -192,7 +189,7 @@ public class EventsResource extends AbstractSailingServerResource { @FormParam("numberofraces") String numberOfRacesParam) throws ParseException, NotFoundException, NumberFormatException, IOException, org.json.simple.parser.ParseException, InvalidDateException { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermission(Mode.CREATE)); + // SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermission(Mode.CREATE)); } final Response response; UUID id; @@ -437,7 +434,8 @@ public class EventsResource extends AbstractSailingServerResource { List overallLeaderboardDiscardThresholdsParam, String overallLeaderboardScoringSchemeTypeParam) throws NotFoundException { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD_GROUP.getStringPermissionForObjects(Mode.CREATE, leaderboardGroupName)); + // SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD_GROUP.getStringPermissionForObjects(Mode.CREATE, + // leaderboardGroupName)); } ScoringSchemeType overallLeaderboardScoringSchemeType = overallLeaderboardScoringSchemeTypeParam == null ? null : getScoringSchemeType(overallLeaderboardScoringSchemeTypeParam); @@ -476,7 +474,8 @@ public class EventsResource extends AbstractSailingServerResource { private void updateSeries(String regattaName, SeriesCreationParametersDTO defaultSeries) { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + // SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, + // regattaName)); } getService().apply(new UpdateSeries(new RegattaName(regattaName), "Default", "Default", defaultSeries.isMedal(), defaultSeries.isFleetsCanRunInParallel(), defaultSeries.getDiscardingThresholds(), @@ -498,7 +497,8 @@ public class EventsResource extends AbstractSailingServerResource { private RaceColumnInSeries addRaceColumn(String regattaName, String seriesName, String columnName) { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + // SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, + // regattaName)); } return getService().apply(new AddColumnToSeries(new RegattaName(regattaName), seriesName, columnName)); } @@ -508,7 +508,8 @@ public class EventsResource extends AbstractSailingServerResource { List leaderboardGroupIds, UUID eventId, Map sailorsInfoWebsiteURLs, Iterable images, Iterable videos) { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermissionForObjects(Mode.CREATE, eventName)); + // SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermissionForObjects(Mode.CREATE, + // eventName)); } return getService() .apply(new CreateEvent(eventName, eventDescription, startDate, endDate, venueName, isPublic, eventId, @@ -517,7 +518,8 @@ public class EventsResource extends AbstractSailingServerResource { private void updateEvent(Event event, LeaderboardGroup leaderboardGroup){ if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermissionForObjects(Mode.UPDATE, event.getId().toString())); + // SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermissionForObjects(Mode.UPDATE, + // event.getId().toString())); } List newLeaderboardGroupIds = new ArrayList<>(); StreamSupport.stream(event.getLeaderboardGroups().spliterator(), false) @@ -531,7 +533,8 @@ public class EventsResource extends AbstractSailingServerResource { private CourseArea addCourseArea(UUID eventId, String courseAreaName) { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermissionForObjects(Mode.UPDATE, eventId.toString())); + // SecurityUtils.getSubject().checkPermission(Permission.EVENT.getStringPermissionForObjects(Mode.UPDATE, + // eventId.toString())); } String[] courseAreaNames = new String[] { courseAreaName }; UUID[] courseAreaIds = new UUID[] { UUID.randomUUID() }; @@ -544,7 +547,8 @@ public class EventsResource extends AbstractSailingServerResource { RankingMetrics rankingMetric, UUID regattaId, RegattaCreationParametersDTO regattaCreationParametersDTO, int[] leaderboardDiscardThresholds, int numberOfRaces) { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.CREATE, regattaName)); + // SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.CREATE, + // regattaName)); } Regatta regatta = getService().apply(new AddSpecificRegatta(regattaName, boatClassName, canBoatsOfCompetitorsChangePerRace, startDate, endDate, regattaId, regattaCreationParametersDTO, /* isPersistent */ true, scoringScheme, courseAreaId, buoyZoneRadiusInHullLengths, @@ -598,7 +602,8 @@ public class EventsResource extends AbstractSailingServerResource { private RegattaLeaderboard createRegattaLeaderboard(String regattaName, int[] discardThresholds) { if (enforceSecurityChecks) { - SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.CREATE, regattaName)); + // SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.CREATE, + // regattaName)); } return getService() .apply(new CreateRegattaLeaderboard(new RegattaName(regattaName), regattaName, discardThresholds)); 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 dc5b7590e10..cbc64be3d7c 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 @@ -88,8 +88,6 @@ import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants; import com.sap.sailing.domain.common.racelog.tracking.NotDenotableForRaceLogTrackingException; import com.sap.sailing.domain.common.racelog.tracking.NotDenotedForRaceLogTrackingException; import com.sap.sailing.domain.common.scalablevalue.impl.ScalableBearing; -import com.sap.sailing.domain.common.security.Permission; -import com.sap.sailing.domain.common.security.Permission.Mode; import com.sap.sailing.domain.common.sharding.ShardingType; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; @@ -537,7 +535,8 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { @QueryParam("startoftrackingasmillis") Long startOfTrackingAsMillis, @QueryParam("endoftracking") String endOfTrackingAsISO, @QueryParam("endoftrackingasmillis") Long endOfTrackingAsMillis) throws InvalidDateException { - SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, leaderboardName)); + // SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, + // leaderboardName)); final LeaderboardAndRaceColumnAndFleetAndResponse leaderboardAndRaceColumnAndFleetAndResponse = getLeaderboardAndRaceColumnAndFleet(leaderboardName, raceColumnName, fleetName); final Response result; if (leaderboardAndRaceColumnAndFleetAndResponse.getFleet() != null) { @@ -570,7 +569,8 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { @QueryParam(RaceLogServletConstants.PARAMS_TRACK_WIND) Boolean trackWind, @QueryParam(RaceLogServletConstants.PARAMS_CORRECT_WIND_DIRECTION_BY_MAGNETIC_DECLINATION) Boolean correctWindDirectionByMagneticDeclination) throws NotDenotedForRaceLogTrackingException, Exception { - SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, leaderboardName)); + // SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, + // leaderboardName)); final LeaderboardAndRaceColumnAndFleetAndResponse leaderboardAndRaceColumnAndFleetAndResponse = getLeaderboardAndRaceColumnAndFleet(leaderboardName, raceColumnName, fleetName); final Response result; if (leaderboardAndRaceColumnAndFleetAndResponse.getFleet() != null) { @@ -637,7 +637,8 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { public Response setAutoCourse(@PathParam("leaderboardName") String leaderboardName, @QueryParam(RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME) String raceColumnName, @QueryParam(RaceLogServletConstants.PARAMS_RACE_FLEET_NAME) String fleetName) throws MalformedURLException, IOException, InterruptedException { - SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, leaderboardName)); + // SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, + // leaderboardName)); final LeaderboardAndRaceColumnAndFleetAndResponse leaderboardAndRaceColumnAndFleetAndResponse = getLeaderboardAndRaceColumnAndFleet(leaderboardName, raceColumnName, fleetName); final Response result; if (leaderboardAndRaceColumnAndFleetAndResponse.getFleet() != null) { @@ -851,7 +852,8 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { public Response stopTracking(@PathParam("leaderboardName") String leaderboardName, @QueryParam(RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME) String raceColumnName, @QueryParam(RaceLogServletConstants.PARAMS_RACE_FLEET_NAME) String fleetName) throws MalformedURLException, IOException, InterruptedException { - SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, leaderboardName)); + // SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, + // leaderboardName)); final Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName); final Response result; if (leaderboard == null) { @@ -1231,7 +1233,8 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { .entity("Could not find a leaderboard with name '" + StringEscapeUtils.escapeHtml(leaderboardName) + "'.") .type(MediaType.TEXT_PLAIN).build(); } else { - SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, leaderboard.getName())); + // SecurityUtils.getSubject().checkPermission(Permission.LEADERBOARD.getStringPermissionForObjects(Mode.UPDATE, + // leaderboard.getName())); final RaceColumn raceColumn; raceColumn = leaderboard.getRaceColumnByName(raceColumnName); if (raceColumn == null) { @@ -1253,7 +1256,7 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { @QueryParam("raceColumnName") String raceColumnName, @QueryParam("fleetName") String fleetName, @QueryParam("raceName") String raceName) throws NotFoundException, NotDenotableForRaceLogTrackingException { Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName); - SecurityUtils.getSubject().checkPermission(Permission.MANAGE_TRACKED_RACES.getStringPermission(Mode.UPDATE)); + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_TRACKED_RACES.getStringPermission(Mode.UPDATE)); if (leaderboard == null) { throw new NotFoundException("leaderboard with name " + leaderboardName + " not found"); } @@ -1277,7 +1280,7 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource { @QueryParam("raceColumnName") String raceColumnName, @QueryParam("fleetName") String fleetName, @QueryParam("raceName") String raceName) throws NotFoundException, NotDenotableForRaceLogTrackingException { Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName); - SecurityUtils.getSubject().checkPermission(Permission.MANAGE_ALL_COMPETITORS.getStringPermission(Mode.UPDATE)); + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_ALL_COMPETITORS.getStringPermission(Mode.UPDATE)); if (leaderboard == null) { throw new NotFoundException("leaderboard with name " + leaderboardName + " not found"); } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java index a4dda275d9c..1eafe3ddc3d 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/MarkRessource.java @@ -16,7 +16,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.shiro.SecurityUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; @@ -46,8 +45,6 @@ import com.sap.sailing.domain.common.NotFoundException; import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.racelog.tracking.CompetitorRegistrationOnRaceLogDisabledException; import com.sap.sailing.domain.common.racelog.tracking.DoesNotHaveRegattaLogException; -import com.sap.sailing.domain.common.security.Permission; -import com.sap.sailing.domain.common.security.Permission.Mode; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.leaderboard.Leaderboard; @@ -74,7 +71,7 @@ public class MarkRessource extends AbstractSailingServerResource { @Consumes(MediaType.APPLICATION_JSON) @Produces("application/json;charset=UTF-8") public Response addMarkToRegatta(String json) throws Exception { - SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); @@ -101,7 +98,7 @@ public class MarkRessource extends AbstractSailingServerResource { @Produces("application/json;charset=UTF-8") public Response addMarkFix(String json) throws DoesNotHaveRegattaLogException, ParseException, JsonDeserializationException { - SecurityUtils.getSubject().checkPermission(Permission.MANAGE_MARK_POSITIONS.getStringPermission(Mode.CREATE)); + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_MARK_POSITIONS.getStringPermission(Mode.CREATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); @@ -144,7 +141,7 @@ public class MarkRessource extends AbstractSailingServerResource { @Produces("application/json;charset=UTF-8") public Response addCourseDefinitionToRaceLog(String json) throws DoesNotHaveRegattaLogException, NotFoundException, ParseException, JsonDeserializationException { - SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); @@ -227,7 +224,7 @@ public class MarkRessource extends AbstractSailingServerResource { @Produces("application/json;charset=UTF-8") public Response addCompetitorToRace(String json) throws DoesNotHaveRegattaLogException, NotFoundException, ParseException, JsonDeserializationException, CompetitorRegistrationOnRaceLogDisabledException { - SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); + // SecurityUtils.getSubject().checkPermission(Permission.MANAGE_COURSE_LAYOUT.getStringPermission(Mode.CREATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); 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 baadce1cb46..71562317147 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 @@ -27,8 +27,6 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.subject.Subject; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; @@ -55,8 +53,6 @@ import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TargetTimeInfo; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.dto.FleetDTO; -import com.sap.sailing.domain.common.security.Permission; -import com.sap.sailing.domain.common.security.Permission.Mode; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.leaderboard.Leaderboard; @@ -304,8 +300,8 @@ public class RegattasResource extends AbstractSailingServerResource { @Path("{regattaname}/competitors/{competitorid}/add") public Response addCompetitor(@PathParam("regattaname") String regattaName, @PathParam("competitorid") String competitorIdAsString) { - final Subject subject = SecurityUtils.getSubject(); - subject.checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + // final Subject subject = SecurityUtils.getSubject(); + // subject.checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { @@ -340,8 +336,8 @@ public class RegattasResource extends AbstractSailingServerResource { @QueryParam("timeondistanceallowancepernauticalmileasmillis") Long timeOnDistanceAllowancePerNauticalMileAsMillis, @QueryParam("searchtag") String searchTag, @QueryParam("competitorName") String competitorName, @QueryParam("competitorEmail") String competitorEmail) { - final Subject subject = SecurityUtils.getSubject(); - subject.checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + // final Subject subject = SecurityUtils.getSubject(); + // subject.checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { @@ -393,8 +389,8 @@ public class RegattasResource extends AbstractSailingServerResource { @Path("{regattaname}/competitors/{competitorid}/remove") public Response removeCompetitor(@PathParam("regattaname") String regattaName, @PathParam("competitorid") String competitorIdAsString) { - final Subject subject = SecurityUtils.getSubject(); - subject.checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + // final Subject subject = SecurityUtils.getSubject(); + // subject.checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { @@ -1718,8 +1714,8 @@ public class RegattasResource extends AbstractSailingServerResource { @Path("{regattaname}/removeracecolumn") public Response addRaceColumns(@PathParam("regattaname") String regattaName, @QueryParam("racecolumn") String raceColumnName) { - SecurityUtils.getSubject() - .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + // SecurityUtils.getSubject() + // .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); final Response response; Regatta regatta = findRegattaByName(regattaName); if (regatta == null) { @@ -1764,8 +1760,8 @@ public class RegattasResource extends AbstractSailingServerResource { } private RaceColumnInSeries addRaceColumn(String regattaName, String seriesName, String columnName) { - SecurityUtils.getSubject() - .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); + // SecurityUtils.getSubject() + // .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); return getService().apply(new AddColumnToSeries(new RegattaName(regattaName), seriesName, columnName)); } @@ -1795,8 +1791,8 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = getService().getRegattaByName(regattaName); if (regatta != null) { - SecurityUtils.getSubject() - .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); + // SecurityUtils.getSubject() + // .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); String seriesName = (String) requestObject.get("seriesName"); String seriesNameNew = (String) requestObject.get("seriesNameNew"); boolean isMedal = (boolean) requestObject.get("isMedal"); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/WindResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/WindResource.java index 1a6a3c1c881..6e2b7bd3b43 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/WindResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/WindResource.java @@ -6,7 +6,6 @@ import javax.ws.rs.Path; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.shiro.SecurityUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.JSONValue; @@ -17,8 +16,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.WindSourceWithAdditionalID; -import com.sap.sailing.domain.common.security.Permission; -import com.sap.sailing.domain.common.security.Permission.Mode; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException; import com.sap.sailing.server.gateway.deserialization.JsonDeserializer; @@ -35,7 +32,7 @@ public class WindResource extends AbstractSailingServerResource { @Consumes(MediaType.APPLICATION_JSON) @Path("putWind") public Response putWind(String json) throws ParseException, JsonDeserializationException { - SecurityUtils.getSubject().checkPermission(Permission.TRACKED_RACE.getStringPermission(Mode.UPDATE)); + // SecurityUtils.getSubject().checkPermission(Permission.TRACKED_RACE.getStringPermission(Mode.UPDATE)); Object requestBody = JSONValue.parseWithException(json); JSONObject requestObject = Helpers.toJSONObjectSafe(requestBody); From 3d32ae84d47ff05045213820d597e3efe97a0a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 26 Jul 2018 10:34:25 +0200 Subject: [PATCH 025/197] bug4682 remove reachability filter, cleaned up some parts of code already- --- .../domain/common/media/MediaTrack.java | 2 + .../media/AbstractMediaSelectionControl.java | 6 -- .../client/media/MediaManagementControl.java | 63 +++++++------------ .../media/MediaPlayerManagerComponent.java | 31 +++++---- .../media/MediaSingleSelectionControl.java | 4 +- 5 files changed, 41 insertions(+), 65 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java index 98c2fc6d818..61be8a1efb8 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java @@ -45,6 +45,8 @@ public class MediaTrack implements Serializable { public TimePoint startTime; public Duration duration; public MimeType mimeType; + @Deprecated + // should not be used public Status status = Status.UNDEFINED; public Set assignedRaces; 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 4d28189124d..e030aa72fdd 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 @@ -1,6 +1,5 @@ package com.sap.sailing.gwt.ui.client.media; -import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.gwt.ui.client.StringMessages; public abstract class AbstractMediaSelectionControl implements MediaPlayerManager.PlayerChangeListener { @@ -14,11 +13,6 @@ public abstract class AbstractMediaSelectionControl implements MediaPlayerManage this.stringMessages = stringMessages; } - protected boolean isPotentiallyPlayable(MediaTrack mediaTrack) { - return MediaTrack.Status.REACHABLE.equals(mediaTrack.status) - || MediaTrack.Status.UNDEFINED.equals(mediaTrack.status); - } - @Override public void notifyStateChange() { updateUi(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java index 3fe4f80c1ec..948e6abf4f3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java @@ -29,7 +29,6 @@ import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sse.gwt.client.useragent.UserAgentDetails.AgentTypes; public class MediaManagementControl extends AbstractMediaSelectionControl implements CloseHandler { @@ -46,13 +45,13 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem } public void show() { - Collection reachableVideoTracks = new ArrayList<>(); - Collection reachableAudioTracks = new ArrayList<>(); - addAssignedMediaTracksTo(reachableVideoTracks, reachableAudioTracks); - addOverlappingMediaTracksTo(reachableVideoTracks, reachableAudioTracks); + Collection videoTracks = new ArrayList<>(); + Collection audioTracks = new ArrayList<>(); + addAssignedMediaTracksTo(videoTracks, audioTracks); + addOverlappingMediaTracksTo(videoTracks, audioTracks); Panel grid = new VerticalPanel(); - addAudioTracksToGridPanel(reachableAudioTracks, grid); - addVideoTracksToGridPanel(reachableVideoTracks, grid); + addVideoTracksToGridPanel(audioTracks, grid); + addVideoTracksToGridPanel(videoTracks, grid); addNewMediaButtonsTo(grid); dialogControl.add(grid); dialogControl.showRelativeTo(popupLocation); @@ -104,19 +103,12 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem private void addOverlappingMediaTracksTo(Collection reachableVideoTracks, Collection reachableAudioTracks) { for (MediaTrack mediaTrack : mediaPlayerManager.getOverlappingMediaTracks()) { - if (isPotentiallyPlayable(mediaTrack) && mediaTrack.mimeType != null) { + if (mediaTrack.mimeType != null) { switch (mediaTrack.mimeType.mediaType) { case video: reachableVideoTracks.add(mediaTrack); case audio: // intentional fall through - if (mediaPlayerManager.getUserAgent().getType().equals(AgentTypes.FIREFOX)) { - if (mediaTrack.isYoutube()) { - // only youtube audio tracks work with firefox - reachableAudioTracks.add(mediaTrack); - } - } else { - reachableAudioTracks.add(mediaTrack); - } + reachableAudioTracks.add(mediaTrack); case image: // no image media tracks produced by an image break; case unknown: // we won't overlay an unknown media source @@ -127,33 +119,24 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem } } } - + private void addAssignedMediaTracksTo(Collection reachableVideoTracks, Collection reachableAudioTracks) { for (MediaTrack mediaTrack : mediaPlayerManager.getAssignedMediaTracks()) { - if (isPotentiallyPlayable(mediaTrack)) { - if (mediaTrack.mimeType == null) { - reachableVideoTracks.add(mediaTrack); // allow user to remove this strange artifact - } else { - switch (mediaTrack.mimeType.mediaType) { - case video: - reachableVideoTracks.add(mediaTrack); - case audio: // intentional fall through - if (mediaPlayerManager.getUserAgent().getType().equals(AgentTypes.FIREFOX)) { - if (mediaTrack.isYoutube()) { - // only youtube audio tracks work with firefox - reachableAudioTracks.add(mediaTrack); - } - } else { - reachableAudioTracks.add(mediaTrack); - } - case image: // images don't play as video tracks - break; - case unknown: // unknown formats won't be played either - break; - default: - break; - } + if (mediaTrack.mimeType == null) { + reachableVideoTracks.add(mediaTrack); // allow user to remove this strange artifact + } else { + switch (mediaTrack.mimeType.mediaType) { + case video: + reachableVideoTracks.add(mediaTrack); + case audio: // intentional fall through + reachableAudioTracks.add(mediaTrack); + case image: // images don't play as video tracks + break; + case unknown: // unknown formats won't be played either + break; + default: + break; } } } 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 22bec345b83..d6ae2ca9216 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 @@ -10,11 +10,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.gwt.dom.client.AudioElement; +import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.MediaElement; +import com.google.gwt.dom.client.VideoElement; import com.google.gwt.event.logical.shared.CloseEvent; import com.google.gwt.event.logical.shared.CloseHandler; -import com.google.gwt.media.client.Audio; +import com.google.gwt.media.client.Video; import com.google.gwt.safehtml.shared.UriUtils; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.ClosingEvent; @@ -53,7 +54,6 @@ 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; import com.sap.sse.gwt.client.useragent.UserAgentDetails; -import com.sap.sse.gwt.client.useragent.UserAgentDetails.AgentTypes; import com.sap.sse.security.ui.client.UserService; import com.sap.sse.security.ui.shared.UserDTO; @@ -123,22 +123,19 @@ public class MediaPlayerManagerComponent extends AbstractComponent mediaTracks) { for (MediaTrack mediaTrack : mediaPlayerManager.getAssignedMediaTracks()) { - if (isPotentiallyPlayable(mediaTrack)) { - mediaTracks.add(mediaTrack); - } + mediaTracks.add(mediaTrack); } } From a9873c1726a5603855b11bbf05068d34325cc8fa Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 26 Jul 2018 12:55:10 +0200 Subject: [PATCH 026/197] Added a feedback from the PredefinedQueryRunner to the QueryDefinitionProvider to display the executed predefined query --- .../gwt/ui/server/DataMiningServiceImpl.java | 7 ++++ .../ui/client/DataMiningService.java | 2 ++ .../ui/client/DataMiningServiceAsync.java | 2 ++ .../developer/PredefinedQueryRunner.java | 35 +++++++++++++------ .../QueryDefinitionProviderWithControls.java | 2 +- 5 files changed, 36 insertions(+), 12 deletions(-) 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 0b7c5f6f27e..d0c6ef76c69 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 @@ -348,6 +348,13 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM } return predefinedQueryNames; } + + @Override + public StatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier) { + SecurityUtils.getSubject().checkPermission( + Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, identifier.getIdentifier())); + return getDataMiningServer().getPredefinedQueryDefinitionDTO(identifier); + } @Override public QueryResultDTO runPredefinedQuery(DataMiningSession session, diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index dcfbe1ef7ff..94042c62b44 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -52,6 +52,8 @@ public interface DataMiningService extends RemoteService { StatisticQueryDefinitionDTO queryDefinition); HashSet getPredefinedQueryIdentifiers(); + + StatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier); QueryResultDTO runPredefinedQuery(DataMiningSession session, PredefinedQueryIdentifier identifier, String localeInfoName); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 64ca3ff13a0..f156e632972 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -54,6 +54,8 @@ public interface DataMiningServiceAsync { StatisticQueryDefinitionDTO queryDefinition, AsyncCallback> callback); void getPredefinedQueryIdentifiers(AsyncCallback> callback); + + void getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier, AsyncCallback callback); void runPredefinedQuery(DataMiningSession session, PredefinedQueryIdentifier identifier, String localeInfoName, diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 9c3cb8247a0..9bbd34d70e4 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -7,7 +7,6 @@ import java.util.List; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.i18n.client.LocaleInfo; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.DialogBox; @@ -18,9 +17,11 @@ import com.google.gwt.user.client.ui.ValueListBox; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.Util; import com.sap.sse.datamining.shared.DataMiningSession; +import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; +import com.sap.sse.datamining.ui.client.QueryDefinitionProvider; import com.sap.sse.datamining.ui.client.ResultsPresenter; import com.sap.sse.datamining.ui.client.StringMessages; import com.sap.sse.gwt.client.ErrorReporter; @@ -36,6 +37,7 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; + private final QueryDefinitionProvider queryDefinitionProvider; private final ResultsPresenter resultsPresenter; private final Button showDialogButton; @@ -46,12 +48,13 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { public PredefinedQueryRunner(Component parent, ComponentContext context, DataMiningSession session, StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, - ResultsPresenter resultsPresenter) { + QueryDefinitionProvider queryDefinitionProvider, ResultsPresenter resultsPresenter) { super(parent, context); this.session = session; this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; + this.queryDefinitionProvider = queryDefinitionProvider; this.resultsPresenter = resultsPresenter; showDialogButton = new Button(stringMessages.runPredefinedQuery(), new ClickHandler() { @@ -141,19 +144,29 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { protected void runSelectedPredefinedQuery() { PredefinedQueryIdentifier predefinedQueryIdentifier = selectionListBox.getValue(); resultsPresenter.showBusyIndicator(); - dataMiningService.runPredefinedQuery(session, predefinedQueryIdentifier, - LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback>() { + dataMiningService.getPredefinedQueryDefinition(predefinedQueryIdentifier, new AsyncCallback() { + @Override + public void onSuccess(StatisticQueryDefinitionDTO queryDefinition) { + queryDefinitionProvider.applyQueryDefinition(queryDefinition); + dataMiningService.runQuery(session, queryDefinition, new AsyncCallback>() { @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error running the query: " + caught.getMessage()); - resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); - } - - @Override - public void onSuccess(QueryResultDTO result) { + public void onSuccess(QueryResultDTO result) { resultsPresenter.showResult(result); } + @Override + public void onFailure(Throwable error) { + errorReporter.reportError("Error running the query: " + error.getMessage()); + resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); + } }); + } + @Override + public void onFailure(Throwable error) { + errorReporter.reportError("Error running the query: " + error.getMessage()); + resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); + + } + }); dialogBox.hide(); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 57e88513dc1..80e4b2b5226 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -105,7 +105,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition queryDefinitionViewer.setActive(false); addQueryDefinitionChangedListener(queryDefinitionViewer); predefinedQueryRunner = new PredefinedQueryRunner(parent, context, session, getDataMiningStringMessages(), - dataMiningService, errorReporter, resultsPresenter); + dataMiningService, errorReporter, this, resultsPresenter); Button clearSelectionButton = new Button(getDataMiningStringMessages().clearSelection()); clearSelectionButton.addClickHandler(new ClickHandler() { From 9081d98dcc261937b42c9a327e95c3123cd96fbd Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 26 Jul 2018 12:57:02 +0200 Subject: [PATCH 027/197] Fixed equals of DataRetrieverLevelDTO. Display name of the retrieved data type is not considered anymore --- .../datamining/SailingPredefinedQueries.java | 71 ++++++++++--------- .../impl/dto/DataRetrieverLevelDTO.java | 4 +- 2 files changed, 38 insertions(+), 37 deletions(-) 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 0675fdd84f0..56e74b625bd 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 @@ -21,6 +21,7 @@ import com.sap.sailing.datamining.impl.data.LeaderboardGroupWithContext; 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.data.AverageWithStats; 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; @@ -58,15 +59,15 @@ public class SailingPredefinedQueries { private StatisticQueryDefinitionDTO create_AvgSpeed_Per_Regatta_Race() { FunctionDTO statistic = new FunctionDTO(false, "getGPSFix().getSpeed().getKnots()", HasGPSFixContext.class.getName(), double.class.getName(), new ArrayList(), "", 0); - AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), Number.class.getName(), ""); + AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), AverageWithStats.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), "Leaderboard Group"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), "Leaderboard"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), "Race"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), "Leg"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), "Leg of competitor"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(5, GPSFixRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasGPSFixContext.class.getName(), "GPS-Fix"), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(5, GPSFixRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasGPSFixContext.class.getName(), ""), null)); DataRetrieverChainDefinitionDTO retrieverChain = new DataRetrieverChainDefinitionDTO("", RacingEventService.class.getName(), retrieverLevels); ModifiableStatisticQueryDefinitionDTO queryDefinition = new ModifiableStatisticQueryDefinitionDTO("default", statistic, aggregator, retrieverChain); @@ -82,15 +83,15 @@ public class SailingPredefinedQueries { private StatisticQueryDefinitionDTO create_AvgSpeed_Per_Competitor_LegType() { FunctionDTO statistic = new FunctionDTO(false, "getGPSFix().getSpeed().getKnots()", HasGPSFixContext.class.getName(), double.class.getName(), new ArrayList(), "", 0); - AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), Number.class.getName(), ""); + AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), AverageWithStats.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), "Leaderboard Group"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), "Leaderboard"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), "Race"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), "Leg"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), "Leg of competitor"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(5, GPSFixRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasGPSFixContext.class.getName(), "GPS-Fix"), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(5, GPSFixRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasGPSFixContext.class.getName(), ""), null)); DataRetrieverChainDefinitionDTO retrieverChain = new DataRetrieverChainDefinitionDTO("", RacingEventService.class.getName(), retrieverLevels); ModifiableStatisticQueryDefinitionDTO queryDefinition = new ModifiableStatisticQueryDefinitionDTO("default", statistic, aggregator, retrieverChain); @@ -109,11 +110,11 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Sum", Distance.class.getName(), Distance.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), "Leaderboard Group"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), "Leaderboard"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), "Race"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), "Leg"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), "Leg of competitor"), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), ""), null)); DataRetrieverChainDefinitionDTO retrieverChain = new DataRetrieverChainDefinitionDTO("", RacingEventService.class.getName(), retrieverLevels); ModifiableStatisticQueryDefinitionDTO queryDefinition = new ModifiableStatisticQueryDefinitionDTO("default", statistic, aggregator, retrieverChain); @@ -129,15 +130,15 @@ public class SailingPredefinedQueries { private StatisticQueryDefinitionDTO create_AvgSpeed_Per_Competitor() { FunctionDTO statistic = new FunctionDTO(false, "getGPSFix().getSpeed().getKnots()", HasGPSFixContext.class.getName(), double.class.getName(), new ArrayList(), "", 0); - AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), Number.class.getName(), ""); + AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), AverageWithStats.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), "Leaderboard Group"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), "Leaderboard"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), "Race"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), "Leg"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), "Leg of competitor"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(5, GPSFixRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasGPSFixContext.class.getName(), "GPS-Fix"), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(5, GPSFixRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasGPSFixContext.class.getName(), ""), null)); DataRetrieverChainDefinitionDTO retrieverChain = new DataRetrieverChainDefinitionDTO("", RacingEventService.class.getName(), retrieverLevels); ModifiableStatisticQueryDefinitionDTO queryDefinition = new ModifiableStatisticQueryDefinitionDTO("default", statistic, aggregator, retrieverChain); @@ -153,11 +154,11 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Sum", Distance.class.getName(), Distance.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), "Leaderboard Group"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), "Leaderboard"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), "Race"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), "Leg"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), "Leg of competitor"), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(4, TrackedLegOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegOfCompetitorContext.class.getName(), ""), null)); DataRetrieverChainDefinitionDTO retrieverChain = new DataRetrieverChainDefinitionDTO("", RacingEventService.class.getName(), retrieverLevels); ModifiableStatisticQueryDefinitionDTO queryDefinition = new ModifiableStatisticQueryDefinitionDTO("default", statistic, aggregator, retrieverChain); @@ -173,10 +174,10 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Sum", Number.class.getName(), Number.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), "Leaderboard Group"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), "Leaderboard"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), "Race"), null)); - retrieverLevels.add(new DataRetrieverLevelDTO(3, RaceOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasRaceOfCompetitorContext.class.getName(), "Competitor"), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(3, RaceOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasRaceOfCompetitorContext.class.getName(), ""), null)); DataRetrieverChainDefinitionDTO retrieverChain = new DataRetrieverChainDefinitionDTO("", RacingEventService.class.getName(), retrieverLevels); ModifiableStatisticQueryDefinitionDTO queryDefinition = new ModifiableStatisticQueryDefinitionDTO("default", statistic, aggregator, retrieverChain); diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverLevelDTO.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverLevelDTO.java index f007fc20a94..3d991d89b58 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverLevelDTO.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverLevelDTO.java @@ -60,7 +60,7 @@ public class DataRetrieverLevelDTO implements Serializable, Comparable Date: Thu, 26 Jul 2018 12:57:59 +0200 Subject: [PATCH 028/197] Preliminary implementation to apply a query definition to SuggestBoxStatisticProvider --- .../SuggestBoxStatisticProvider.java | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index db03c0749f6..5081ddf5239 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -80,6 +80,9 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent availableExtractionFunctions; private final ExtractionFunctionSuggestBox extractionFunctionSuggestBox; private final ValueListBox aggregatorListBox; + private final List availableAggregators; + + private AggregationProcessorDefinitionDTO aggregatorToSelect; public SuggestBoxStatisticProvider(Component parent, ComponentContext componentContext, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, @@ -129,6 +132,7 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent(); aggregatorListBox = createAggregatorListBox(); aggregatorListBox.addStyleName(STATISTIC_PROVIDER_ELEMENT_STYLE); mainPanel.add(aggregatorListBox); @@ -177,7 +181,7 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent>() { - @Override - public void onSuccess(HashSet aggregators) { - List aggregatorsList = new ArrayList<>(aggregators); - Collections.sort(aggregatorsList); - updateListBox(aggregatorListBox, aggregatorsList); + dataMiningService.getAggregatorDefinitionsFor(extractionFunction, LocaleInfo.getCurrentLocale().getLocaleName(), + new AsyncCallback>() { + @Override + public void onSuccess(HashSet aggregators) { + availableAggregators.addAll(aggregators); + Collections.sort(availableAggregators); + updateListBox(aggregatorListBox, availableAggregators); + + if (aggregatorToSelect != null && availableAggregators.contains(aggregatorToSelect)) { + aggregatorListBox.setValue(aggregatorToSelect, true); + aggregatorToSelect = null; } + } - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the aggregators for the extraction function'" - + extractionFunction + "': " + caught.getMessage()); - } - }); + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError("Error fetching the aggregators for the extraction function'" + + extractionFunction + "': " + caught.getMessage()); + } + }); } } @@ -388,9 +397,18 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent Date: Thu, 26 Jul 2018 18:27:42 +0200 Subject: [PATCH 029/197] Fixed the predefined queries again --- .../datamining/SailingPredefinedQueries.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 56e74b625bd..bed1eff971d 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 @@ -6,6 +6,7 @@ import java.util.Map; import com.sap.sailing.datamining.data.HasGPSFixContext; import com.sap.sailing.datamining.data.HasLeaderboardContext; +import com.sap.sailing.datamining.data.HasLeaderboardGroupContext; import com.sap.sailing.datamining.data.HasRaceOfCompetitorContext; import com.sap.sailing.datamining.data.HasTrackedLegContext; import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; @@ -17,7 +18,6 @@ import com.sap.sailing.datamining.impl.components.RaceOfCompetitorRetrievalProce import com.sap.sailing.datamining.impl.components.TrackedLegOfCompetitorRetrievalProcessor; 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.LegType; import com.sap.sailing.server.RacingEventService; import com.sap.sse.common.Distance; @@ -62,7 +62,7 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), AverageWithStats.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardGroupContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); @@ -86,7 +86,7 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), AverageWithStats.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardGroupContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); @@ -110,7 +110,7 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Sum", Distance.class.getName(), Distance.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardGroupContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); @@ -133,7 +133,7 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Average", Number.class.getName(), AverageWithStats.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardGroupContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); @@ -154,7 +154,7 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Sum", Distance.class.getName(), Distance.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardGroupContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(3, TrackedLegRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedLegContext.class.getName(), ""), null)); @@ -174,7 +174,7 @@ public class SailingPredefinedQueries { AggregationProcessorDefinitionDTO aggregator = new AggregationProcessorDefinitionDTO("Sum", Number.class.getName(), Number.class.getName(), ""); ArrayList retrieverLevels = new ArrayList<>(); - retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(LeaderboardGroupWithContext.class.getName(), ""), null)); + retrieverLevels.add(new DataRetrieverLevelDTO(0, LeaderboardGroupRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardGroupContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(1, LeaderboardRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasLeaderboardContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(2, TrackedRaceRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasTrackedRaceContext.class.getName(), ""), null)); retrieverLevels.add(new DataRetrieverLevelDTO(3, RaceOfCompetitorRetrievalProcessor.class.getName(), new LocalizedTypeDTO(HasRaceOfCompetitorContext.class.getName(), ""), null)); From 7dd81eaea593a7ae8259aa34dc8b316acd0d0426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 26 Jul 2018 18:47:33 +0200 Subject: [PATCH 030/197] bug4682 massive cleanup of mediatrack related handling --- .../domain/common/media/MediaTrack.java | 2 +- .../partials/videoplayer/VideoPlayer.java | 4 +- .../gwt/ui/client/media/AudioHtmlPlayer.java | 19 --- .../client/media/MediaManagementControl.java | 160 +++++++----------- .../media/MediaPlayerManagerComponent.java | 108 +++++------- .../gwt/ui/client/media/VideoJSPlayer.java | 134 +++++++++------ .../gwt/ui/client/media/VideoJSPlayer.ui.xml | 3 +- .../client/media/popup/VideoPopupWindow.java | 12 +- 8 files changed, 198 insertions(+), 244 deletions(-) delete mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AudioHtmlPlayer.java diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java index 61be8a1efb8..9da7c3e3f14 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java @@ -25,6 +25,7 @@ public class MediaTrack implements Serializable { private static final long serialVersionUID = 1L; + @Deprecated public enum Status { UNDEFINED('?'), CANNOT_PLAY('-'), NOT_REACHABLE('#'), REACHABLE('+'); @@ -155,5 +156,4 @@ public class MediaTrack implements Serializable { return false; } } - } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/videoplayer/VideoPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/videoplayer/VideoPlayer.java index ec9b0bfe920..434d387eaec 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/videoplayer/VideoPlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/videoplayer/VideoPlayer.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.home.shared.partials.videoplayer; -import com.google.gwt.dom.client.VideoElement; +import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Composite; @@ -73,7 +73,7 @@ public class VideoPlayer extends Composite { videoJSPlayer.setVideo(video.getMimeType(), video.getSourceRef()); } - public VideoElement getVideoElement() { + public Element getVideoElement() { return videoJSPlayer.getVideoElement(); } public boolean isFullscreen() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AudioHtmlPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AudioHtmlPlayer.java deleted file mode 100644 index 62fdd87e7fb..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AudioHtmlPlayer.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.sap.sailing.gwt.ui.client.media; - -import com.google.gwt.media.client.Audio; -import com.google.gwt.media.client.MediaBase; -import com.sap.sailing.domain.common.media.MediaTrack; -import com.sap.sailing.gwt.ui.client.media.shared.AudioPlayer; - -public class AudioHtmlPlayer extends AbstractHtmlMediaPlayer implements AudioPlayer { - - public AudioHtmlPlayer(MediaTrack mediaTrack) { - super(mediaTrack); - } - - @Override - protected MediaBase createMediaElement() { - return Audio.createIfSupported(); - } - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java index 948e6abf4f3..7d7686508f4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java @@ -16,7 +16,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.DialogBox; -import com.google.gwt.user.client.ui.FocusWidget; import com.google.gwt.user.client.ui.HasHorizontalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; @@ -47,10 +46,10 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem public void show() { Collection videoTracks = new ArrayList<>(); Collection audioTracks = new ArrayList<>(); - addAssignedMediaTracksTo(videoTracks, audioTracks); - addOverlappingMediaTracksTo(videoTracks, audioTracks); + filterGivenMediaTracksTo(videoTracks, audioTracks, mediaPlayerManager.getAssignedMediaTracks()); + filterGivenMediaTracksTo(videoTracks, audioTracks, mediaPlayerManager.getOverlappingMediaTracks()); Panel grid = new VerticalPanel(); - addVideoTracksToGridPanel(audioTracks, grid); + addAudioTracksToGridPanel(audioTracks, grid); addVideoTracksToGridPanel(videoTracks, grid); addNewMediaButtonsTo(grid); dialogControl.add(grid); @@ -81,59 +80,41 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem grid.add(controlButtons); } - private void addVideoTracksToGridPanel(Collection reachableVideoTracks, Panel grid) { - if (!reachableVideoTracks.isEmpty()) { - grid.add(createVideoHeader()); - for (MediaTrack videoTrack : reachableVideoTracks) { + private void addVideoTracksToGridPanel(Collection videoTracks, Panel grid) { + if (!videoTracks.isEmpty()) { + grid.add(new Label(stringMessages.videos())); + for (MediaTrack videoTrack : videoTracks) { grid.add(createVideoOptions(videoTrack, mediaPlayerManager.getPlayingVideoTracks())); } } } - private void addAudioTracksToGridPanel(Collection reachableAudioTracks, Panel grid) { - if (!reachableAudioTracks.isEmpty()) { - grid.add(createAudioHeader()); - grid.add((RadioButton) createAudioButton(null, mediaPlayerManager.getPlayingAudioTrack())); - for (MediaTrack audioTrack : reachableAudioTracks) { + private void addAudioTracksToGridPanel(Collection audioTracks, Panel grid) { + if (!audioTracks.isEmpty()) { + // TODO + grid.add(new Label("i18n Audio Tracks")); + grid.add(createAudioButton(null, mediaPlayerManager.getPlayingAudioTrack())); + for (MediaTrack audioTrack : audioTracks) { grid.add(createAudioButton(audioTrack, mediaPlayerManager.getPlayingAudioTrack())); } } } - private void addOverlappingMediaTracksTo(Collection reachableVideoTracks, - Collection reachableAudioTracks) { - for (MediaTrack mediaTrack : mediaPlayerManager.getOverlappingMediaTracks()) { - if (mediaTrack.mimeType != null) { - switch (mediaTrack.mimeType.mediaType) { - case video: - reachableVideoTracks.add(mediaTrack); - case audio: // intentional fall through - reachableAudioTracks.add(mediaTrack); - case image: // no image media tracks produced by an image - break; - case unknown: // we won't overlay an unknown media source - break; - default: - break; - } - } - } - } - - private void addAssignedMediaTracksTo(Collection reachableVideoTracks, - Collection reachableAudioTracks) { - for (MediaTrack mediaTrack : mediaPlayerManager.getAssignedMediaTracks()) { + private void filterGivenMediaTracksTo(Collection videoTracks, + Collection audioTracks, Iterable source) { + for (MediaTrack mediaTrack : source) { if (mediaTrack.mimeType == null) { - reachableVideoTracks.add(mediaTrack); // allow user to remove this strange artifact + videoTracks.add(mediaTrack); // allow user to remove this strange artifact } else { switch (mediaTrack.mimeType.mediaType) { case video: - reachableVideoTracks.add(mediaTrack); - case audio: // intentional fall through - reachableAudioTracks.add(mediaTrack); - case image: // images don't play as video tracks + videoTracks.add(mediaTrack); break; - case unknown: // unknown formats won't be played either + case audio: + audioTracks.add(mediaTrack); + break; + case image: + case unknown: break; default: break; @@ -143,12 +124,26 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem } private Widget createVideoOptions(final MediaTrack videoTrack, Set selectedVideos) { - CheckBox playCheckBox = createPlayCheckBox(videoTrack, selectedVideos); + CheckBox videoCheckBox = new CheckBox(videoTrack.title); + videoCheckBoxes.put(videoTrack, videoCheckBox); + videoCheckBox.setTitle(videoTrack.toString()); + videoCheckBox.setValue(selectedVideos.contains(videoTrack)); + videoCheckBox.addValueChangeHandler(new ValueChangeHandler() { + + @Override + public void onValueChange(ValueChangeEvent changeEvent) { + if (changeEvent.getValue()) { + mediaPlayerManager.playFloatingVideo(videoTrack); + } else { + mediaPlayerManager.closeFloatingVideo(videoTrack); + } + } + }); if (mediaPlayerManager.allowsEditing()) { HorizontalPanel panel = new HorizontalPanel(); panel.setWidth("100%"); - panel.add(playCheckBox); + panel.add(videoCheckBox); Button deleteButton = createDeleteButton(videoTrack); panel.add(deleteButton); @@ -157,10 +152,10 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem panel.add(connectButton); panel.setCellHorizontalAlignment(connectButton, HasHorizontalAlignment.ALIGN_RIGHT); panel.setCellWidth(connectButton, "13"); - setEnableOfVideoTrack(connectButton, connectButton.getValue()); + setVideoPlayCheckboxEnabled(videoTrack, connectButton.getValue()); return panel; } else { - return playCheckBox; + return videoCheckBox; } } @@ -184,16 +179,9 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem return connectButton; } - private void setEnableOfVideoTrack(ToggleButton connectButton, boolean enable) { - Panel videoTrack = (HorizontalPanel)connectButton.getParent(); - for (Widget widget : videoTrack) { - if(widget != connectButton && widget instanceof FocusWidget){ - ((FocusWidget)widget).setEnabled(enable); - if(widget instanceof CheckBox){ - ((CheckBox)widget).setValue(false); - } - } - } + private void setVideoPlayCheckboxEnabled(MediaTrack videoTrack, boolean enable) { + CheckBox videoCheckBox = videoCheckBoxes.get(videoTrack); + videoCheckBox.setEnabled(enable); } private void disconnectVideoFromRace(final MediaTrack videoTrack, final ToggleButton connectButton) { @@ -207,7 +195,7 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem @Override public void onSuccess(Void allMediaTracks) { - setEnableOfVideoTrack(connectButton, false); + setVideoPlayCheckboxEnabled(videoTrack, false); mediaPlayerManager.closeFloatingVideo(videoTrack); } }); @@ -225,7 +213,7 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem @Override public void onSuccess(Void allMediaTracks) { - setEnableOfVideoTrack(connectButton, true); + setVideoPlayCheckboxEnabled(videoTrack, true); } }); } @@ -242,44 +230,6 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem return deleteButton; } - private CheckBox createPlayCheckBox(final MediaTrack videoTrack, Set selectedVideos) { - CheckBox videoCheckBox = new CheckBox(videoTrack.title); - videoCheckBoxes.put(videoTrack, videoCheckBox); - videoCheckBox.setTitle(videoTrack.toString()); - videoCheckBox.setValue(selectedVideos.contains(videoTrack)); - videoCheckBox.addValueChangeHandler(new ValueChangeHandler() { - - @Override - public void onValueChange(ValueChangeEvent changeEvent) { - if (changeEvent.getValue()) { - mediaPlayerManager.playFloatingVideo(videoTrack); - } else { - mediaPlayerManager.closeFloatingVideo(videoTrack); - } - } - }); - return videoCheckBox; - } - - public void selectVideo(MediaTrack videoTrack) { - CheckBox videoCheckBox = videoCheckBoxes.get(videoTrack); - if (videoCheckBox != null) { - videoCheckBox.setValue(true); - } - } - - public void unselectVideo(MediaTrack videoTrack) { - CheckBox videoCheckBox = videoCheckBoxes.get(videoTrack); - if (videoCheckBox != null) { - videoCheckBox.setValue(false); - } - } - - private Widget createVideoHeader() { - Label audioHeader = new Label("Videos"); - return audioHeader; - } - private Widget createAudioButton(final MediaTrack audioTrack, MediaTrack selectedAudioTrack) { String label = audioTrack != null ? audioTrack.title : "Sound off"; String title = audioTrack != null ? audioTrack.toString() : "Turn off all sound channels."; @@ -287,7 +237,6 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem audioButton.setTitle(title); audioButton.setValue(audioTrack == selectedAudioTrack); audioButton.addValueChangeHandler(new ValueChangeHandler() { - @Override public void onValueChange(ValueChangeEvent changeEvent) { if (changeEvent.getValue()) { @@ -295,12 +244,19 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem } } }); - return audioButton; - } - private Widget createAudioHeader() { - Label audioHeader = new Label("Audio Tracks"); - return audioHeader; + if (mediaPlayerManager.allowsEditing() && audioTrack != null) { + HorizontalPanel panel = new HorizontalPanel(); + panel.setWidth("100%"); + panel.add(audioButton); + + Button deleteButton = createDeleteButton(audioTrack); + panel.add(deleteButton); + panel.setCellHorizontalAlignment(deleteButton, HasHorizontalAlignment.ALIGN_RIGHT); + return panel; + } else { + return audioButton; + } } @Override 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 d6ae2ca9216..88d0ba2d4e6 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 @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.MediaElement; import com.google.gwt.dom.client.VideoElement; import com.google.gwt.event.logical.shared.CloseEvent; @@ -25,7 +24,6 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.media.MediaTrack; -import com.sap.sailing.domain.common.media.MediaTrack.Status; import com.sap.sailing.domain.common.security.Permission; import com.sap.sailing.domain.common.security.SailingPermissionsForRoleProvider; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; @@ -73,6 +71,7 @@ public class MediaPlayerManagerComponent extends AbstractComponent activeVideoContainers = new HashMap(); private Collection assignedMediaTracks = new ArrayList<>(); private Collection overlappingMediaTracks = new ArrayList<>(); + private Map mediaTrackStatus = new HashMap<>(); private final RegattaAndRaceIdentifier raceIdentifier; private final RaceTimesInfoProvider raceTimesInfoProvider; @@ -87,6 +86,23 @@ public class MediaPlayerManagerComponent extends AbstractComponent playerChangeListener = new ArrayList<>(); + public enum Status { + UNDEFINED('?'), + CANNOT_PLAY('-'), + NOT_REACHABLE('#'), + REACHABLE('+'); + + private final char symbol; + + private Status(char symbol) { + this.symbol = symbol; + } + + public String toString() { + return String.valueOf(this.symbol); + } + } + public MediaPlayerManagerComponent(Component parent, ComponentContext context, MediaPlayerLifecycle mediaPlayerLifecycle, RegattaAndRaceIdentifier selectedRaceIdentifier, @@ -116,13 +132,15 @@ public class MediaPlayerManagerComponent extends AbstractComponent Youtube videos can't be played for audio-only. - // So add a video player first. - playFloatingVideo(audioTrack); - } + playFloatingVideo(audioTrack); VideoContainer playingVideoContainer = activeVideoContainers.get(audioTrack); - if (playingVideoContainer != null) { - VideoPlayer playingVideoPlayer = playingVideoContainer.getVideoPlayer(); - activeAudioPlayer = playingVideoPlayer; - activeAudioPlayer.setMuted(false); - } else { - assignNewAudioPlayer(audioTrack); - } + activeAudioPlayer = playingVideoContainer.getVideoPlayer(); + activeAudioPlayer.setMuted(false); notifyStateChange(); } else { // nothing changed @@ -405,14 +410,7 @@ public class MediaPlayerManagerComponent extends AbstractComponent then reset active audio player - - if (activeVideoContainers.containsKey(activeAudioPlayer.getMediaTrack())) { // pre-change audioPlayer is one - // of the - // videoPlayers - activeAudioPlayer.setMuted(true); - } else { // pre-change audioPlayer is a dedicated audio-only player - activeAudioPlayer.shutDown(); - } + activeAudioPlayer.shutDown(); activeAudioPlayer = null; notifyStateChange(); } else { @@ -484,6 +482,7 @@ public class MediaPlayerManagerComponent extends AbstractComponenttrue if the player is running in full screen mode, false otherwise */ public native boolean isFullscreen() /*-{ - if(this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { + if (this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { return false; } - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.isFullscreen(); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player + .isFullscreen(); }-*/; /** @@ -203,10 +225,11 @@ public class VideoJSPlayer extends Widget implements RequiresResize { * @return true if the player is paused, false if it is playing */ public native boolean paused() /*-{ - if(this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { + if (this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { return true; } - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.paused(); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player + .paused(); }-*/; private void onPlay() { @@ -225,58 +248,66 @@ public class VideoJSPlayer extends Widget implements RequiresResize { native void _onLoad(boolean autoplay, boolean withPanorama, String messageThreeSixty) /*-{ var that = this; var elemid = this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::elementId; - - var player = $wnd.videojs( - elemid, - { - "playsInline" : true, - "customControlsOnMobile" : true - }).ready(function() { - this.on('play', function() { - that.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::onPlay()(); - }); - this.on('pause', function() { - that.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::onPause()(); - }); - - console.log("play: " + autoplay); - if (autoplay) { - this.play(); - } - }); - if(withPanorama){ - player.panorama({ - showNotice:true, - autoMobileOrientation: true, - clickAndDrag: true, - clickToToggle: false, - NoticeMessage: messageThreeSixty, - backToVerticalCenter: false, - backToHorizonCenter: false, + + var player = $wnd + .videojs(elemid, { + "playsInline" : true, + "customControlsOnMobile" : true + }) + .ready( + function() { + this + .on( + 'play', + function() { + that.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::onPlay()(); + }); + this + .on( + 'pause', + function() { + that.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::onPause()(); + }); + + console.log("play: " + autoplay); + if (autoplay) { + this.play(); + } + }); + if (withPanorama) { + player.panorama({ + showNotice : true, + autoMobileOrientation : true, + clickAndDrag : true, + clickToToggle : false, + NoticeMessage : messageThreeSixty, + backToVerticalCenter : false, + backToHorizonCenter : false, }); } - + this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player = player; }-*/; private native void disposeNative() /*-{ - var player = this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player; - player.dispose(); + var player = this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player; + player.dispose(); }-*/; private native void handleResize() /*-{ var player = this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player; var canvas = player.getChild('Canvas'); - if(canvas){ + if (canvas) { canvas.handleResize(); } }-*/; public native void pause() /*-{ - if(this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { + if (this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { return; } - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.pause(); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player + .pause(); }-*/; public int getVideoWidth() { @@ -302,7 +333,8 @@ public class VideoJSPlayer extends Widget implements RequiresResize { } private native void setVolumeNative(float volume) /*-{ - this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.volume(volume); + this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player + .volume(volume); }-*/; public void setPlaybackRate(double newPlaySpeedFactor) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.ui.xml index 1e32751182c..9d0222a4ac9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSPlayer.ui.xml @@ -15,7 +15,6 @@ transform: rotate(180deg) translateX(50%) translateZ(0) !important; } -
- +
\ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/VideoPopupWindow.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/VideoPopupWindow.java index dadb217de4e..cdfe634674c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/VideoPopupWindow.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/VideoPopupWindow.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.ui.client.media.popup; -import com.google.gwt.dom.client.VideoElement; +import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ContextMenuEvent; import com.google.gwt.event.dom.client.ContextMenuHandler; import com.google.gwt.user.client.Window; @@ -39,12 +39,12 @@ public class VideoPopupWindow extends AbstractPopupWindow implements ContextMenu - native void initPlay(VideoElement videoElement) /*-{ + native void initPlay(Element videoElement) /*-{ var that = this; - var deferredPlayState = $wnd.deferredPlayState - if (deferredPlayState && !$wnd.videoPlayer) { - that.@com.sap.sailing.gwt.ui.client.media.popup.VideoPopupWindow::initPlayState(DZDZ)(deferredPlayState.deferredMediaTime, deferredPlayState.deferredIsMuted, deferredPlayState.deferredPlaybackSpeed, deferredPlayState.deferredIsPlaying); - } + var deferredPlayState = $wnd.deferredPlayState + if (deferredPlayState && !$wnd.videoPlayer) { + that.@com.sap.sailing.gwt.ui.client.media.popup.VideoPopupWindow::initPlayState(DZDZ)(deferredPlayState.deferredMediaTime, deferredPlayState.deferredIsMuted, deferredPlayState.deferredPlaybackSpeed, deferredPlayState.deferredIsPlaying); + } }-*/; public void loadedmetadata() { From 8d3e38104dc2c6a561a984d48140e8871b15baf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 26 Jul 2018 19:03:34 +0200 Subject: [PATCH 031/197] bug4682 added missing i18n in management panel --- .../java/com/sap/sailing/gwt/ui/client/StringMessages.java | 2 ++ .../com/sap/sailing/gwt/ui/client/StringMessages.properties | 3 ++- .../sailing/gwt/ui/client/media/MediaManagementControl.java | 3 +-- 3 files changed, 5 insertions(+), 3 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 cc7951e05cc..a9ba4565f4b 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 @@ -2093,4 +2093,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String manage2SailEventIdBoxTooltip(); String manage2SailPort(); String windFinderSpotCollectionsList(); + + String audioFiles(); } 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 8dd85fc710c..8c59924ffca 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 @@ -2086,4 +2086,5 @@ gender=Gender manage2SailEventIdBox=Manage2Sail Event ID manage2SailEventURLBox=Manage2Sail EventURL (json) manage2SailEventIdBoxTooltip=Event ID or a URL that contains the event ID from Manage2Sail -manage2SailPort=Port \ No newline at end of file +manage2SailPort=Port +audioFiles=Audio tracks \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java index 7d7686508f4..c43a58dc228 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java @@ -91,8 +91,7 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem private void addAudioTracksToGridPanel(Collection audioTracks, Panel grid) { if (!audioTracks.isEmpty()) { - // TODO - grid.add(new Label("i18n Audio Tracks")); + grid.add(new Label(stringMessages.audioFiles())); grid.add(createAudioButton(null, mediaPlayerManager.getPlayingAudioTrack())); for (MediaTrack audioTrack : audioTracks) { grid.add(createAudioButton(audioTrack, mediaPlayerManager.getPlayingAudioTrack())); From cfcb307803ddbfbe4b735aaacde3047b7f11712e Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 26 Jul 2018 19:50:00 +0200 Subject: [PATCH 032/197] Fixed typo in SailingPredefinedQueries --- .../com/sap/sailing/datamining/SailingPredefinedQueries.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bed1eff971d..18e4e6c63d2 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 @@ -51,7 +51,7 @@ public class SailingPredefinedQueries { create_AvgSpeed_Per_Competitor()); predefinedQueries.put(new PredefinedQueryIdentifier(QUERY_DISTANCE_TRAVELED_PER_COMPETITOR_LEGTYPE, "Distance traveled grouped by competitor/team name and leg type"), create_SumTraveledDistance_Per_Competitor_LegType()); - predefinedQueries.put(new PredefinedQueryIdentifier(QUERY_DISTANCE_TRAVELED_PER_COMPETITOR, "Distance traveled grouped by competitor/team name and leg type"), + predefinedQueries.put(new PredefinedQueryIdentifier(QUERY_DISTANCE_TRAVELED_PER_COMPETITOR, "Distance traveled grouped by competitor/team name"), create_SumTraveledDistance_Per_Competitor()); predefinedQueries.put(new PredefinedQueryIdentifier(QUERY_MANEUVERS_PER_COMPETITOR, "Maneuvers grouped by competitor/team name"), create_SumManeuvers_Per_Competitor()); From 9ed1f6c842ab090f8bf294f34b1500b7d3c6a599 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 26 Jul 2018 19:51:56 +0200 Subject: [PATCH 033/197] Removed the display names of the retriever levels in the QueryDefinitionParser --- .../datamining/ui/client/developer/QueryDefinitionParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 078a23db696..6f30790c397 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -134,7 +134,7 @@ public class QueryDefinitionParser { builder.appendText(arrayListClassName + "<" + retrieverLevelClassName + "> " + retrieverLevelsVariable + " = new " + arrayListClassName + "<>();").appendLineBreak(); for (DataRetrieverLevelDTO retrieverLevel : retrieverChain.getRetrieverLevels()) { LocalizedTypeDTO retrievedType = retrieverLevel.getRetrievedDataType(); - String retrievedTypeAsCode = "new " + localizedTypeClassName + "(" + typeStrategy.toCode(retrievedType.getTypeName()) + ", " + literal(retrievedType.getDisplayName()) + ")"; + String retrievedTypeAsCode = "new " + localizedTypeClassName + "(" + typeStrategy.toCode(retrievedType.getTypeName()) + ", \"\")"; String retrieverSettingsAsCode = "null"; // TODO Handle the retriever level settings builder.appendText(retrieverLevelsVariable + ".add(new " + retrieverLevelClassName + "(" + retrieverLevel.getLevel() + ", " + From c7d298ada5ea783b39dbae409a7dc22add74d223 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 26 Jul 2018 19:53:21 +0200 Subject: [PATCH 034/197] Preleminary implementation to apply a query definition to MultiDimensionalGroupingProvider --- .../MultiDimensionalGroupingProvider.java | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 68bb72469a8..a3026434d4d 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -58,8 +58,10 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen private final List> dimensionToGroupByBoxes; private boolean isAwaitingReload; + private boolean isUpdating; private DataRetrieverChainDefinitionDTO currentRetrieverChainDefinition; private final List availableDimensions; + private Iterable dimensionsToSelect; public MultiDimensionalGroupingProvider(Component parent, ComponentContext context, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, @@ -114,6 +116,7 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen private void updateAvailableDimensions() { if (currentRetrieverChainDefinition != null) { + isUpdating = true; dataMiningService.getDimensionsFor(currentRetrieverChainDefinition, LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback>() { @Override @@ -126,16 +129,21 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen addDimensionToGroupByBoxAndUpdateAcceptableValues(firstDimensionToGroupByBox); if (!availableDimensions.isEmpty()) { Collections.sort(availableDimensions, DimensionComparator); - firstDimensionToGroupByBox.setValue(availableDimensions.iterator().next(), true); + if (dimensionsToSelect != null) { + setSelectedDimensions(dimensionsToSelect); + } else { + firstDimensionToGroupByBox.setValue(availableDimensions.iterator().next(), true); + } + dimensionsToSelect = null; } else { notifyListeners(); } + isUpdating = false; } - @Override public void onFailure(Throwable caught) { - errorReporter.reportError( - "Error fetching the dimensions from the server: " + caught.getMessage()); + errorReporter.reportError("Error fetching the dimensions from the server: " + caught.getMessage()); + isUpdating = false; } }); } else { @@ -254,10 +262,22 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen @Override public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { - int index = 0; - for (FunctionDTO dimension : queryDefinition.getDimensionsToGroupBy()) { - dimensionToGroupByBoxes.get(index).setValue(dimension, true); - index++; + DataRetrieverChainDefinitionDTO newRetrieverChain = queryDefinition.getDataRetrieverChainDefinition(); + if (!isAwaitingReload && !isUpdating && currentRetrieverChainDefinition.equals(newRetrieverChain)) { + setSelectedDimensions(queryDefinition.getDimensionsToGroupBy()); + } else { + dimensionsToSelect = queryDefinition.getDimensionsToGroupBy(); + } + } + + private void setSelectedDimensions(Iterable dimensions) { + int boxIndex = 0; + for (FunctionDTO dimension : dimensions) { + int index = availableDimensions.indexOf(dimension); + if (index != -1) { + dimensionToGroupByBoxes.get(boxIndex).setValue(availableDimensions.get(index), true); + boxIndex++; + } } } From e149c2061bf2b94eba12c3ad8104079940027df4 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 27 Jul 2018 16:36:40 +0200 Subject: [PATCH 035/197] Added interface for composite data mining result presenters fixing bug 3269 --- .../ui/datamining/DataMiningEntryPoint.java | 9 +- .../ui/client/CompositeResultsPresenter.java | 48 ++++ .../ui/client/ResultsPresenter.java | 13 +- .../client/ResultsPresenterWithControls.java | 8 - .../client/execution/SimpleQueryRunner.java | 33 ++- .../AbstractResultsPresenter.java | 5 +- .../presentation/TabbedResultsPresenter.java | 222 ++++++++++-------- 7 files changed, 204 insertions(+), 134 deletions(-) create mode 100644 java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java delete mode 100644 java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java 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 acb5b07e0b8..c8f69f925e1 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 @@ -19,11 +19,11 @@ import com.sap.sailing.gwt.ui.datamining.presentation.TabbedSailingResultsPresen import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.impl.UUIDDataMiningSession; import com.sap.sse.datamining.ui.client.AnchorDataMiningSettingsControl; +import com.sap.sse.datamining.ui.client.CompositeResultsPresenter; 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; @@ -40,11 +40,8 @@ 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(); @@ -64,6 +61,8 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { authorizedContentDecorator.setPermissionToCheck(Permission.DATA_MINING, SailingPermissionsForRoleProvider.INSTANCE); authorizedContentDecorator.setContentWidgetFactory(new WidgetFactory() { + + private QueryDefinitionProviderWithControls queryDefinitionProviderWithControls; private SimpleQueryRunner queryRunner; private final DataMiningSettingsInfoManager settingsManager = new DataMiningSettingsInfoManagerImpl( getStringMessages()); @@ -71,7 +70,7 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { @Override public Widget get() { DataMiningSettingsControl settingsControl = new AnchorDataMiningSettingsControl(null, null); - ResultsPresenter resultsPresenter = new TabbedSailingResultsPresenter(/*parent*/ null, /*context*/ null, + CompositeResultsPresenter resultsPresenter = new TabbedSailingResultsPresenter(/*parent*/ null, /*context*/ null, /*drillDownCallback*/ groupKey -> queryDefinitionProviderWithControls.drillDown(groupKey, queryRunner::runQuery), getStringMessages()); DockLayoutPanel selectionDockPanel = new DockLayoutPanel(Unit.PX); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java new file mode 100644 index 00000000000..1dd4f553d5a --- /dev/null +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java @@ -0,0 +1,48 @@ +package com.sap.sse.datamining.ui.client; + +import com.sap.sse.common.settings.Settings; +import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; + +/** + * Interface for a result presenter composing multiple inner result presenters. + * + * @author Lennart Hensler + */ +public interface CompositeResultsPresenter extends ResultsPresenter { + + /** + * @return The identifier for the currently active presenter + */ + String getCurrentPresenterId(); + + /** + * @return All ids of the currently contained presenters + */ + Iterable getPresenterIds(); + + void showResult(String presenterId, QueryResultDTO result); + void showError(String presenterId, String error); + void showError(String presenterId, String mainError, Iterable detailedErrors); + void showBusyIndicator(String presenterId); + + @Override + default void showResult(QueryResultDTO result) { + showResult(getCurrentPresenterId(), result); + } + + @Override + default void showError(String error) { + showError(getCurrentPresenterId(), error); + } + + @Override + default void showError(String mainError, Iterable detailedErrors) { + showError(getCurrentPresenterId(), mainError, detailedErrors); + } + + @Override + default void showBusyIndicator() { + showBusyIndicator(getCurrentPresenterId()); + } + +} \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 8fdde3f5af2..dad6ec8766d 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -6,14 +6,11 @@ import com.sap.sse.gwt.client.shared.components.Component; public interface ResultsPresenter extends Component { - public QueryResultDTO getCurrentResult(); + QueryResultDTO getCurrentResult(); - public void showResult(QueryResultDTO result); - - public void showError(String error); - - public void showError(String mainError, Iterable detailedErrors); - - public void showBusyIndicator(); + void showResult(QueryResultDTO result); + void showError(String error); + void showError(String mainError, Iterable detailedErrors); + void showBusyIndicator(); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 deleted file mode 100644 index dfc2ae967b9..00000000000 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.sap.sse.datamining.ui.client; - -import com.sap.sse.common.settings.Settings; - -public interface ResultsPresenterWithControls - extends ResultsPresenter, WithControls { - -} diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index a2c4f64a0e0..d19c727235e 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -11,12 +11,12 @@ 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.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.CompositeResultsPresenter; 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; @@ -48,12 +48,12 @@ public class SimpleQueryRunner extends AbstractDataMiningComponent queryDefinitionProvider; - private final ResultsPresenter resultsPresenter; + private final CompositeResultsPresenter resultsPresenter; private final Button runButton; public SimpleQueryRunner(Component parent, ComponentContext context, DataMiningSession session, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, - QueryDefinitionProvider queryDefinitionProvider, ResultsPresenter resultsPresenter) { + QueryDefinitionProvider queryDefinitionProvider, CompositeResultsPresenter resultsPresenter) { super(parent, context); this.session = session; this.dataMiningService = dataMiningService; @@ -91,24 +91,23 @@ public class SimpleQueryRunner extends AbstractDataMiningComponent errorMessages = queryDefinitionProvider.validateQueryDefinition(queryDefinition); + String presenterId = resultsPresenter.getCurrentPresenterId(); if (errorMessages == null || !errorMessages.iterator().hasNext()) { counter.increase(); - resultsPresenter.showBusyIndicator(); + resultsPresenter.showBusyIndicator(presenterId); dataMiningService.runQuery(session, queryDefinition, new ManagedDataMiningQueryCallback(counter) { - @Override - protected void handleFailure(Throwable caught) { - errorReporter.reportError("Error running the query: " + caught.getMessage()); - resultsPresenter - .showError(getDataMiningStringMessages().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(presenterId, getDataMiningStringMessages().errorRunningDataMiningQuery() + "."); + } + @Override + protected void handleSuccess(QueryResultDTO result) { + resultsPresenter.showResult(presenterId, result); + } + }); } else { - resultsPresenter.showError(getDataMiningStringMessages().queryNotValidBecause(), errorMessages); + resultsPresenter.showError(presenterId, getDataMiningStringMessages().queryNotValidBecause(), errorMessages); } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 5e354433def..1766669310c 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -14,12 +14,13 @@ 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.client.AbstractDataMiningComponent; -import com.sap.sse.datamining.ui.client.ResultsPresenterWithControls; +import com.sap.sse.datamining.ui.client.ResultsPresenter; +import com.sap.sse.datamining.ui.client.WithControls; import com.sap.sse.gwt.client.shared.components.Component; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public abstract class AbstractResultsPresenter - extends AbstractDataMiningComponent implements ResultsPresenterWithControls { + extends AbstractDataMiningComponent implements ResultsPresenter, WithControls { private enum ResultsPresenterState { BUSY, ERROR, RESULT diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java index bc6bbc13d2c..e2034bc7749 100755 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java @@ -1,7 +1,11 @@ package com.sap.sse.datamining.ui.client.presentation; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; import com.google.gwt.core.shared.GWT; import com.google.gwt.dom.client.Style.Unit; @@ -16,6 +20,7 @@ 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.client.AbstractDataMiningComponent; +import com.sap.sse.datamining.ui.client.CompositeResultsPresenter; import com.sap.sse.datamining.ui.client.ResultsPresenter; import com.sap.sse.datamining.ui.client.presentation.ResultsChart.DrillDownCallback; import com.sap.sse.datamining.ui.client.resources.DataMiningResources; @@ -25,22 +30,25 @@ import com.sap.sse.gwt.client.shared.controls.ScrolledTabLayoutPanel; import com.sap.sse.gwt.client.shared.settings.ComponentContext; public class TabbedResultsPresenter extends AbstractDataMiningComponent - implements ResultsPresenter { + implements CompositeResultsPresenter { protected static final DataMiningResources resources = GWT.create(DataMiningResources.class); + private static final String IdPrefix = "Tab"; + + private final AtomicInteger idCounter; protected final ScrolledTabLayoutPanel tabPanel; - protected final Map> presentersMappedByHeader; + protected final Map tabsMappedById; protected final DrillDownCallback drillDownCallback; protected final Map> registeredResultPresenterMap; - public TabbedResultsPresenter(Component parent, ComponentContext context, - DrillDownCallback drillDownCallback) { + public TabbedResultsPresenter(Component parent, ComponentContext context, DrillDownCallback drillDownCallback) { super(parent, context); - this.drillDownCallback = drillDownCallback; + idCounter = new AtomicInteger(); tabPanel = new ScrolledTabLayoutPanel(30, Unit.PX, resources.arrowLeftIcon(), resources.arrowRightIcon()); tabPanel.setAnimationDuration(0); - presentersMappedByHeader = new HashMap<>(); + tabsMappedById = new HashMap<>(); registeredResultPresenterMap = new HashMap<>(); + this.drillDownCallback = drillDownCallback; addNewTabTab(); addTabAndFocus(new MultiResultsPresenter(this, context, drillDownCallback)); @@ -65,40 +73,102 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent detailedErrors) { - getSelectedHeader().setText(getDataMiningStringMessages().error()); - getSelectedPresenter().showError(mainError, detailedErrors); - } - - @Override - public void showBusyIndicator() { - getSelectedHeader().setText(getDataMiningStringMessages().runningQuery()); - getSelectedPresenter().showBusyIndicator(); - } - @Override public QueryResultDTO getCurrentResult() { - return getSelectedPresenter().getCurrentResult(); + return getSelectedTab().getPresenter().getCurrentResult(); } - protected CloseableTabHeader getSelectedHeader() { - return (CloseableTabHeader) tabPanel.getTabWidget(tabPanel.getSelectedIndex()); + @Override + public String getCurrentPresenterId() { + return getSelectedTab().getId(); } - protected ResultsPresenter getSelectedPresenter() { - return presentersMappedByHeader.get(getSelectedHeader()); + @Override + public Iterable getPresenterIds() { + Set idSet = new HashSet<>(tabsMappedById.keySet()); + return Collections.unmodifiableSet(idSet); + } + + @Override + public void showResult(String presenterId, QueryResultDTO result) { + try { + if (result != null) { + CloseablePresenterTab oldTab = getTab(presenterId); + if (registeredResultPresenterMap.containsKey(result.getResultType())) { + addTabAndFocus(registeredResultPresenterMap.get(result.getResultType())); + removeTab(oldTab); + } else { + if (!(oldTab.getPresenter() instanceof MultiResultsPresenter)) { + addTabAndFocus(new MultiResultsPresenter(this, getComponentContext(), drillDownCallback)); + removeTab(oldTab); + } + } + getTab(presenterId).setText(result.getResultSignifier()); + } + + } finally { + getTab(presenterId).getPresenter().showResult(result); + } + } + + @Override + public void showError(String presenterId, String error) { + CloseablePresenterTab tab = getTab(presenterId); + tab.setText(getDataMiningStringMessages().error()); + tab.getPresenter().showError(error); + } + + @Override + public void showError(String presenterId, String mainError, Iterable detailedErrors) { + CloseablePresenterTab tab = getTab(presenterId); + tab.setText(getDataMiningStringMessages().error()); + tab.getPresenter().showError(mainError, detailedErrors); + } + + @Override + public void showBusyIndicator(String presenterId) { + CloseablePresenterTab tab = getTab(presenterId); + tab.setText(getDataMiningStringMessages().runningQuery()); + tab.getPresenter().showBusyIndicator(); + } + + /** + * 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. + * @param resultPresenter + * which shall be used to handle the datamaining query result. + * + * @throws IllegalStateException + * if the {@link resultType} is already registered. + */ + public void registerResultsPresenter(Class resultType, ResultsPresenter resultPresenter) + throws IllegalStateException { + String className = resultType.getName(); + if (!registeredResultPresenterMap.containsKey(className)) { + registeredResultPresenterMap.put(className, resultPresenter); + } else { + throw new IllegalStateException( + "Multiple registration for result type key: " + resultType.toString() + "not allowed."); + } + } + + protected CloseablePresenterTab getSelectedTab() { + return (CloseablePresenterTab) tabPanel.getTabWidget(tabPanel.getSelectedIndex()); + } + + protected CloseablePresenterTab getTab(String id) { + return tabsMappedById.get(id); } protected void addTabAndFocus(ResultsPresenter tabPresenter) { - CloseableTabHeader tabHeader = new CloseableTabHeader(); - presentersMappedByHeader.put(tabHeader, tabPresenter); + String tabId = IdPrefix + idCounter.getAndIncrement(); + CloseablePresenterTab tabHeader = new CloseablePresenterTab(tabId, tabPresenter); + tabsMappedById.put(tabId, tabHeader); tabPanel.insert(tabPresenter.getEntryWidget(), tabHeader, tabPanel.getWidgetCount() - 1); int presenterIndex = tabPanel.getWidgetIndex(tabPresenter.getEntryWidget()); @@ -106,9 +176,9 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent presenter; - public CloseableTabHeader() { + public CloseablePresenterTab(String id, ResultsPresenter presenter) { + this.id = id; + this.presenter = presenter; this.addStyleName("resultsPresenterTabHeader"); - label = new Label(getDataMiningStringMessages().empty()); - this.add(label); + headerLabel = new Label(getDataMiningStringMessages().empty()); + this.add(headerLabel); Image closeImage = new Image(resources.closeIcon()); closeImage.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { if (tabPanel.getWidgetCount() > 2) { - removeTab(CloseableTabHeader.this); + removeTab(CloseablePresenterTab.this); } } }); this.add(closeImage); } + + public String getId() { + return id; + } + + public ResultsPresenter getPresenter() { + return presenter; + } public void setText(String text) { - label.setText(text); + headerLabel.setText(text); tabPanel.checkIfScrollButtonsNecessary(); } } - - @Override - public String getId() { - return "TabbedResultsPresenter"; - } - - /** - * 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. - * @param resultPresenter - * which shall be used to handle the datamaining query result. - * - * @throws IllegalStateException - * if the {@link resultType} is already registered. - */ - public void registerResultsPresenter(Class resultType, ResultsPresenter resultPresenter) - throws IllegalStateException { - String className = resultType.getName(); - if (!registeredResultPresenterMap.containsKey(className)) { - 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 e34bc01aded25d0106703c816ac5d4078936a4c5 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 27 Jul 2018 17:01:00 +0200 Subject: [PATCH 036/197] Added javadoc to CompositeResultsPresenter and robustness against non-contained presenter ids in TabbedResultsPresenter --- .../ui/client/CompositeResultsPresenter.java | 49 +++++++++++++++++++ .../presentation/TabbedResultsPresenter.java | 35 ++++++++++--- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java index 1dd4f553d5a..1b38fbf5244 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java @@ -20,10 +20,59 @@ public interface CompositeResultsPresenter extend */ Iterable getPresenterIds(); + /** + * @param presenterId The id of the presenter to check for + * @return true, if a presenter with the given id exists + */ + boolean containsPresenter(String presenterId); + + /** + * @param presenterId The id of the presenter to get the results from + * @return The results of the presenter (may be null) with the given id or null, + * if no presenter for the id exists. + */ + QueryResultDTO getResult(String presenterId); + + /** + * Shows the given result in the presenter for the given id. Does nothing if no + * presenter for the given id exists. + * + * @param presenterId The id of the presenter used to show the result + * @param result The result to show + */ void showResult(String presenterId, QueryResultDTO result); + + /** + * Shows the given error in the presenter for the given id. Does nothing if no + * presenter for the given id exists. + * + * @param presenterId The id of the presenter used to show the error + * @param error The error message + */ void showError(String presenterId, String error); + + /** + * Shows the given error in the presenter for the given id. Does nothing if no + * presenter for the given id exists. + * + * @param presenterId The id of the presenter used to show the error + * @param mainError The main error message + * @param detailedErrors The detailed error messages + */ void showError(String presenterId, String mainError, Iterable detailedErrors); + + /** + * Shows the busy indicator of the presenter for the given id. Does nothing if no + * presenter for the given id exists. + * + * @param presenterId The id of the presenter used to show the busy indicator + */ void showBusyIndicator(String presenterId); + + @Override + default QueryResultDTO getCurrentResult() { + return getResult(getCurrentPresenterId()); + } @Override default void showResult(QueryResultDTO result) { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java index e2034bc7749..cc31164955e 100755 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java @@ -73,11 +73,6 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent getCurrentResult() { - return getSelectedTab().getPresenter().getCurrentResult(); - } - @Override public String getCurrentPresenterId() { return getSelectedTab().getId(); @@ -88,12 +83,27 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent idSet = new HashSet<>(tabsMappedById.keySet()); return Collections.unmodifiableSet(idSet); } + + @Override + public boolean containsPresenter(String presenterId) { + return tabsMappedById.containsKey(presenterId); + } + + @Override + public QueryResultDTO getResult(String presenterId) { + CloseablePresenterTab tab = getTab(presenterId); + return tab != null ? tab.getPresenter().getCurrentResult() : null; + } @Override public void showResult(String presenterId, QueryResultDTO result) { + CloseablePresenterTab oldTab = getTab(presenterId); + if (oldTab == null) { + return; + } + try { if (result != null) { - CloseablePresenterTab oldTab = getTab(presenterId); if (registeredResultPresenterMap.containsKey(result.getResultType())) { addTabAndFocus(registeredResultPresenterMap.get(result.getResultType())); removeTab(oldTab); @@ -105,7 +115,6 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent detailedErrors) { CloseablePresenterTab tab = getTab(presenterId); + if (tab == null) { + return; + } + tab.setText(getDataMiningStringMessages().error()); tab.getPresenter().showError(mainError, detailedErrors); } @@ -128,6 +145,10 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent Date: Fri, 27 Jul 2018 17:31:30 +0200 Subject: [PATCH 037/197] Added a reference to the query definition of the currently displayed result to the result presenters --- .../ui/client/CompositeResultsPresenter.java | 30 ++++++++++++++----- .../ui/client/ResultsPresenter.java | 21 ++++++++++++- .../developer/PredefinedQueryRunner.java | 2 +- .../client/execution/SimpleQueryRunner.java | 2 +- .../AbstractResultsPresenter.java | 13 +++++++- .../presentation/MultiResultsPresenter.java | 12 ++++++-- .../presentation/TabbedResultsPresenter.java | 11 +++++-- 7 files changed, 75 insertions(+), 16 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java index 1b38fbf5244..da83b50ddad 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java @@ -1,6 +1,7 @@ package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; +import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; /** @@ -28,19 +29,29 @@ public interface CompositeResultsPresenter extend /** * @param presenterId The id of the presenter to get the results from - * @return The results of the presenter (may be null) with the given id or null, + * @return The results of the presenter with the given id or null, * if no presenter for the id exists. */ QueryResultDTO getResult(String presenterId); /** - * Shows the given result in the presenter for the given id. Does nothing if no - * presenter for the given id exists. + * @param presenterId The id of the presenter to get the query definition from + * @return The query definition of the presenter with the given id or null, + * if no presenter for the id exists. + */ + StatisticQueryDefinitionDTO getQueryDefinition(String presenterId); + + /** + * Displays the given result for the given query definition int the presenter for the given id. + * Does nothing if no presenter for the given id exists. The given result may be null + * to clear the presenter. The given query definition may be null, but this is + * discouraged unless the result is also null. * * @param presenterId The id of the presenter used to show the result - * @param result The result to show + * @param queryDefinition The query definition of the result to display + * @param result The result to display */ - void showResult(String presenterId, QueryResultDTO result); + void showResult(String presenterId, StatisticQueryDefinitionDTO queryDefinition, QueryResultDTO result); /** * Shows the given error in the presenter for the given id. Does nothing if no @@ -73,10 +84,15 @@ public interface CompositeResultsPresenter extend default QueryResultDTO getCurrentResult() { return getResult(getCurrentPresenterId()); } + + @Override + default StatisticQueryDefinitionDTO getCurrentQueryDefinition() { + return getQueryDefinition(getCurrentPresenterId()); + } @Override - default void showResult(QueryResultDTO result) { - showResult(getCurrentPresenterId(), result); + default void showResult(StatisticQueryDefinitionDTO queryDefinition, QueryResultDTO result) { + showResult(getCurrentPresenterId(), queryDefinition, result); } @Override diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index dad6ec8766d..24c529cc059 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -1,14 +1,33 @@ package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; +import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.gwt.client.shared.components.Component; public interface ResultsPresenter extends Component { + /** + * @return The currently displayed result or null, if no result is shown. + */ QueryResultDTO getCurrentResult(); + + /** + * @return The query definition of the currently displayed result or null, + * if not result is shown or no query definition has been set. + */ + StatisticQueryDefinitionDTO getCurrentQueryDefinition(); - void showResult(QueryResultDTO result); + /** + * Displays the given result for the given query definition. The given result may be + * null to clear the presenter. The given query definition may be null, + * but this is discouraged unless the result is also null. + * + * @param queryDefinition The query definition of the results to display + * @param result The results to display + */ + void showResult(StatisticQueryDefinitionDTO queryDefinition, QueryResultDTO result); + void showError(String error); void showError(String mainError, Iterable detailedErrors); void showBusyIndicator(); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 9bbd34d70e4..ab219e806d1 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -151,7 +151,7 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { dataMiningService.runQuery(session, queryDefinition, new AsyncCallback>() { @Override public void onSuccess(QueryResultDTO result) { - resultsPresenter.showResult(result); + resultsPresenter.showResult(queryDefinition, result); } @Override public void onFailure(Throwable error) { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index d19c727235e..de384c29b1d 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -103,7 +103,7 @@ public class SimpleQueryRunner extends AbstractDataMiningComponent result) { - resultsPresenter.showResult(presenterId, result); + resultsPresenter.showResult(presenterId, queryDefinition, result); } }); } else { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 1766669310c..8e5c91da41e 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -12,6 +12,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel; 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.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.client.ResultsPresenter; @@ -35,6 +36,7 @@ public abstract class AbstractResultsPresenter private final HTML errorLabel; private final HTML labeledBusyIndicator; + private StatisticQueryDefinitionDTO currentQueryDefinition; private QueryResultDTO currentResult; private boolean isCurrentResultSimple; @@ -75,7 +77,7 @@ public abstract class AbstractResultsPresenter } @Override - public void showResult(QueryResultDTO result) { + public void showResult(StatisticQueryDefinitionDTO queryDefinition, QueryResultDTO result) { if (result != null && !result.isEmpty()) { if (state != ResultsPresenterState.RESULT) { mainPanel.setWidgetHidden(controlsPanel, false); @@ -83,10 +85,12 @@ public abstract class AbstractResultsPresenter state = ResultsPresenterState.RESULT; } this.currentResult = result; + this.currentQueryDefinition = queryDefinition; updateCurrentResultInfo(); internalShowResults(getCurrentResult()); } else { this.currentResult = null; + this.currentQueryDefinition = null; updateCurrentResultInfo(); showError(getDataMiningStringMessages().noDataFound() + "."); } @@ -104,6 +108,7 @@ public abstract class AbstractResultsPresenter state = ResultsPresenterState.ERROR; } currentResult = null; + currentQueryDefinition = null; updateCurrentResultInfo(); presentationPanel.setWidget(errorLabel); } @@ -125,6 +130,7 @@ public abstract class AbstractResultsPresenter state = ResultsPresenterState.BUSY; } currentResult = null; + currentQueryDefinition = null; updateCurrentResultInfo(); } @@ -151,6 +157,11 @@ public abstract class AbstractResultsPresenter public QueryResultDTO getCurrentResult() { return currentResult; } + + @Override + public StatisticQueryDefinitionDTO getCurrentQueryDefinition() { + return currentQueryDefinition; + } @Override public Widget getEntryWidget() { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 8d8ed7ec120..3bc8981296a 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -13,6 +13,7 @@ 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.sse.common.settings.Settings; +import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.client.ResultsPresenter; @@ -84,14 +85,19 @@ public class MultiResultsPresenter extends AbstractDataMiningComponent } @Override - public QueryResultDTO getCurrentResult() { + public QueryResultDTO getCurrentResult() { return currentPresenter.getCurrentResult(); } + + @Override + public StatisticQueryDefinitionDTO getCurrentQueryDefinition() { + return currentPresenter.getCurrentQueryDefinition(); + } @Override - public void showResult(QueryResultDTO result) { + public void showResult(StatisticQueryDefinitionDTO queryDefinition, QueryResultDTO result) { for (PresenterDescriptor descriptor : availablePresenters) { - descriptor.getPresenter().showResult(result); + descriptor.getPresenter().showResult(queryDefinition, result); } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java index cc31164955e..73613c37c90 100755 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java @@ -18,6 +18,7 @@ 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.sse.common.settings.Settings; +import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent; import com.sap.sse.datamining.ui.client.CompositeResultsPresenter; @@ -94,9 +95,15 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent result) { + public void showResult(String presenterId, StatisticQueryDefinitionDTO queryDefinition, QueryResultDTO result) { CloseablePresenterTab oldTab = getTab(presenterId); if (oldTab == null) { return; @@ -116,7 +123,7 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent Date: Fri, 27 Jul 2018 17:36:14 +0200 Subject: [PATCH 038/197] Removed the arbitrary runQuery method from QueryRunner --- .../gwt/ui/datamining/DataMiningEntryPoint.java | 16 ++++++++++------ .../sse/datamining/ui/client/QueryRunner.java | 2 -- .../ui/client/execution/SimpleQueryRunner.java | 9 ++------- 3 files changed, 12 insertions(+), 15 deletions(-) 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 c8f69f925e1..71524119524 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 @@ -62,7 +62,7 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { SailingPermissionsForRoleProvider.INSTANCE); authorizedContentDecorator.setContentWidgetFactory(new WidgetFactory() { - private QueryDefinitionProviderWithControls queryDefinitionProviderWithControls; + private QueryDefinitionProviderWithControls queryDefinitionProvider; private SimpleQueryRunner queryRunner; private final DataMiningSettingsInfoManager settingsManager = new DataMiningSettingsInfoManagerImpl( getStringMessages()); @@ -71,16 +71,20 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { public Widget get() { DataMiningSettingsControl settingsControl = new AnchorDataMiningSettingsControl(null, null); CompositeResultsPresenter resultsPresenter = new TabbedSailingResultsPresenter(/*parent*/ null, /*context*/ null, - /*drillDownCallback*/ groupKey -> queryDefinitionProviderWithControls.drillDown(groupKey, queryRunner::runQuery), + /*drillDownCallback*/ groupKey -> { + queryDefinitionProvider.drillDown(groupKey, () -> { + queryRunner.run(queryDefinitionProvider.getQueryDefinition()); + }); + }, getStringMessages()); DockLayoutPanel selectionDockPanel = new DockLayoutPanel(Unit.PX); - queryDefinitionProviderWithControls = new QueryDefinitionProviderWithControls(null, null, session, + queryDefinitionProvider = new QueryDefinitionProviderWithControls(null, null, session, dataMiningService, DataMiningEntryPoint.this, settingsControl, settingsManager, resultsPresenter); - selectionDockPanel.add(queryDefinitionProviderWithControls.getEntryWidget()); + selectionDockPanel.add(queryDefinitionProvider.getEntryWidget()); queryRunner = new SimpleQueryRunner(null, null, session, dataMiningService, DataMiningEntryPoint.this, - queryDefinitionProviderWithControls, resultsPresenter); - queryDefinitionProviderWithControls.addControl(queryRunner.getEntryWidget()); + queryDefinitionProvider, resultsPresenter); + queryDefinitionProvider.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 diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 8c2b55e3be0..b0fbd119ff4 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,6 +8,4 @@ public interface QueryRunner extends QueryDefinitionChangedListener, Component errorMessages = queryDefinitionProvider.validateQueryDefinition(queryDefinition); From 63baa0af73af9e41b7ab073297c2c7c56f626c0e Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 27 Jul 2018 17:49:44 +0200 Subject: [PATCH 039/197] PredefinedQueryRunner now uses SimpleQueryRunner to execute the query --- .../ui/datamining/DataMiningEntryPoint.java | 2 +- .../developer/PredefinedQueryRunner.java | 32 ++++--------------- .../QueryDefinitionProviderWithControls.java | 8 ++--- 3 files changed, 12 insertions(+), 30 deletions(-) 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 71524119524..d57e6f7f2ce 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 @@ -80,7 +80,7 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { DockLayoutPanel selectionDockPanel = new DockLayoutPanel(Unit.PX); queryDefinitionProvider = new QueryDefinitionProviderWithControls(null, null, session, dataMiningService, DataMiningEntryPoint.this, settingsControl, settingsManager, - resultsPresenter); + queryDefinition -> queryRunner.run(queryDefinition)); selectionDockPanel.add(queryDefinitionProvider.getEntryWidget()); queryRunner = new SimpleQueryRunner(null, null, session, dataMiningService, DataMiningEntryPoint.this, queryDefinitionProvider, resultsPresenter); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index ab219e806d1..f4030a377fe 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -1,9 +1,9 @@ package com.sap.sse.datamining.ui.client.developer; -import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.function.Consumer; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -16,13 +16,10 @@ 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.sse.common.Util; -import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier; -import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.datamining.ui.client.DataMiningServiceAsync; import com.sap.sse.datamining.ui.client.QueryDefinitionProvider; -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; @@ -33,12 +30,11 @@ import com.sap.sse.gwt.client.shared.settings.ComponentContext; public class PredefinedQueryRunner extends ComponentWithoutSettings { - private final DataMiningSession session; private final StringMessages stringMessages; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final QueryDefinitionProvider queryDefinitionProvider; - private final ResultsPresenter resultsPresenter; + private final Consumer queryRunner; private final Button showDialogButton; private final DialogBox dialogBox; @@ -46,16 +42,15 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { private final ValueListBox selectionListBox; private final Button runButton; - public PredefinedQueryRunner(Component parent, ComponentContext context, DataMiningSession session, - StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, - QueryDefinitionProvider queryDefinitionProvider, ResultsPresenter resultsPresenter) { + public PredefinedQueryRunner(Component parent, ComponentContext context, StringMessages stringMessages, + DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + QueryDefinitionProvider queryDefinitionProvider, Consumer queryRunner) { super(parent, context); - this.session = session; this.stringMessages = stringMessages; this.dataMiningService = dataMiningService; this.errorReporter = errorReporter; this.queryDefinitionProvider = queryDefinitionProvider; - this.resultsPresenter = resultsPresenter; + this.queryRunner = queryRunner; showDialogButton = new Button(stringMessages.runPredefinedQuery(), new ClickHandler() { @Override @@ -143,28 +138,15 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { protected void runSelectedPredefinedQuery() { PredefinedQueryIdentifier predefinedQueryIdentifier = selectionListBox.getValue(); - resultsPresenter.showBusyIndicator(); dataMiningService.getPredefinedQueryDefinition(predefinedQueryIdentifier, new AsyncCallback() { @Override public void onSuccess(StatisticQueryDefinitionDTO queryDefinition) { queryDefinitionProvider.applyQueryDefinition(queryDefinition); - dataMiningService.runQuery(session, queryDefinition, new AsyncCallback>() { - @Override - public void onSuccess(QueryResultDTO result) { - resultsPresenter.showResult(queryDefinition, result); - } - @Override - public void onFailure(Throwable error) { - errorReporter.reportError("Error running the query: " + error.getMessage()); - resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); - } - }); + queryRunner.accept(queryDefinition); } @Override public void onFailure(Throwable error) { errorReporter.reportError("Error running the query: " + error.getMessage()); - resultsPresenter.showError(stringMessages.errorRunningDataMiningQuery() + "."); - } }); dialogBox.hide(); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 09a10473166..209c964e4b8 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; +import java.util.function.Consumer; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; @@ -37,7 +38,6 @@ 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.StatisticChangedListener; import com.sap.sse.datamining.ui.client.StatisticProvider; import com.sap.sse.datamining.ui.client.WithControls; @@ -78,7 +78,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition public QueryDefinitionProviderWithControls(Component parent, ComponentContext context, DataMiningSession session, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, DataMiningSettingsControl settingsControl, DataMiningSettingsInfoManager settingsManager, - ResultsPresenter resultsPresenter) { + Consumer queryRunner) { super(parent, context, dataMiningService, errorReporter); providerListener = new ProviderListener(); // Creating the header panel, that contains the retriever chain provider and the controls @@ -103,8 +103,8 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition queryDefinitionViewer.getEntryWidget().addStyleName("dataMiningMarginRight"); queryDefinitionViewer.setActive(false); addQueryDefinitionChangedListener(queryDefinitionViewer); - predefinedQueryRunner = new PredefinedQueryRunner(parent, context, session, getDataMiningStringMessages(), - dataMiningService, errorReporter, this, resultsPresenter); + predefinedQueryRunner = new PredefinedQueryRunner(parent, context, getDataMiningStringMessages(), + dataMiningService, errorReporter, this, queryRunner); Button clearSelectionButton = new Button(getDataMiningStringMessages().clearSelection()); clearSelectionButton.addClickHandler(new ClickHandler() { From 8a85c5fbb98dacf1d7917ca54687d26a7c6dfe38 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 27 Jul 2018 19:15:48 +0200 Subject: [PATCH 040/197] Implemented a simple approach to apply the query definition of a result presenter when the selected presenter is changed --- .../ui/datamining/DataMiningEntryPoint.java | 9 +++++ .../ui/client/CompositeResultsPresenter.java | 10 ++++++ .../presentation/TabbedResultsPresenter.java | 36 +++++++++++++------ 3 files changed, 44 insertions(+), 11 deletions(-) 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 d57e6f7f2ce..82d95c798a9 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 @@ -17,6 +17,7 @@ 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.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.UUIDDataMiningSession; import com.sap.sse.datamining.ui.client.AnchorDataMiningSettingsControl; import com.sap.sse.datamining.ui.client.CompositeResultsPresenter; @@ -77,6 +78,13 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { }); }, getStringMessages()); + resultsPresenter.addCurrentPresenterChangedListener(presenterId -> { + StatisticQueryDefinitionDTO queryDefinition = resultsPresenter.getQueryDefinition(presenterId); + if (queryDefinition != null) { + queryDefinitionProvider.applyQueryDefinition(queryDefinition); + } + }); + DockLayoutPanel selectionDockPanel = new DockLayoutPanel(Unit.PX); queryDefinitionProvider = new QueryDefinitionProviderWithControls(null, null, session, dataMiningService, DataMiningEntryPoint.this, settingsControl, settingsManager, @@ -91,6 +99,7 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint { * automatic execution of queries. Re-enable this, when this functionality is desired again. */ // settingsControl.addSettingsComponent(queryRunner); + SplitLayoutPanel splitPanel = new SplitLayoutPanel(10); splitPanel.addSouth(resultsPresenter.getEntryWidget(), 350); splitPanel.add(selectionDockPanel); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java index da83b50ddad..abb586a0a9a 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/CompositeResultsPresenter.java @@ -10,6 +10,13 @@ import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; * @author Lennart Hensler */ public interface CompositeResultsPresenter extends ResultsPresenter { + + @FunctionalInterface + public interface CurrentPresenterChangedListener { + + void currentPresenterChanged(String presenterId); + + } /** * @return The identifier for the currently active presenter @@ -80,6 +87,9 @@ public interface CompositeResultsPresenter extend */ void showBusyIndicator(String presenterId); + void addCurrentPresenterChangedListener(CurrentPresenterChangedListener listener); + void removeCurrentPresenterChangedListener(CurrentPresenterChangedListener listener); + @Override default QueryResultDTO getCurrentResult() { return getResult(getCurrentPresenterId()); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java index 73613c37c90..a3515aef2b9 100755 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java @@ -11,8 +11,6 @@ import com.google.gwt.core.shared.GWT; 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.logical.shared.BeforeSelectionEvent; -import com.google.gwt.event.logical.shared.BeforeSelectionHandler; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Label; @@ -41,6 +39,7 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent tabsMappedById; protected final DrillDownCallback drillDownCallback; protected final Map> registeredResultPresenterMap; + private final Set listeners; public TabbedResultsPresenter(Component parent, ComponentContext context, DrillDownCallback drillDownCallback) { super(parent, context); @@ -48,11 +47,19 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent(); - registeredResultPresenterMap = new HashMap<>(); this.drillDownCallback = drillDownCallback; + registeredResultPresenterMap = new HashMap<>(); + listeners = new HashSet<>(); addNewTabTab(); addTabAndFocus(new MultiResultsPresenter(this, context, drillDownCallback)); + + tabPanel.addSelectionHandler(event -> { + String presenterId = ((CloseablePresenterTab) tabPanel.getTabWidget(event.getSelectedItem())).getId(); + for (CurrentPresenterChangedListener listener : listeners) { + listener.currentPresenterChanged(presenterId); + } + }); } private void addNewTabTab() { @@ -62,14 +69,11 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent() { - @Override - public void onBeforeSelection(BeforeSelectionEvent event) { - if (event.getItem() == tabPanel.getWidgetCount() - 1) { - event.cancel(); - addTabAndFocus(new MultiResultsPresenter(TabbedResultsPresenter.this, getComponentContext(), - drillDownCallback)); - } + tabPanel.addBeforeSelectionHandler(event -> { + if (event.getItem() == tabPanel.getWidgetCount() - 1) { + event.cancel(); + addTabAndFocus(new MultiResultsPresenter(TabbedResultsPresenter.this, getComponentContext(), + drillDownCallback)); } }); } @@ -160,6 +164,16 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent Date: Fri, 27 Jul 2018 19:59:36 +0200 Subject: [PATCH 041/197] Preliminary implementation to apply a query definition to HierarchicalDimensionListFilterSelectionProvider --- ...lDimensionListFilterSelectionProvider.java | 66 +++++++++++++------ 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java index da61d4672b7..ca9970e9b13 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java @@ -83,9 +83,10 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo private final Set listeners; private boolean isAwaitingReload; + private boolean isUpdating; private DataRetrieverChainDefinitionDTO retrieverChain; private ReducedDimensionsDTO reducedDimensions; - private final List allFilterDimensions; + private final List availableFilterDimensions; private final ListDataProvider filteredFilterDimensions; private final DockLayoutPanel mainPanel; @@ -102,6 +103,8 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo private final FilterSelectionPresenter filterSelectionPresenter; private final ScrollPanel filterSelectionPresenterContainer; + private HashMap>> selectionToBeApplied; + public HierarchicalDimensionListFilterSelectionProvider(Component parent, ComponentContext context, DataMiningSession session, StringMessages stringMessages, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, @@ -116,7 +119,7 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo listeners = new HashSet<>(); isAwaitingReload = false; retrieverChain = null; - allFilterDimensions = new ArrayList<>(); + availableFilterDimensions = new ArrayList<>(); filteredFilterDimensions = new ListDataProvider<>(); Label filterDimensionsSelectionTitleLabel = new Label(stringMessages.selectDimensionsToFilterBy()); @@ -212,11 +215,13 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo updateFilterDimensions(); } else if (!isAwaitingReload) { clearContent(); + selectionToBeApplied = null; } } } private void updateFilterDimensions() { + isUpdating = true; clearContent(); dataMiningService.getReducedDimensionsMappedByLevelFor(retrieverChain, LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback() { @Override @@ -225,37 +230,42 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo for (Entry> entry : reducedDimensions.getReducedDimensions().entrySet()) { DataRetrieverLevelDTO retrieverlevel = entry.getKey(); for (FunctionDTO dimension : entry.getValue()) { - allFilterDimensions.add(new DimensionWithContext(dimension, retrieverlevel)); + availableFilterDimensions.add(new DimensionWithContext(dimension, retrieverlevel)); } } - allFilterDimensions.sort(null); - filterFilterDimensionsPanel.updateAll(allFilterDimensions); + availableFilterDimensions.sort(null); + filterFilterDimensionsPanel.updateAll(availableFilterDimensions); + + if (selectionToBeApplied != null) { + setSelection(selectionToBeApplied); + selectionToBeApplied = null; + } + isUpdating = false; } @Override public void onFailure(Throwable caught) { errorReporter.reportError("Error fetching the dimensions of the retriever chain from the server: " + caught.getMessage()); + selectionToBeApplied = null; + isUpdating = false; } }); } private void clearContent() { reducedDimensions = null; - allFilterDimensions.clear(); + availableFilterDimensions.clear(); filterDimensionSelectionModel.clear(); filterFilterDimensionsPanel.removeAll(); } @Override public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { - HashMap>> filterSelection = queryDefinition.getFilterSelection(); - for (DimensionWithContext dimensionWithContext : allFilterDimensions) { - HashMap> retrieverLevelSelection = filterSelection.get(dimensionWithContext.getRetrieverLevel()); - if (retrieverLevelSelection != null) { - HashSet items = retrieverLevelSelection.get(dimensionWithContext.getDimension()); - if (items != null) { - setSelection(dimensionWithContext, items); - } - } + DataRetrieverChainDefinitionDTO retrieverChain = queryDefinition.getDataRetrieverChainDefinition(); + selectionToBeApplied = queryDefinition.getFilterSelection(); + + if (!isUpdating && !isAwaitingReload && retrieverChain.equals(this.retrieverChain)) { + setSelection(selectionToBeApplied); + selectionToBeApplied = null; } } @@ -263,15 +273,33 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo public void setHighestRetrieverLevelWithFilterDimension(FunctionDTO dimension, Serializable groupKey) { FunctionDTO reducedDimension = reducedDimensions == null ? dimension : reducedDimensions.getReducedDimension(dimension); Collection items = Collections.singleton(groupKey); - for (DimensionWithContext dimensionWithContext : allFilterDimensions) { + for (DimensionWithContext dimensionWithContext : availableFilterDimensions) { if (dimensionWithContext.getDimension().equals(reducedDimension)) { - setSelection(dimensionWithContext, items); + setDimensionSelection(dimensionWithContext, items); break; } } } - private void setSelection(DimensionWithContext dimension, Collection items) { + private void setSelection(HashMap>> filterSelection) { + for (DimensionWithContext dimensionWithContext : availableFilterDimensions) { + Collection itemsToSelect = Collections.emptySet(); + HashMap> retrieverLevelSelection = filterSelection.get(dimensionWithContext.getRetrieverLevel()); + if (retrieverLevelSelection != null) { + HashSet items = retrieverLevelSelection.get(dimensionWithContext.getDimension()); + if (items != null && !items.isEmpty()) { + itemsToSelect = items; + } + } + + DimensionFilterSelectionProvider selectionProvider = dimensionFilterSelectionProviders.get(dimensionWithContext); + if (!itemsToSelect.isEmpty() || (selectionProvider != null && !selectionProvider.getSelection().isEmpty())) { + setDimensionSelection(dimensionWithContext, itemsToSelect); + } + } + } + + private void setDimensionSelection(DimensionWithContext dimension, Collection items) { DimensionFilterSelectionProvider selectionProvider; if (filterDimensionSelectionModel.isSelected(dimension)) { selectionProvider = dimensionFilterSelectionProviders.get(dimension); @@ -364,7 +392,7 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo @Override public HashMap>> getSelection() { HashMap>> filterSelection = new HashMap<>(); - for (DimensionWithContext dimensionWithContext : allFilterDimensions) { + for (DimensionWithContext dimensionWithContext : availableFilterDimensions) { DataRetrieverLevelDTO retrieverLevel = dimensionWithContext.getRetrieverLevel(); FunctionDTO dimension = dimensionWithContext.getDimension(); DimensionFilterSelectionProvider selectionProvider = dimensionFilterSelectionProviders.get(dimensionWithContext); From 514fccbaab30291ce8913544d2fb13d4c03676d4 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 27 Jul 2018 20:04:07 +0200 Subject: [PATCH 042/197] Minor cleanup of the applyQueryDefinition methods --- .../MultiDimensionalGroupingProvider.java | 8 ++- .../SuggestBoxStatisticProvider.java | 68 +++++++++---------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index a3026434d4d..6c6d660368f 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -143,6 +143,7 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen @Override public void onFailure(Throwable caught) { errorReporter.reportError("Error fetching the dimensions from the server: " + caught.getMessage()); + dimensionsToSelect = null; isUpdating = false; } }); @@ -150,6 +151,7 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen clearAvailableDimensionsAndGroupByBoxes(); ValueListBox firstDimensionToGroupByBox = createDimensionToGroupByBox(); addDimensionToGroupByBoxAndUpdateAcceptableValues(firstDimensionToGroupByBox); + dimensionsToSelect = null; } } @@ -263,10 +265,10 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen @Override public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { DataRetrieverChainDefinitionDTO newRetrieverChain = queryDefinition.getDataRetrieverChainDefinition(); + dimensionsToSelect = queryDefinition.getDimensionsToGroupBy(); if (!isAwaitingReload && !isUpdating && currentRetrieverChainDefinition.equals(newRetrieverChain)) { - setSelectedDimensions(queryDefinition.getDimensionsToGroupBy()); - } else { - dimensionsToSelect = queryDefinition.getDimensionsToGroupBy(); + setSelectedDimensions(dimensionsToSelect); + dimensionsToSelect = null; } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 190f8cd7d8a..37f54558b27 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -174,44 +174,43 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent>() { - @Override - public void onSuccess(ArrayList dataRetrieverChainDefinitions) { - settingsMap.clear(); - awaitingRetrieverChainStatistics = dataRetrieverChainDefinitions.size(); - availableExtractionFunctions.clear(); - if (awaitingRetrieverChainStatistics == 0) { - extractionFunctionSuggestBox.setSelectableValues(availableExtractionFunctions); - } 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()); - } - }); + new AsyncCallback>() { + @Override + public void onSuccess(ArrayList dataRetrieverChainDefinitions) { + settingsMap.clear(); + awaitingRetrieverChainStatistics = dataRetrieverChainDefinitions.size(); + availableExtractionFunctions.clear(); + if (awaitingRetrieverChainStatistics == 0) { + extractionFunctionSuggestBox.setSelectableValues(availableExtractionFunctions); + } 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()); + } + }); } } + } - @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, @@ -257,6 +256,7 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent Date: Fri, 27 Jul 2018 20:58:30 +0200 Subject: [PATCH 043/197] Moved the button to clear the filter selection into HierarchicalDimensionListFilterSelectionProvider and fixed a typo in the properties --- java/com.sap.sailing.gwt.ui/DataMining.css | 11 ++++++++++ .../datamining/ui/client/StringMessages.java | 3 ++- .../ui/client/StringMessages.properties | 3 ++- .../ui/client/StringMessages_de.properties | 5 +++-- .../ui/client/StringMessages_es.properties | 4 ++-- .../ui/client/StringMessages_fr.properties | 2 +- .../ui/client/StringMessages_ja.properties | 2 +- .../ui/client/StringMessages_pt.properties | 4 ++-- .../ui/client/StringMessages_ru.properties | 2 +- .../ui/client/StringMessages_zh.properties | 2 +- .../client/execution/SimpleQueryRunner.java | 2 +- ...lDimensionListFilterSelectionProvider.java | 21 +++++++++++++++---- .../QueryDefinitionProviderWithControls.java | 15 +++---------- 13 files changed, 47 insertions(+), 29 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/DataMining.css b/java/com.sap.sailing.gwt.ui/DataMining.css index 92ca1290f69..6fb816c576f 100644 --- a/java/com.sap.sailing.gwt.ui/DataMining.css +++ b/java/com.sap.sailing.gwt.ui/DataMining.css @@ -261,6 +261,7 @@ input.magnifier { .filterDimensionsTitleLabel { padding-top: 5px; + display: inline-block; } .filterFilterDimensionsPanel { @@ -323,9 +324,15 @@ input.magnifier { .dataMiningMarginLeft { margin-left: 5px; } +.dataMiningMarginTop { + margin-top: 5px; +} .dataMiningMarginRight { margin-right: 5px; } +.dataMiningMarginBottom { + margin-bottom: 5px; +} .resultsPresenterTabHeader * { display: inline-block; @@ -335,4 +342,8 @@ input.magnifier { .emphasizedLabel { font-weight: 600; +} + +.floatRight { + float: right; } \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 9a5d2bb0314..8af86ea8d14 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -24,7 +24,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String useClassGetName(); String useStringLiteralsTooltip(); String queryDefinitionViewer(); - String runAsSubstantive(); + String run(); String queryNotValidBecause(); String queryRunner(); String runAQuery(); @@ -65,5 +65,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String filter(); String filterShownDimensions(); String selectDimensionsToFilterBy(); + String clear(); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 522283d4f2b..7a4a80d4d33 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -48,4 +48,5 @@ search=Search csvCopiedToClipboard=CSV content has been copied to clipboard. filter=Filter filterShownDimensions=Filter shown dimensions -selectDimensionsToFilterBy=Select dimensions to filter by \ No newline at end of file +selectDimensionsToFilterBy=Select dimensions to filter by +clear=Clear \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 7fd0a304851..bdbd1157bf6 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,7 +8,7 @@ useClassGetNameTooltip=Robuster gegnüber Änderungen im Code, aber der Code Sni 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 +run=Ausführen queryNotValidBecause=Keine Datenabfrage möglich, da queryRunner=Abfrageverarbeiter runAQuery=Führe eine Anfrage aus @@ -48,4 +48,5 @@ search=Suche csvCopiedToClipboard=Der Inhalt wurde als CSV in die Zwischenablage kopiert. filter=Filter filterShownDimensions=Angezeigte Dimensionen filtern -selectDimensionsToFilterBy=Dimensionen der Filterung auswählen \ No newline at end of file +selectDimensionsToFilterBy=Dimensionen der Filterung auswählen +clear=Löschen \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 2ba0e57b335..f78a0255fc9 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,7 +8,7 @@ useClassGetNameTooltip=Más resistente frente a modificaciones en la base de có 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 +run=Ejecutar queryNotValidBecause=No se puede hacer ninguna consulta porque queryRunner=Ejecutor de la consulta runAQuery=Realice una consulta @@ -41,4 +41,4 @@ 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 -numberPairResultsPresenter=Diagrama de dispersión +numberPairResultsPresenter=Diagrama de dispersi�n diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index f07d1ec786c..ac6c097da31 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,7 +8,7 @@ useClassGetNameTooltip=Plus stable face aux modifications dans la base de code, 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 +run=Exécuter queryNotValidBecause=Aucune requête possible dû à queryRunner=Outil d''exécution de requêtes runAQuery=Exécuter une requête diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 0834032cbd8..58136f0bfdb 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,7 +8,7 @@ useClassGetNameTooltip=コードベースã§ã®å¤‰æ›´ã«å¯¾ã—ã¦ã‚ˆã‚Šå …牢㧠useClassGetName=タイプåã« class.getName() を使用 useStringLiteralsTooltip=ã“ã®ã‚³ãƒ¼ãƒ‰ã‚¹ãƒ‹ãƒšãƒƒãƒˆã¯ã©ã“ã§ã‚‚使用ã§ãã¾ã™ãŒã€ã‚³ãƒ¼ãƒ‰ãƒ™ãƒ¼ã‚¹ãŒå¤‰æ›´ã•ã‚Œã‚‹å ´åˆã¯ä¸­æ–­ã—ã¾ã™ã€‚ queryDefinitionViewer=クエリ定義ビューア -runAsSubstantive=実行 +run=実行 queryNotValidBecause=クエリãŒå¯èƒ½ã§ã‚ã‚Šã¾ã›ã‚“。ç†ç”±: queryRunner=クエリランナー runningQuery=クエリ実行中 diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 78e3dc9bbdf..09a6e9fa375 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,7 +8,7 @@ useClassGetNameTooltip=Mais robusto em relação às modificações na base do c 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 +run=Competir queryNotValidBecause=Nenhuma consulta possível, pois queryRunner=Executor de consulta runAQuery=Executar uma consulta @@ -41,4 +41,4 @@ 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 -numberPairResultsPresenter=Diagrama de dispersão +numberPairResultsPresenter=Diagrama de dispers�o diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index f04a28fcbee..2912fb25851 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,7 +8,7 @@ useClassGetNameTooltip=Более надежно по Ñравнению Ñ Ð¸Ð· useClassGetName=ИÑпользовать Class.getName() Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½ типов useStringLiteralsTooltip=Фрагмент кода может иÑпользоватьÑÑ Ð³Ð´Ðµ угодно, но будет нарушен в Ñлучае Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð°. queryDefinitionViewer=СредÑтво проÑмотра Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа -runAsSubstantive=Выполнить +run=Выполнить queryNotValidBecause=Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½, так как queryRunner=Выполнение запроÑа runAQuery=Выполнить Ð·Ð°Ð¿Ñ€Ð¾Ñ diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 0d098962718..64d0ea34c61 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,7 +8,7 @@ useClassGetNameTooltip=æ›´çµæ´»åº”对代ç åº“的更改，但是代ç ç‰‡æ®µåª useClassGetName=å°† Class.getName() 用于类型å称 useStringLiteralsTooltip=代ç ç‰‡æ®µå¯åœ¨ä»»æ„ä½ç½®ä½¿ç”¨ï¼Œå½“如果基本代ç æ›´æ”¹ï¼Œå…¶å°†ä¸­æ–­ã€‚ queryDefinitionViewer=查询定义查看器 -runAsSubstantive=è¿è¡Œ +run=è¿è¡Œ queryNotValidBecause=无法查询，原因： queryRunner=查询执行器 runAQuery=è¿è¡ŒæŸ¥è¯¢ diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 79d9c6b4aa0..48fcf9b818c 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -64,7 +64,7 @@ public class SimpleQueryRunner extends AbstractDataMiningComponent clearSelection()); + DataMiningDataGridResources resources = GWT.create(DataMiningDataGridResources.class); filterDimensionsList = new DataGrid<>(Integer.MAX_VALUE, resources); filterDimensionsList.setAutoHeaderRefreshDisabled(true); @@ -168,9 +176,14 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo }; filterDimensionsList.addColumn(dimensionColumn); + FlowPanel headerPanel = new FlowPanel(); + headerPanel.addStyleName("dataMiningMarginTop"); + headerPanel.add(filterDimensionsSelectionTitleLabel); + headerPanel.add(clearSelectionButton); + DockLayoutPanel filterDimensionsSelectionPanel = new DockLayoutPanel(LayoutUnit); - filterDimensionsSelectionPanel.addNorth(filterDimensionsSelectionTitleLabel, 20); - filterDimensionsSelectionPanel.addNorth(filterFilterDimensionsPanel, DimensionSelectionHeaderHeight); + filterDimensionsSelectionPanel.addNorth(headerPanel, DimensionSelectionHeaderHeight); + filterDimensionsSelectionPanel.addNorth(filterFilterDimensionsPanel, FilterFilterDimensionsHeight); filterDimensionsSelectionPanel.add(filterDimensionsList); dimensionFilterSelectionProviders = new HashMap<>(); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 209c964e4b8..9dab28369df 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -94,9 +94,9 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition new ClickHandler() { @Override public void onClick(ClickEvent event) { - boolean active = queryDefinitionViewerToggleButton.isDown(); - filterSplitPanel.setWidgetHidden(queryDefinitionViewer.getEntryWidget(), !active); - queryDefinitionViewer.setActive(active); + boolean active = queryDefinitionViewerToggleButton.isDown(); + filterSplitPanel.setWidgetHidden(queryDefinitionViewer.getEntryWidget(), !active); + queryDefinitionViewer.setActive(active); } }); queryDefinitionViewer = new QueryDefinitionViewer(parent, context, getDataMiningStringMessages()); @@ -106,15 +106,6 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition predefinedQueryRunner = new PredefinedQueryRunner(parent, context, getDataMiningStringMessages(), dataMiningService, errorReporter, this, queryRunner); - Button clearSelectionButton = new Button(getDataMiningStringMessages().clearSelection()); - clearSelectionButton.addClickHandler(new ClickHandler() { - @Override - public void onClick(ClickEvent event) { - filterSelectionProvider.clearSelection(); - } - }); - addControl(clearSelectionButton); - Button reloadButton = new Button(getDataMiningStringMessages().reload()); reloadButton.addClickHandler(new ClickHandler() { @Override From 07a48acc9db1bedfdbbd7106ef52ec09d0026b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 30 Jul 2018 14:12:57 +0200 Subject: [PATCH 044/197] bug4682 multiple further cleanups regarding video state management not properly updating --- .../client/media/MediaManagementControl.java | 21 ++++--- .../ui/client/media/MediaPlayerManager.java | 2 +- .../media/MediaPlayerManagerComponent.java | 62 ++++++------------- .../media/MediaSingleSelectionControl.java | 2 +- 4 files changed, 35 insertions(+), 52 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java index c43a58dc228..62111d483d1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java @@ -92,9 +92,9 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem private void addAudioTracksToGridPanel(Collection audioTracks, Panel grid) { if (!audioTracks.isEmpty()) { grid.add(new Label(stringMessages.audioFiles())); - grid.add(createAudioButton(null, mediaPlayerManager.getPlayingAudioTrack())); + grid.add(createAudioButton(null)); for (MediaTrack audioTrack : audioTracks) { - grid.add(createAudioButton(audioTrack, mediaPlayerManager.getPlayingAudioTrack())); + grid.add(createAudioButton(audioTrack)); } } } @@ -134,7 +134,7 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem if (changeEvent.getValue()) { mediaPlayerManager.playFloatingVideo(videoTrack); } else { - mediaPlayerManager.closeFloatingVideo(videoTrack); + mediaPlayerManager.closeFloatingPlayer(videoTrack); } } }); @@ -195,7 +195,7 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem @Override public void onSuccess(Void allMediaTracks) { setVideoPlayCheckboxEnabled(videoTrack, false); - mediaPlayerManager.closeFloatingVideo(videoTrack); + mediaPlayerManager.closeFloatingPlayer(videoTrack); } }); @@ -229,17 +229,24 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem return deleteButton; } - private Widget createAudioButton(final MediaTrack audioTrack, MediaTrack selectedAudioTrack) { + private Widget createAudioButton(final MediaTrack audioTrack) { String label = audioTrack != null ? audioTrack.title : "Sound off"; String title = audioTrack != null ? audioTrack.toString() : "Turn off all sound channels."; RadioButton audioButton = new RadioButton("group-name", label); audioButton.setTitle(title); - audioButton.setValue(audioTrack == selectedAudioTrack); + audioButton.setValue(audioTrack == mediaPlayerManager.getPlayingAudioTrack()); audioButton.addValueChangeHandler(new ValueChangeHandler() { @Override public void onValueChange(ValueChangeEvent changeEvent) { if (changeEvent.getValue()) { - mediaPlayerManager.playAudio(audioTrack); + MediaTrack currentlyPlaying = mediaPlayerManager.getPlayingAudioTrack(); + if (audioTrack == null) { + if (currentlyPlaying != null) { + mediaPlayerManager.closeFloatingPlayer(currentlyPlaying); + } + } else { + mediaPlayerManager.playAudio(audioTrack); + } } } }); 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 3b4ef5d4aa3..f86864984aa 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 @@ -26,7 +26,7 @@ public interface MediaPlayerManager { void playFloatingVideo(MediaTrack videoTrack); - void closeFloatingVideo(MediaTrack videoTrack); + void closeFloatingPlayer(MediaTrack videoTrack); void playDockedVideo(MediaTrack videoTrack); 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 88d0ba2d4e6..855f45d2640 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 @@ -238,29 +238,13 @@ public class MediaPlayerManagerComponent extends AbstractComponent() { @Override @@ -395,26 +371,21 @@ public class MediaPlayerManagerComponent extends AbstractComponent then reset active audio player - activeAudioPlayer.shutDown(); - activeAudioPlayer = null; - notifyStateChange(); - } else { - // nothing changed + if (activeAudioPlayer != null) { + closeFloatingPlayer(activeAudioPlayer.getMediaTrack()); } } @@ -451,7 +422,7 @@ public class MediaPlayerManagerComponent extends AbstractComponent(activeVideoContainers.values())) { //using a copy to prevent a ConcurrentModificationException + for (VideoContainer videoContainer : new ArrayList(activeVideoContainers.values())) { // using a + // copy to + // prevent + // a + // ConcurrentModificationException videoContainer.shutDown(); } activeVideoContainers.clear(); @@ -636,9 +613,8 @@ public class MediaPlayerManagerComponent extends AbstractComponent Date: Tue, 24 Jul 2018 13:53:59 +0200 Subject: [PATCH 045/197] Bug 4339: There are test failures regarding multi window handling (e.g. in IE). To fix this we now create a new WebDriver instance for new windows to prevent those problems --- .../sailing/selenium/core/SeleniumRunner.java | 14 +++- .../sailing/selenium/core/WindowManager.java | 84 ++++--------------- .../core/impl/TestEnvironmentImpl.java | 7 +- .../TestRefreshableSelectionModel.java | 17 ++-- .../TestLeaderboardConfiguration.java | 11 +-- .../TestSwitchingOffStartOfRaceInference.java | 4 +- 6 files changed, 42 insertions(+), 95 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java index abe726d5a5b..6469e469848 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/SeleniumRunner.java @@ -7,6 +7,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -173,13 +174,20 @@ public class SeleniumRunner extends ParentRunner { Map capabilityDefinitions = this.definition.getCapabilities(); @SuppressWarnings("unchecked") Class clazz = (Class) Class.forName(driverClassname); - DesiredCapabilities capabilities = new DesiredCapabilities(capabilityDefinitions); Constructor constructor = clazz.getConstructor(Capabilities.class); - WebDriver driver = constructor.newInstance(capabilities); + + final Supplier webDriverFactory = () -> { + DesiredCapabilities capabilities = new DesiredCapabilities(capabilityDefinitions); + try { + return constructor.newInstance(capabilities); + } catch (Exception e) { + throw new IllegalStateException(e); + } + }; File screenshots = resolveScreenshotFolder(); - return new TestEnvironmentImpl(driver, this.root, screenshots); + return new TestEnvironmentImpl(webDriverFactory, this.root, screenshots); } catch (Exception exception) { throw exception; } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java index bcc70d59ac2..04b0564ab1c 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java @@ -1,10 +1,9 @@ package com.sap.sailing.selenium.core; -import java.util.Set; import java.util.function.BiConsumer; +import java.util.function.Supplier; import org.openqa.selenium.Dimension; -import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; /** @@ -14,9 +13,9 @@ import org.openqa.selenium.WebDriver; * Riccardo Nimser (D049941) */ public class WindowManager { - private static final String JAVA_SCRIPT = "window.open('%s', '_blank')"; - - private WebDriver driver; + private final WebDriver driver; + + private final Supplier webDriverFactory; /** *

@@ -24,81 +23,26 @@ public class WindowManager { * @param driver * */ - public WindowManager(WebDriver driver) { + public WindowManager(WebDriver driver, Supplier webDriverFactory) { this.driver = driver; + this.webDriverFactory = webDriverFactory; - setWindowMaximized(); - } - - /** - *

Returns a handle to the window witch is currently active.

- * - * @return - * - */ - private WebDriverWindow getCurrentWindow() { - return new WebDriverWindow(this.driver, this.driver.getWindowHandle()); - } - - /** - *

- * - * @return - */ - private WebDriverWindow openNewWindow() { - return openNewWindow(false); - } - - private WebDriverWindow openNewWindow(boolean focus) { - return openNewWindow("", focus); - } - - private WebDriverWindow openNewWindow(String url, boolean focus) { - WebDriverWindow window = new WebDriverWindow(this.driver, createWindow(url)); - - if(focus) { - window.switchToWindow(); - } - - return window; - } - - private String createWindow(String url) { - // Record old handles - Set oldHandles = this.driver.getWindowHandles(); - - executeScript(url != null ? url : ""); - - return getNewHandle(oldHandles); - } - - private void executeScript(String url) { - JavascriptExecutor executor = (JavascriptExecutor) this.driver; - executor.executeScript(String.format(JAVA_SCRIPT, url)); - } - - private String getNewHandle(Set oldHandles) { - Set newHandles = this.driver.getWindowHandles(); - newHandles.removeAll(oldHandles); - - // Find the new window - for(String handle : newHandles) - return handle; - - return null; + setWindowMaximized(this.driver); } public void withExtraWindow(BiConsumer defaultAndExtraWindow) { - final WebDriverWindow defaultWindow = getCurrentWindow(); - final WebDriverWindow extraWindow = openNewWindow(); + final WebDriverWindow defaultWindow = new WebDriverWindow(this.driver, this.driver.getWindowHandle()); + final WebDriver extraDriver = webDriverFactory.get(); + final WebDriverWindow extraWindow = new WebDriverWindow(extraDriver, extraDriver.getWindowHandle()); + extraWindow.switchToWindow(); - setWindowMaximized(); + setWindowMaximized(extraDriver); defaultWindow.switchToWindow(); try { defaultAndExtraWindow.accept(defaultWindow, extraWindow); } finally { try { - extraWindow.close(); + extraDriver.quit(); } catch (Exception e) { // This call may fail depending on the WebDriver being used } @@ -106,7 +50,7 @@ public class WindowManager { } } - private void setWindowMaximized() { + private void setWindowMaximized(WebDriver driver) { try { driver.manage().window().maximize(); } catch (Exception e) { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/TestEnvironmentImpl.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/TestEnvironmentImpl.java index 1aefca9dbec..410c28113f3 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/TestEnvironmentImpl.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/TestEnvironmentImpl.java @@ -1,6 +1,7 @@ package com.sap.sailing.selenium.core.impl; import java.io.File; +import java.util.function.Supplier; import org.openqa.selenium.WebDriver; @@ -29,12 +30,12 @@ public class TestEnvironmentImpl implements TestEnvironment { * @param screenshotsFolder * The folder where screenshots should be stored. */ - public TestEnvironmentImpl(WebDriver driver, String root, File screenshotsFolder) { - this.driver = driver; + public TestEnvironmentImpl(Supplier webDriverFactory, String root, File screenshotsFolder) { + this.driver = webDriverFactory.get(); this.root = root; this.screenshotsFolder = screenshotsFolder; - this.manager = new WindowManager(driver); + this.manager = new WindowManager(driver, webDriverFactory); } @Override diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java index 4e33da33117..c78b05da990 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java @@ -63,8 +63,8 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest { super.setUp(); } - private TrackedRacesCompetitorsPanelPO goToCompetitorsPanel() { - final AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); + private TrackedRacesCompetitorsPanelPO goToCompetitorsPanel(WebDriver driver) { + final AdminConsolePage adminConsole = AdminConsolePage.goToPage(driver, getContextRoot()); final TrackedRacesCompetitorsPanelPO competitorsPanel = adminConsole.goToTrackedRacesCompetitors(); return competitorsPanel; } @@ -72,8 +72,8 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest { @Test public void testMaintenanceOfSelectionAfterDataChanges() { this.environment.getWindowManager().withExtraWindow((windowForSelection, windowForEdit) -> { - windowForEdit.switchToWindow(); - final TrackedRacesCompetitorsPanelPO competitorsPanel = goToCompetitorsPanel(); + final TrackedRacesCompetitorsPanelPO competitorsPanel = goToCompetitorsPanel( + windowForEdit.switchToWindow()); for (int i = 0; i < 2; i++) { TrackedRacesCompetitorEditDialogPO dialog = competitorsPanel.pushAddCompetitorButton(); @@ -100,8 +100,8 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest { } assertTrue(found); - windowForSelection.switchToWindow(); - TrackedRacesCompetitorsPanelPO competitorPanelForSelection = goToCompetitorsPanel(); + TrackedRacesCompetitorsPanelPO competitorPanelForSelection = goToCompetitorsPanel( + windowForSelection.switchToWindow()); found = false; for (final CompetitorEntry it : competitorPanelForSelection.getCompetitorTable().getEntries()) { String itName = it.getName(); @@ -195,7 +195,6 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest { @Test public void testRefreshOfDependingUIElements() { this.environment.getWindowManager().withExtraWindow((windowForSelection, windowForEdit) -> { - windowForSelection.switchToWindow(); setUpTestRefreshOfDependingUIElements(); AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); SmartphoneTrackingEventManagementPanelPO smartphoneTrackingPanel = adminConsole.goToSmartphoneTrackingPanel(); @@ -217,9 +216,7 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest { assertEquals(5, anzRaceColumns); // Open a second window & setup second window - windowForEdit.switchToWindow(); - - AdminConsolePage adminConsoleForEdit = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); + AdminConsolePage adminConsoleForEdit = AdminConsolePage.goToPage(windowForEdit.switchToWindow(), getContextRoot()); RegattaStructureManagementPanelPO regattaStructure = adminConsoleForEdit.goToRegattaStructure(); RegattaDetailsCompositePO regattaDetails = regattaStructure.getRegattaDetails(this.regatta); diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java index 6699a1c14c6..ffba44f925f 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java @@ -79,8 +79,8 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { assertThat(races.size(), equalTo(5)); assertThat(table.getEntries().size(), equalTo(28)); // the regatta already has the races linked; regatta leaderboard obtains competitors from regatta - adminConsoleWindow.switchToWindow(); - AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); + + AdminConsolePage adminConsole = AdminConsolePage.goToPage(adminConsoleWindow.switchToWindow(), getContextRoot()); LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration(); LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString()); @@ -121,8 +121,7 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { leaderboardDetails.linkRace(this.leaderboardRaces.get(3), this.trackedRaces.get(3)); leaderboardDetails.linkRace(this.leaderboardRaces.get(4), this.trackedRaces.get(4)); // Open the leaderboard in our second window - leaderboardWindow.switchToWindow(); - LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, false); + LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindow.switchToWindow(), getContextRoot(), LEADERBOARD, false); LeaderboardTablePO table = leaderboard.getLeaderboardTable(); // Go back to the administration console and delete third race adminConsoleWindow.switchToWindow(); @@ -157,9 +156,7 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { leaderboardDetails.linkRace(this.leaderboardRaces.get(4), this.trackedRaces.get(4)); // Open the leaderboard in our second window - leaderboardWindow.switchToWindow(); - - LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, false); + LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindow.switchToWindow(), getContextRoot(), LEADERBOARD, false); LeaderboardTablePO table = leaderboard.getLeaderboardTable(); // Go back to the administration console and rename the first race diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java index 6f8a664a726..a3c1722eb0a 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java @@ -61,8 +61,7 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { @Test public void testCorrectDisplayOfRaceColumnWithAndWithoutStartTimeInference() { this.environment.getWindowManager().withExtraWindow((adminConsoleWindow, leaderboardWindow) -> { - leaderboardWindow.switchToWindow(); - LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, /* race details */ false); + LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindow.switchToWindow(), getContextRoot(), LEADERBOARD, /* race details */ false); LeaderboardTablePO leaderboardTable = leaderboard.getLeaderboardTable(); List races = leaderboardTable.getRaceNames(); assertThat("Expected only D3", races, equalTo(Arrays.asList("D3"))); @@ -78,6 +77,7 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { RegattaEditDialogPO regattaEditDialog = regattaList.editRegatta(regatta); regattaEditDialog.setUseStartTimeInference(false); regattaEditDialog.pressOk(); + leaderboardWindow.switchToWindow(); leaderboard.refresh(); for (LeaderboardEntry e : leaderboardTable.getEntries()) { From 1021723c7e51be3e204dfca04d7a0cdd36b83f97 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Tue, 24 Jul 2018 14:30:18 +0200 Subject: [PATCH 046/197] Bug 4339: Fixed session handling for multi window setup --- .../sailing/selenium/test/AbstractSeleniumTest.java | 8 ++++---- .../adminconsole/TestRefreshableSelectionModel.java | 8 ++++++-- .../leaderboard/TestLeaderboardConfiguration.java | 13 ++++++++++--- .../TestSwitchingOffStartOfRaceInference.java | 5 ++++- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java index bc2c74a04e5..773dcac57e0 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java @@ -105,12 +105,12 @@ public abstract class AbstractSeleniumTest { } } - protected void setUpAuthenticatedSession() { + protected void setUpAuthenticatedSession(WebDriver webDriver) { logger.info("Authenticating session..."); Cookie sessionCookie = authenticate(getContextRoot()); - getWebDriver().get(getContextRoot() + "index.html"); // initialize web driver so setting a cookie for the local domain is possible + webDriver.get(getContextRoot() + "index.html"); // initialize web driver so setting a cookie for the local domain is possible final Cookie cookieWithoutDomain = new Cookie(sessionCookie.getName(), sessionCookie.getValue(), null, sessionCookie.getPath(), sessionCookie.getExpiry(), sessionCookie.isSecure(), sessionCookie.isHttpOnly()); - getWebDriver().manage().addCookie(cookieWithoutDomain); + webDriver.manage().addCookie(cookieWithoutDomain); logger.info("...obtained session cookie "+sessionCookie); } @@ -122,7 +122,7 @@ public abstract class AbstractSeleniumTest { */ @Before public void setUp() { - setUpAuthenticatedSession(); + setUpAuthenticatedSession(getWebDriver()); } /** diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java index c78b05da990..cd3666aee2a 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java @@ -72,8 +72,10 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest { @Test public void testMaintenanceOfSelectionAfterDataChanges() { this.environment.getWindowManager().withExtraWindow((windowForSelection, windowForEdit) -> { + final WebDriver windowForEditDriver = windowForEdit.switchToWindow(); + setUpAuthenticatedSession(windowForEditDriver); final TrackedRacesCompetitorsPanelPO competitorsPanel = goToCompetitorsPanel( - windowForEdit.switchToWindow()); + windowForEditDriver); for (int i = 0; i < 2; i++) { TrackedRacesCompetitorEditDialogPO dialog = competitorsPanel.pushAddCompetitorButton(); @@ -216,7 +218,9 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest { assertEquals(5, anzRaceColumns); // Open a second window & setup second window - AdminConsolePage adminConsoleForEdit = AdminConsolePage.goToPage(windowForEdit.switchToWindow(), getContextRoot()); + final WebDriver windowForEditDriver = windowForEdit.switchToWindow(); + setUpAuthenticatedSession(windowForEditDriver); + AdminConsolePage adminConsoleForEdit = AdminConsolePage.goToPage(windowForEditDriver, getContextRoot()); RegattaStructureManagementPanelPO regattaStructure = adminConsoleForEdit.goToRegattaStructure(); RegattaDetailsCompositePO regattaDetails = regattaStructure.getRegattaDetails(this.regatta); diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java index ffba44f925f..71f0effacaf 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java @@ -10,6 +10,7 @@ import java.util.List; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.openqa.selenium.WebDriver; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; @@ -80,7 +81,9 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { assertThat(races.size(), equalTo(5)); assertThat(table.getEntries().size(), equalTo(28)); // the regatta already has the races linked; regatta leaderboard obtains competitors from regatta - AdminConsolePage adminConsole = AdminConsolePage.goToPage(adminConsoleWindow.switchToWindow(), getContextRoot()); + final WebDriver adminConsoleWindowDriver = leaderboardWindow.switchToWindow(); + setUpAuthenticatedSession(adminConsoleWindowDriver); + AdminConsolePage adminConsole = AdminConsolePage.goToPage(adminConsoleWindowDriver, getContextRoot()); LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration(); LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString()); @@ -121,7 +124,9 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { leaderboardDetails.linkRace(this.leaderboardRaces.get(3), this.trackedRaces.get(3)); leaderboardDetails.linkRace(this.leaderboardRaces.get(4), this.trackedRaces.get(4)); // Open the leaderboard in our second window - LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindow.switchToWindow(), getContextRoot(), LEADERBOARD, false); + final WebDriver leaderboardWindowDriver = leaderboardWindow.switchToWindow(); + setUpAuthenticatedSession(leaderboardWindowDriver); + LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindowDriver, getContextRoot(), LEADERBOARD, false); LeaderboardTablePO table = leaderboard.getLeaderboardTable(); // Go back to the administration console and delete third race adminConsoleWindow.switchToWindow(); @@ -156,7 +161,9 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { leaderboardDetails.linkRace(this.leaderboardRaces.get(4), this.trackedRaces.get(4)); // Open the leaderboard in our second window - LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindow.switchToWindow(), getContextRoot(), LEADERBOARD, false); + final WebDriver leaderboardWindowDriver = leaderboardWindow.switchToWindow(); + setUpAuthenticatedSession(leaderboardWindowDriver); + LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindowDriver, getContextRoot(), LEADERBOARD, false); LeaderboardTablePO table = leaderboard.getLeaderboardTable(); // Go back to the administration console and rename the first race diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java index a3c1722eb0a..45ad3626cc8 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java @@ -10,6 +10,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; +import org.openqa.selenium.WebDriver; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; @@ -61,7 +62,9 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { @Test public void testCorrectDisplayOfRaceColumnWithAndWithoutStartTimeInference() { this.environment.getWindowManager().withExtraWindow((adminConsoleWindow, leaderboardWindow) -> { - LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindow.switchToWindow(), getContextRoot(), LEADERBOARD, /* race details */ false); + final WebDriver leaderboardWindowDriver = leaderboardWindow.switchToWindow(); + setUpAuthenticatedSession(leaderboardWindowDriver); + LeaderboardPage leaderboard = LeaderboardPage.goToPage(leaderboardWindowDriver, getContextRoot(), LEADERBOARD, /* race details */ false); LeaderboardTablePO leaderboardTable = leaderboard.getLeaderboardTable(); List races = leaderboardTable.getRaceNames(); assertThat("Expected only D3", races, equalTo(Arrays.asList("D3"))); From 44d0608eb38c045d562214d9de28ec967bb27764 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 30 Jul 2018 15:22:04 +0200 Subject: [PATCH 047/197] Bug 4693: Taking screenshots of all open windows in case of a test failure / Improved cleanup of opened windows after a test case finished --- .../selenium/core/WebDriverWindow.java | 4 ++ .../sailing/selenium/core/WindowManager.java | 49 +++++++++++++---- .../selenium/test/AbstractSeleniumTest.java | 53 +++++++++++-------- 3 files changed, 75 insertions(+), 31 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WebDriverWindow.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WebDriverWindow.java index 162cdfab3aa..0994be1acbf 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WebDriverWindow.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WebDriverWindow.java @@ -50,4 +50,8 @@ public class WebDriverWindow { if(!handles.contains(this.handle)) throw new WebDriverException("Window closed or not initialized"); //$NON-NLS-1$ } + + public WebDriver getWebDriver() { + return driver; + } } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java index 04b0564ab1c..e6adf8e9d98 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java @@ -1,6 +1,9 @@ package com.sap.sailing.selenium.core; +import java.util.HashSet; +import java.util.Set; import java.util.function.BiConsumer; +import java.util.function.Consumer; import java.util.function.Supplier; import org.openqa.selenium.Dimension; @@ -13,6 +16,8 @@ import org.openqa.selenium.WebDriver; * Riccardo Nimser (D049941) */ public class WindowManager { + private final WebDriverWindow defaultWindow; + private final Set allWindows = new HashSet<>(); private final WebDriver driver; private final Supplier webDriverFactory; @@ -25,28 +30,28 @@ public class WindowManager { */ public WindowManager(WebDriver driver, Supplier webDriverFactory) { this.driver = driver; + defaultWindow = new ManagedWebDriverWindow(this.driver, this.driver.getWindowHandle()); this.webDriverFactory = webDriverFactory; setWindowMaximized(this.driver); } public void withExtraWindow(BiConsumer defaultAndExtraWindow) { - final WebDriverWindow defaultWindow = new WebDriverWindow(this.driver, this.driver.getWindowHandle()); final WebDriver extraDriver = webDriverFactory.get(); - final WebDriverWindow extraWindow = new WebDriverWindow(extraDriver, extraDriver.getWindowHandle()); + final WebDriverWindow extraWindow = new ManagedWebDriverWindow(extraDriver, extraDriver.getWindowHandle()); extraWindow.switchToWindow(); setWindowMaximized(extraDriver); defaultWindow.switchToWindow(); + + defaultAndExtraWindow.accept(defaultWindow, extraWindow); try { - defaultAndExtraWindow.accept(defaultWindow, extraWindow); - } finally { - try { - extraDriver.quit(); - } catch (Exception e) { - // This call may fail depending on the WebDriver being used - } - defaultWindow.switchToWindow(); + // quit is explicitly not called in a finally block to ensure that both windows are still open + // when trying to create screenshots in case an error occurs + extraWindow.close(); + extraDriver.quit(); + } catch (Exception e) { + // This call may fail depending on the WebDriver being used } } @@ -64,4 +69,28 @@ public class WindowManager { } } } + + public void forEachOpenedWindow(Consumer windowConsumer) { + this.allWindows.forEach(windowConsumer); + } + + public void closeAllExtraWindows() { + this.allWindows.forEach(window -> { + if (window != defaultWindow) { + window.close(); + } + }); + } + + private class ManagedWebDriverWindow extends WebDriverWindow { + protected ManagedWebDriverWindow(WebDriver driver, String handle) { + super(driver, handle); + allWindows.add(this); + } + @Override + public void close() { + allWindows.remove(this); + super.close(); + } + } } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java index 773dcac57e0..6006818d5f6 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java @@ -172,7 +172,7 @@ public abstract class AbstractSeleniumTest { // } //} - private class ScreenShotRule extends TestWatchman { + private class ScreenShotAndCloseWindowRule extends TestWatchman { @Override public void failed(Throwable cause, FrameworkMethod method) { try { @@ -181,13 +181,22 @@ public abstract class AbstractSeleniumTest { exception.printStackTrace(); } } + + @Override + public void finished(FrameworkMethod method) { + try { + environment.getWindowManager().closeAllExtraWindows(); + } finally { + super.finished(method); + } + } } /** *

Rule for capturing of a screenshot if a test fails.

*/ @Rule - public final ScreenShotRule takeScreenshoot = new ScreenShotRule(/*generator*/); + public final ScreenShotAndCloseWindowRule takeScreenshotAndCloseWindows = new ScreenShotAndCloseWindowRule(/*generator*/); /** *

The test environment used for the execution of the the tests.

@@ -243,25 +252,27 @@ public abstract class AbstractSeleniumTest { protected void captureScreenshot(String filename) { File screenshotFolder = this.environment.getScreenshotFolder(); if (screenshotFolder != null) { - WebDriver driver = getWebDriver(); - if (RemoteWebDriver.class.equals(driver.getClass())) { - driver = new Augmenter().augment(driver); - } - InputStream source = getScreenshotNotSupportedImage(); - if (driver instanceof TakesScreenshot) { - source = new ByteArrayInputStream(((TakesScreenshot) driver).getScreenshotAs(OutputType.BYTES)); - } - try { - File destinationDir = new File(screenshotFolder, getClass().getName()); - destinationDir.mkdirs(); - File destination = new File(destinationDir, filename + SCREENSHOT_FILE_EXTENSION); //$NON-NLS-1$ - Path path = destination.toPath(); - Files.copy(source, path, StandardCopyOption.REPLACE_EXISTING); - // ATTENTION: Do not remove this line because it is needed for the JUnit Attachment Plugin! - System.out.println(String.format(ATTACHMENT_FORMAT, destination.getCanonicalFile().toURI())); - } catch (IOException exception) { - throw new RuntimeException(exception); - } + this.environment.getWindowManager().forEachOpenedWindow(window -> { + WebDriver driver = window.getWebDriver(); + if (RemoteWebDriver.class.equals(driver.getClass())) { + driver = new Augmenter().augment(driver); + } + InputStream source = getScreenshotNotSupportedImage(); + if (driver instanceof TakesScreenshot) { + source = new ByteArrayInputStream(((TakesScreenshot) driver).getScreenshotAs(OutputType.BYTES)); + } + try { + File destinationDir = new File(screenshotFolder, getClass().getName()); + destinationDir.mkdirs(); + File destination = new File(destinationDir, filename + SCREENSHOT_FILE_EXTENSION); //$NON-NLS-1$ + Path path = destination.toPath(); + Files.copy(source, path, StandardCopyOption.REPLACE_EXISTING); + // ATTENTION: Do not remove this line because it is needed for the JUnit Attachment Plugin! + System.out.println(String.format(ATTACHMENT_FORMAT, destination.getCanonicalFile().toURI())); + } catch (IOException exception) { + throw new RuntimeException(exception); + } + }); } } From 6bfabdc1cb26c65b43e15a0836ce69226d0d085b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 30 Jul 2018 15:30:29 +0200 Subject: [PATCH 048/197] bug4682 further simplified state handling, found a case of method underriding, changed to properly overriden methods, changed withwidget for isWidget --- ...ainer.java => AbstractMediaContainer.java} | 19 +-- ...loatingMediaPlayerContainerContainer.java} | 20 +-- .../client/media/MediaManagementControl.java | 6 +- ...ntainer.java => MediaPlayerContainer.java} | 6 +- .../ui/client/media/MediaPlayerManager.java | 4 +- .../media/MediaPlayerManagerComponent.java | 141 ++++++++--------- .../ui/client/media/VideoDockedContainer.java | 6 +- .../ui/client/media/VideoJSSyncPlayer.java | 6 +- .../ui/client/media/VideoYoutubePlayer.java | 8 +- .../media/popup/PopoutWindowPlayer.java | 142 +++++++++--------- ...SynchPlayer.java => MediaSynchPlayer.java} | 3 +- .../ui/client/media/shared/VideoPlayer.java | 5 - .../media/shared/VideoPlayerWithWidget.java | 6 - .../ui/client/media/shared/WithWidget.java | 9 -- 14 files changed, 172 insertions(+), 209 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/{AbstractVideoContainer.java => AbstractMediaContainer.java} (61%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/{VideoFloatingContainer.java => FloatingMediaPlayerContainerContainer.java} (85%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/{VideoContainer.java => MediaPlayerContainer.java} (68%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/{VideoSynchPlayer.java => MediaSynchPlayer.java} (68%) delete mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoPlayer.java delete mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoPlayerWithWidget.java delete mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/WithWidget.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractVideoContainer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaContainer.java similarity index 61% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractVideoContainer.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaContainer.java index e19cebdd737..f7d23be1003 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractVideoContainer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaContainer.java @@ -2,20 +2,19 @@ package com.sap.sailing.gwt.ui.client.media; import com.google.gwt.user.client.ui.Panel; import com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer.PlayerCloseListener; -import com.sap.sailing.gwt.ui.client.media.shared.VideoPlayer; -import com.sap.sailing.gwt.ui.client.media.shared.VideoSynchPlayer; +import com.sap.sailing.gwt.ui.client.media.shared.MediaSynchPlayer; -public abstract class AbstractVideoContainer { +public abstract class AbstractMediaContainer implements MediaPlayerContainer { protected final PlayerCloseListener popupCloseListener; protected final PopoutListener popoutListener; - protected final VideoSynchPlayer videoPlayer; + protected final MediaSynchPlayer mediaPlayer; protected final Panel rootPanel; - public AbstractVideoContainer(Panel rootPanel, VideoSynchPlayer videoPlayer, PopoutListener popoutListener, PlayerCloseListener playerCloseListener) { + public AbstractMediaContainer(Panel rootPanel, MediaSynchPlayer videoPlayer, PopoutListener popoutListener, PlayerCloseListener playerCloseListener) { this.rootPanel = rootPanel; - this.videoPlayer = videoPlayer; + this.mediaPlayer = videoPlayer; this.popoutListener = popoutListener; this.popupCloseListener = playerCloseListener; } @@ -24,13 +23,15 @@ public abstract class AbstractVideoContainer { abstract void show(); + @Override public void shutDown() { - videoPlayer.shutDown(); + mediaPlayer.shutDown(); hide(); } - public VideoPlayer getVideoPlayer() { - return videoPlayer; + @Override + public MediaSynchPlayer getMediaPlayer() { + return mediaPlayer; } } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoFloatingContainer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainerContainer.java similarity index 85% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoFloatingContainer.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainerContainer.java index afd9c175186..a2a23ab24a7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoFloatingContainer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainerContainer.java @@ -18,12 +18,12 @@ import com.google.gwt.user.client.ui.PopupPanel; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; import com.sap.sailing.gwt.ui.client.media.MediaSynchControl.EditButtonProxy; import com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer.PlayerCloseListener; -import com.sap.sailing.gwt.ui.client.media.shared.VideoSynchPlayer; +import com.sap.sailing.gwt.ui.client.media.shared.MediaSynchPlayer; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.dialog.WindowBox; import com.sap.sse.security.ui.client.UserService; -public class VideoFloatingContainer extends AbstractVideoContainer implements VideoContainer { +public class FloatingMediaPlayerContainerContainer extends AbstractMediaContainer implements MediaPlayerContainer { VideoContainerRessource res = GWT.create(VideoContainerRessource.class); private static final int MIN_WIDTH = 420; @@ -32,7 +32,7 @@ public class VideoFloatingContainer extends AbstractVideoContainer implements Vi private final PopupPositionProvider popupPositionProvider; private Anchor edit; - public VideoFloatingContainer(VideoSynchPlayer videoPlayer, PopupPositionProvider popupPositionProvider, + public FloatingMediaPlayerContainerContainer(MediaSynchPlayer videoPlayer, PopupPositionProvider popupPositionProvider, UserService userservice, MediaServiceAsync mediaService, ErrorReporter errorReporter, PlayerCloseListener playerCloseListener, PopoutListener popoutListener) { super(new FlowPanel(), videoPlayer, popoutListener, playerCloseListener); @@ -40,7 +40,7 @@ public class VideoFloatingContainer extends AbstractVideoContainer implements Vi this.popupPositionProvider = popupPositionProvider; rootPanel.addStyleName("video-root-panel"); - rootPanel.add(videoPlayer.getWidget()); + rootPanel.add(videoPlayer.asWidget()); this.edit = new Anchor(); this.edit.getElement().getStyle().setBackgroundImage("url('" + res.editIcon().getSafeUri().asString() + "')"); @@ -66,7 +66,7 @@ public class VideoFloatingContainer extends AbstractVideoContainer implements Vi edit.getElement().getStyle().setDisplay(b ? Display.BLOCK : Display.NONE); } }; - mediaSynchControl = new MediaSynchControl(this.videoPlayer, mediaService, errorReporter, proxy, userservice); + mediaSynchControl = new MediaSynchControl(this.mediaPlayer, mediaService, errorReporter, proxy, userservice); mediaSynchControl.widget().addStyleName("media-synch-control"); rootPanel.add(mediaSynchControl.widget()); @@ -77,8 +77,8 @@ public class VideoFloatingContainer extends AbstractVideoContainer implements Vi @Override public void popout() { - VideoFloatingContainer.this.popoutListener - .popoutVideo(VideoFloatingContainer.this.videoPlayer.getMediaTrack()); + FloatingMediaPlayerContainerContainer.this.popoutListener + .popoutVideo(FloatingMediaPlayerContainerContainer.this.mediaPlayer.getMediaTrack()); } }); // values required for js and youtube player to stay useable @@ -90,8 +90,8 @@ public class VideoFloatingContainer extends AbstractVideoContainer implements Vi @Override public void onClose(CloseEvent event) { - VideoFloatingContainer.this.videoPlayer.pauseMedia(); - VideoFloatingContainer.this.popupCloseListener.playerClosed(); + FloatingMediaPlayerContainerContainer.this.mediaPlayer.pauseMedia(); + FloatingMediaPlayerContainerContainer.this.popupCloseListener.playerClosed(); } }); @@ -140,7 +140,7 @@ public class VideoFloatingContainer extends AbstractVideoContainer implements Vi int absoluteTop = popupPositionProvider.getYPositionUiObject().getAbsoluteTop(); int posY = absoluteTop - dialogBox.getOffsetHeight() - 40; dialogBox.setPopupPosition(5, posY); - dialogBox.setPixelSize(videoPlayer.getDefaultWidth(), videoPlayer.getDefaultHeight()); + dialogBox.setPixelSize(mediaPlayer.getDefaultWidth(), mediaPlayer.getDefaultHeight()); dialogBox.setVisible(true); } }); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java index 62111d483d1..5ffe8ef7359 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java @@ -239,11 +239,9 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem @Override public void onValueChange(ValueChangeEvent changeEvent) { if (changeEvent.getValue()) { - MediaTrack currentlyPlaying = mediaPlayerManager.getPlayingAudioTrack(); + Set currentlyPlaying = mediaPlayerManager.getPlayingAudioTrack(); if (audioTrack == null) { - if (currentlyPlaying != null) { - mediaPlayerManager.closeFloatingPlayer(currentlyPlaying); - } + currentlyPlaying.forEach(f -> mediaPlayerManager.closeFloatingPlayer(f)); } else { mediaPlayerManager.playAudio(audioTrack); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoContainer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerContainer.java similarity index 68% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoContainer.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerContainer.java index bb6eca45c1e..54e0c2e904d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoContainer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerContainer.java @@ -1,19 +1,19 @@ package com.sap.sailing.gwt.ui.client.media; -import com.sap.sailing.gwt.ui.client.media.shared.VideoPlayer; +import com.sap.sailing.gwt.ui.client.media.shared.MediaPlayer; /** * Interface to decouple container lifecycle from VideoPlayer functionality. * @author D047974 * */ -public interface VideoContainer { +public interface MediaPlayerContainer { /** * Terminate all playing, release resources and make the container disappear from the UI. */ void shutDown(); - VideoPlayer getVideoPlayer(); + MediaPlayer getMediaPlayer(); } 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 f86864984aa..9f667cd1dfd 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 @@ -44,7 +44,7 @@ public interface MediaPlayerManager { Boolean isPlaying(); - MediaTrack getPlayingAudioTrack(); + Set getPlayingAudioTrack(); Set getPlayingVideoTracks(); @@ -53,7 +53,7 @@ public interface MediaPlayerManager { Collection getOverlappingMediaTracks(); List getAudioTracks(); - + List getVideoTracks(); MediaTrack getDockedVideoTrack(); 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 855f45d2640..416e029bef8 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 @@ -9,6 +9,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; import com.google.gwt.dom.client.MediaElement; import com.google.gwt.dom.client.VideoElement; @@ -34,8 +35,7 @@ import com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer.PlayerCloseL import com.sap.sailing.gwt.ui.client.media.popup.VideoJSWindowPlayer; import com.sap.sailing.gwt.ui.client.media.popup.YoutubeWindowPlayer; import com.sap.sailing.gwt.ui.client.media.shared.MediaPlayer; -import com.sap.sailing.gwt.ui.client.media.shared.VideoPlayer; -import com.sap.sailing.gwt.ui.client.media.shared.VideoSynchPlayer; +import com.sap.sailing.gwt.ui.client.media.shared.MediaSynchPlayer; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -59,16 +59,15 @@ public class MediaPlayerManagerComponent extends AbstractComponent, ClosingHandler { static interface VideoContainerFactory { - T createVideoContainer(VideoSynchPlayer videoPlayer, UserService userService, MediaServiceAsync mediaService, + T createVideoContainer(MediaSynchPlayer videoPlayer, UserService userService, MediaServiceAsync mediaService, ErrorReporter errorReporter, PlayerCloseListener playerCloseListener, PopoutListener popoutListener); } private final SimplePanel rootPanel = new SimplePanel(); private final UserService userService; - private MediaPlayer activeAudioPlayer; - private VideoPlayer dockedVideoPlayer; - private final Map activeVideoContainers = new HashMap(); + private MediaPlayer dockedVideoPlayer; + private final Map activePlayerContainers = new HashMap(); private Collection assignedMediaTracks = new ArrayList<>(); private Collection overlappingMediaTracks = new ArrayList<>(); private Map mediaTrackStatus = new HashMap<>(); @@ -238,15 +237,15 @@ public class MediaPlayerManagerComponent extends AbstractComponent() { @Override - public VideoDockedContainer createVideoContainer(VideoSynchPlayer videoPlayer, + public VideoDockedContainer createVideoContainer(MediaSynchPlayer videoPlayer, UserService userService, MediaServiceAsync mediaService, ErrorReporter errorReporter, PlayerCloseListener playerCloseListener, PopoutListener popoutListener) { VideoDockedContainer videoDockedContainer = new VideoDockedContainer(rootPanel, @@ -372,20 +371,20 @@ public class MediaPlayerManagerComponent extends AbstractComponent getActiveAudioContainers() { + return activePlayerContainers.entrySet().stream() + .filter(f -> (f.getKey().mimeType.mediaType == MediaType.audio)).map(f -> f.getValue()) + .collect(Collectors.toList()); } @Override public void muteAudio() { - if (activeAudioPlayer != null) { - closeFloatingPlayer(activeAudioPlayer.getMediaTrack()); + for (MediaPlayerContainer player : getActiveAudioContainers()) { + closeFloatingPlayer(player.getMediaPlayer().getMediaTrack()); } } @@ -394,15 +393,15 @@ public class MediaPlayerManagerComponent extends AbstractComponent() { + FloatingMediaPlayerContainerContainer videoFloatingContainer = createAndWrapVideoPlayer(videoTrack, + new VideoContainerFactory() { @Override - public VideoFloatingContainer createVideoContainer(VideoSynchPlayer videoPlayer, + public FloatingMediaPlayerContainerContainer createVideoContainer(MediaSynchPlayer videoPlayer, UserService userservice, MediaServiceAsync mediaService, ErrorReporter errorReporter, PlayerCloseListener playerCloseListener, PopoutListener popoutListener) { - VideoFloatingContainer videoFloatingContainer = new VideoFloatingContainer(videoPlayer, popupPositionProvider, + FloatingMediaPlayerContainerContainer videoFloatingContainer = new FloatingMediaPlayerContainerContainer(videoPlayer, popupPositionProvider, userservice, mediaService, errorReporter, playerCloseListener, popoutListener); return videoFloatingContainer; } @@ -417,7 +416,7 @@ public class MediaPlayerManagerComponent extends AbstractComponent T createAndWrapVideoPlayer(final MediaTrack videoTrack, VideoContainerFactory videoContainerFactory) { final PopoutWindowPlayer.PlayerCloseListener playerCloseListener = new PopoutWindowPlayer.PlayerCloseListener() { - private VideoContainer videoContainer; + private MediaPlayerContainer videoContainer; @Override public void playerClosed() { @@ -430,14 +429,14 @@ public class MediaPlayerManagerComponent extends AbstractComponent(activeVideoContainers.values())) { // using a + for (MediaPlayerContainer mediaContainer : new ArrayList(activePlayerContainers.values())) { // using a // copy to // prevent // a // ConcurrentModificationException - videoContainer.shutDown(); + mediaContainer.shutDown(); } - activeVideoContainers.clear(); + activePlayerContainers.clear(); notifyStateChange(); } @@ -633,7 +611,7 @@ public class MediaPlayerManagerComponent extends AbstractComponent getPlayingVideoTracks() { - return activeVideoContainers.keySet(); + return activePlayerContainers.keySet(); } @Override @@ -688,6 +661,17 @@ public class MediaPlayerManagerComponent extends AbstractComponent getAudioTracks() { + List result = new ArrayList(); + for (MediaTrack mediaTrack : assignedMediaTracks) { + if (mediaTrack.mimeType != null && mediaTrack.mimeType.mediaType == MediaType.audio) { + result.add(mediaTrack); + } + } + return result; + } + @Override public String getLocalizedShortName() { return mediaPlayerLifecycle.getLocalizedShortName(); @@ -733,17 +717,6 @@ public class MediaPlayerManagerComponent extends AbstractComponent getAudioTracks() { - List result = new ArrayList(); - for (MediaTrack mediaTrack : assignedMediaTracks) { - if (mediaTrack.mimeType != null && mediaTrack.mimeType.mediaType == MediaType.audio) { - result.add(mediaTrack); - } - } - return result; - } - @Override public UserAgentDetails getUserAgent() { return userAgent; @@ -768,4 +741,10 @@ public class MediaPlayerManagerComponent extends AbstractComponent getPlayingAudioTrack() { + return getActiveAudioContainers().stream().map(f -> f.getMediaPlayer().getMediaTrack()) + .collect(Collectors.toSet()); + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoDockedContainer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoDockedContainer.java index 32db511d9f3..630d9509f51 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoDockedContainer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoDockedContainer.java @@ -2,11 +2,11 @@ package com.sap.sailing.gwt.ui.client.media; import com.google.gwt.user.client.ui.Panel; import com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer.PlayerCloseListener; -import com.sap.sailing.gwt.ui.client.media.shared.VideoSynchPlayer; +import com.sap.sailing.gwt.ui.client.media.shared.MediaSynchPlayer; -public class VideoDockedContainer extends AbstractVideoContainer implements VideoContainer { +public class VideoDockedContainer extends AbstractMediaContainer implements MediaPlayerContainer { - public VideoDockedContainer(Panel rootPanel, VideoSynchPlayer videoPlayer, PlayerCloseListener playerCloseListener, PopoutListener popoutListener) { + public VideoDockedContainer(Panel rootPanel, MediaSynchPlayer videoPlayer, PlayerCloseListener playerCloseListener, PopoutListener popoutListener) { super(rootPanel, videoPlayer, popoutListener, playerCloseListener); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSSyncPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSSyncPlayer.java index e3c7986873c..a6350155478 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSSyncPlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoJSSyncPlayer.java @@ -4,12 +4,12 @@ import com.google.gwt.user.client.ui.RequiresResize; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.gwt.ui.client.media.shared.AbstractMediaPlayer; -import com.sap.sailing.gwt.ui.client.media.shared.VideoSynchPlayer; +import com.sap.sailing.gwt.ui.client.media.shared.MediaSynchPlayer; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.gwt.client.player.Timer; -public class VideoJSSyncPlayer extends AbstractMediaPlayer implements VideoSynchPlayer, RequiresResize { +public class VideoJSSyncPlayer extends AbstractMediaPlayer implements MediaSynchPlayer, RequiresResize { private VideoJSPlayer videoJsDelegate; private EditFlag editFlag; @@ -79,7 +79,7 @@ public class VideoJSSyncPlayer extends AbstractMediaPlayer implements VideoSynch } @Override - public Widget getWidget() { + public Widget asWidget() { return videoJsDelegate; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoYoutubePlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoYoutubePlayer.java index 66d9a0f3166..b33ed10332d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoYoutubePlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoYoutubePlayer.java @@ -5,18 +5,18 @@ import java.util.List; import com.google.gwt.event.logical.shared.AttachEvent; import com.google.gwt.event.logical.shared.AttachEvent.Handler; +import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.gwt.ui.client.media.shared.AbstractMediaPlayer; -import com.sap.sailing.gwt.ui.client.media.shared.VideoSynchPlayer; -import com.sap.sailing.gwt.ui.client.media.shared.WithWidget; +import com.sap.sailing.gwt.ui.client.media.shared.MediaSynchPlayer; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.gwt.client.player.Timer; -public class VideoYoutubePlayer extends AbstractMediaPlayer implements VideoSynchPlayer, MediaSynchAdapter, WithWidget { +public class VideoYoutubePlayer extends AbstractMediaPlayer implements MediaSynchPlayer, MediaSynchAdapter, IsWidget { private interface DeferredAction { void execute(); @@ -245,7 +245,7 @@ public class VideoYoutubePlayer extends AbstractMediaPlayer implements VideoSync } @Override - public Widget getWidget() { + public Widget asWidget() { return videoContainer; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopoutWindowPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopoutWindowPlayer.java index 014cff12741..15d4086de15 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopoutWindowPlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopoutWindowPlayer.java @@ -3,16 +3,16 @@ package com.sap.sailing.gwt.ui.client.media.popup; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.user.client.Window; import com.sap.sailing.domain.common.media.MediaTrack; -import com.sap.sailing.gwt.ui.client.media.VideoContainer; +import com.sap.sailing.gwt.ui.client.media.MediaPlayerContainer; import com.sap.sailing.gwt.ui.client.media.shared.AbstractMediaPlayer; -import com.sap.sailing.gwt.ui.client.media.shared.VideoPlayer; +import com.sap.sailing.gwt.ui.client.media.shared.MediaPlayer; -public abstract class PopoutWindowPlayer extends AbstractMediaPlayer implements VideoPlayer, VideoContainer { +public abstract class PopoutWindowPlayer extends AbstractMediaPlayer implements MediaPlayer, MediaPlayerContainer { public interface PlayerCloseListener { void playerClosed(); - void setVideoContainer(VideoContainer videoContainer); + void setVideoContainer(MediaPlayerContainer videoContainer); } private final JavaScriptObject playerWindow; @@ -36,29 +36,33 @@ public abstract class PopoutWindowPlayer extends AbstractMediaPlayer implements protected abstract String getPlayerWindowUrl(); native JavaScriptObject openWindow(String url) /*-{ - return $wnd.open(url, '_blank', "resizable=yes, scrollbars=no, toolbar=no, menubar=no, status=no, location=no, directories=no, personalbar=no, width=660, height=380"); + return $wnd + .open( + url, + '_blank', + "resizable=yes, scrollbars=no, toolbar=no, menubar=no, status=no, location=no, directories=no, personalbar=no, width=660, height=380"); }-*/; @Override public native void shutDown() /*-{ - var playerWindow = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!playerWindow.closed) { - playerWindow.close(); - } + var playerWindow = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!playerWindow.closed) { + playerWindow.close(); + } }-*/; native JavaScriptObject registerNativeStuff() /*-{ - var that = this; - var window = that.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - window.onbeforeunload = function() { - that.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::onClosingPopup()(); - } - window.parent.deferredPlayState = { - deferredIsPlaying: false, - deferredIsMuted: true, - deferredMediaTime: 0, - playbackSpeed: 1 - }; + var that = this; + var window = that.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + window.onbeforeunload = function() { + that.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::onClosingPopup()(); + } + window.parent.deferredPlayState = { + deferredIsPlaying : false, + deferredIsMuted : true, + deferredMediaTime : 0, + playbackSpeed : 1 + }; }-*/; private void onClosingPopup() { @@ -68,90 +72,90 @@ public abstract class PopoutWindowPlayer extends AbstractMediaPlayer implements @Override public native void playMedia() /*-{ - var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!window.parent.videoPlayer) { - window.parent.deferredPlayState.deferredIsPlaying = true; - } else { - window.parent.videoPlayer.play(); - } + var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!window.parent.videoPlayer) { + window.parent.deferredPlayState.deferredIsPlaying = true; + } else { + window.parent.videoPlayer.play(); + } }-*/; @Override public native void pauseMedia() /*-{ - var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!window.parent.videoPlayer) { - window.parent.deferredPlayState.deferredIsPlaying = false; - } else { - window.parent.videoPlayer.pause(); - } + var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!window.parent.videoPlayer) { + window.parent.deferredPlayState.deferredIsPlaying = false; + } else { + window.parent.videoPlayer.pause(); + } }-*/; @Override public native void setCurrentMediaTime(double mediaTime) /*-{ - var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!window.parent.videoPlayer) { - window.parent.deferredPlayState.deferredMediaTime = mediaTime; - } else { - window.parent.videoPlayer.setTime(mediaTime); - } + var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!window.parent.videoPlayer) { + window.parent.deferredPlayState.deferredMediaTime = mediaTime; + } else { + window.parent.videoPlayer.setTime(mediaTime); + } }-*/; @Override public native void setMuted(boolean muted) /*-{ - var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!window.parent.videoPlayer) { - window.parent.deferredPlayState.deferredIsMuted = muted; - } else { - window.parent.videoPlayer.setMuted(muted); - } + var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!window.parent.videoPlayer) { + window.parent.deferredPlayState.deferredIsMuted = muted; + } else { + window.parent.videoPlayer.setMuted(muted); + } }-*/; @Override public native boolean isMediaPaused() /*-{ - var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!window.parent.videoPlayer) { - return !window.parent.deferredPlayState.deferredIsPlaying; - } else { - return window.parent.videoPlayer.isPaused(); - } + var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!window.parent.videoPlayer) { + return !window.parent.deferredPlayState.deferredIsPlaying; + } else { + return window.parent.videoPlayer.isPaused(); + } }-*/; @Override public native double getDuration() /*-{ - var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!window.parent.videoPlayer) { - return NaN; - } else { - return window.parent.videoPlayer.getDuration(); - } + var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!window.parent.videoPlayer) { + return NaN; + } else { + return window.parent.videoPlayer.getDuration(); + } }-*/; @Override public native double getCurrentMediaTime() /*-{ - var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!window.parent.videoPlayer) { - return window.parent.deferredPlayState.deferredMediaTime; - } else { - return window.parent.videoPlayer.getTime(); - } + var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!window.parent.videoPlayer) { + return window.parent.deferredPlayState.deferredMediaTime; + } else { + return window.parent.videoPlayer.getTime(); + } }-*/; @Override public native void setPlaybackSpeed(double playbackSpeed) /*-{ - var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; - if (!window.parent.videoPlayer) { - window.parent.deferredPlayState.deferredPlaybackSpeed = playbackSpeed; - } else { - window.parent.videoPlayer.setPlaybackSpeed(playbackSpeed); - } + var window = this.@com.sap.sailing.gwt.ui.client.media.popup.PopoutWindowPlayer::playerWindow; + if (!window.parent.videoPlayer) { + window.parent.deferredPlayState.deferredPlaybackSpeed = playbackSpeed; + } else { + window.parent.videoPlayer.setPlaybackSpeed(playbackSpeed); + } }-*/; @Override - public VideoPlayer getVideoPlayer() { + public MediaPlayer getMediaPlayer() { return this; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoSynchPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/MediaSynchPlayer.java similarity index 68% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoSynchPlayer.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/MediaSynchPlayer.java index 03e6b0bfa98..d60dc49c627 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoSynchPlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/MediaSynchPlayer.java @@ -1,8 +1,9 @@ package com.sap.sailing.gwt.ui.client.media.shared; +import com.google.gwt.user.client.ui.IsWidget; import com.sap.sailing.gwt.ui.client.media.MediaSynchAdapter; -public interface VideoSynchPlayer extends VideoPlayerWithWidget, MediaSynchAdapter { +public interface MediaSynchPlayer extends IsWidget, MediaPlayer, MediaSynchAdapter { void setEditFlag(EditFlag editFlag); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoPlayer.java deleted file mode 100644 index 630b74534c0..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoPlayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.sap.sailing.gwt.ui.client.media.shared; - -public interface VideoPlayer extends MediaPlayer { - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoPlayerWithWidget.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoPlayerWithWidget.java deleted file mode 100644 index 11997c70bfd..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/VideoPlayerWithWidget.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.sap.sailing.gwt.ui.client.media.shared; - - -public interface VideoPlayerWithWidget extends VideoPlayer, WithWidget { - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/WithWidget.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/WithWidget.java deleted file mode 100644 index 72d2315135b..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/shared/WithWidget.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.sap.sailing.gwt.ui.client.media.shared; - -import com.google.gwt.user.client.ui.Widget; - -public interface WithWidget { - - Widget getWidget(); - -} From b83a6db112db8518e986bdb8498fb7ab6bd26357 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Mon, 30 Jul 2018 15:31:21 +0200 Subject: [PATCH 049/197] Bug 4693: Using a distinct file name for each screenshot to not override existing images --- .../com/sap/sailing/selenium/test/AbstractSeleniumTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java index 6006818d5f6..1879edf0d36 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java @@ -176,7 +176,7 @@ public abstract class AbstractSeleniumTest { @Override public void failed(Throwable cause, FrameworkMethod method) { try { - captureScreenshot(UUID.randomUUID().toString()); + captureScreenshots(); } catch (Exception exception) { exception.printStackTrace(); } @@ -249,10 +249,12 @@ public abstract class AbstractSeleniumTest { * @throws IOException * if an I/O error occurs. */ - protected void captureScreenshot(String filename) { + protected void captureScreenshots() { File screenshotFolder = this.environment.getScreenshotFolder(); if (screenshotFolder != null) { this.environment.getWindowManager().forEachOpenedWindow(window -> { + final String filename = UUID.randomUUID().toString(); + WebDriver driver = window.getWebDriver(); if (RemoteWebDriver.class.equals(driver.getClass())) { driver = new Augmenter().augment(driver); From c044382a21101511c44ff10be36408b3d5fba8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 30 Jul 2018 16:05:37 +0200 Subject: [PATCH 050/197] bug4682 improved deprecation explanation --- .../src/com/sap/sailing/domain/common/media/MediaTrack.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java index 9da7c3e3f14..1b2829289d3 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java @@ -26,6 +26,10 @@ public class MediaTrack implements Serializable { private static final long serialVersionUID = 1L; @Deprecated + /** + * Deprecated, as the server only used undefined in all cases. Left in, to not break serialisation/storage + * + */ public enum Status { UNDEFINED('?'), CANNOT_PLAY('-'), NOT_REACHABLE('#'), REACHABLE('+'); From 675ef72f35b6fe21f47c05d08072b204256f5839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 30 Jul 2018 16:46:13 +0200 Subject: [PATCH 051/197] bug4682 smaller refinements --- .../sap/sailing/gwt/ui/client/StringMessages.java | 1 - .../gwt/ui/client/StringMessages_de.properties | 3 ++- ...tainer.java => FloatingMediaPlayerContainer.java} | 12 ++++++------ .../ui/client/media/MediaPlayerManagerComponent.java | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/{FloatingMediaPlayerContainerContainer.java => FloatingMediaPlayerContainer.java} (91%) 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 a9ba4565f4b..3179637e841 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 @@ -2093,6 +2093,5 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String manage2SailEventIdBoxTooltip(); String manage2SailPort(); String windFinderSpotCollectionsList(); - String audioFiles(); } 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 48ef82f8c55..dc06818e3ca 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 @@ -2081,4 +2081,5 @@ gender=Geschlecht manage2SailEventId=Manage2Sail Event ID manage2SailEventURL=Manage2Sail Event URL (json) manage2SailEventIdBoxTooltip=Event ID von Manage 2 Sail oder URL die die Event ID beinhaltet -manage2SailPort=Port \ No newline at end of file +manage2SailPort=Port +audioFiles=Tonspuren \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainerContainer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainer.java similarity index 91% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainerContainer.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainer.java index a2a23ab24a7..ace9f7dd336 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainerContainer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainer.java @@ -23,7 +23,7 @@ import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.dialog.WindowBox; import com.sap.sse.security.ui.client.UserService; -public class FloatingMediaPlayerContainerContainer extends AbstractMediaContainer implements MediaPlayerContainer { +public class FloatingMediaPlayerContainer extends AbstractMediaContainer implements MediaPlayerContainer { VideoContainerRessource res = GWT.create(VideoContainerRessource.class); private static final int MIN_WIDTH = 420; @@ -32,7 +32,7 @@ public class FloatingMediaPlayerContainerContainer extends AbstractMediaContaine private final PopupPositionProvider popupPositionProvider; private Anchor edit; - public FloatingMediaPlayerContainerContainer(MediaSynchPlayer videoPlayer, PopupPositionProvider popupPositionProvider, + public FloatingMediaPlayerContainer(MediaSynchPlayer videoPlayer, PopupPositionProvider popupPositionProvider, UserService userservice, MediaServiceAsync mediaService, ErrorReporter errorReporter, PlayerCloseListener playerCloseListener, PopoutListener popoutListener) { super(new FlowPanel(), videoPlayer, popoutListener, playerCloseListener); @@ -77,8 +77,8 @@ public class FloatingMediaPlayerContainerContainer extends AbstractMediaContaine @Override public void popout() { - FloatingMediaPlayerContainerContainer.this.popoutListener - .popoutVideo(FloatingMediaPlayerContainerContainer.this.mediaPlayer.getMediaTrack()); + FloatingMediaPlayerContainer.this.popoutListener + .popoutVideo(FloatingMediaPlayerContainer.this.mediaPlayer.getMediaTrack()); } }); // values required for js and youtube player to stay useable @@ -90,8 +90,8 @@ public class FloatingMediaPlayerContainerContainer extends AbstractMediaContaine @Override public void onClose(CloseEvent event) { - FloatingMediaPlayerContainerContainer.this.mediaPlayer.pauseMedia(); - FloatingMediaPlayerContainerContainer.this.popupCloseListener.playerClosed(); + FloatingMediaPlayerContainer.this.mediaPlayer.pauseMedia(); + FloatingMediaPlayerContainer.this.popupCloseListener.playerClosed(); } }); 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 416e029bef8..7bfc0892ef0 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 @@ -395,13 +395,13 @@ public class MediaPlayerManagerComponent extends AbstractComponent() { + FloatingMediaPlayerContainer videoFloatingContainer = createAndWrapVideoPlayer(videoTrack, + new VideoContainerFactory() { @Override - public FloatingMediaPlayerContainerContainer createVideoContainer(MediaSynchPlayer videoPlayer, + public FloatingMediaPlayerContainer createVideoContainer(MediaSynchPlayer videoPlayer, UserService userservice, MediaServiceAsync mediaService, ErrorReporter errorReporter, PlayerCloseListener playerCloseListener, PopoutListener popoutListener) { - FloatingMediaPlayerContainerContainer videoFloatingContainer = new FloatingMediaPlayerContainerContainer(videoPlayer, popupPositionProvider, + FloatingMediaPlayerContainer videoFloatingContainer = new FloatingMediaPlayerContainer(videoPlayer, popupPositionProvider, userservice, mediaService, errorReporter, playerCloseListener, popoutListener); return videoFloatingContainer; } From a73f005aa17dd29600235c3dfb829ff5800e68cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 30 Jul 2018 17:24:18 +0200 Subject: [PATCH 052/197] bug4682 show media status in selection panel --- .../gwt/ui/client/media/MediaPlayerManager.java | 3 +++ .../client/media/MediaPlayerManagerComponent.java | 5 +++++ .../client/media/MediaSingleSelectionControl.java | 15 +++++---------- 3 files changed, 13 insertions(+), 10 deletions(-) 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 9f667cd1dfd..5f3c6195bea 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 @@ -7,6 +7,7 @@ import java.util.Set; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; +import com.sap.sailing.gwt.ui.client.media.MediaPlayerManagerComponent.Status; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.useragent.UserAgentDetails; @@ -66,5 +67,7 @@ public interface MediaPlayerManager { ErrorReporter getErrorReporter(); + Status getMediaTrackStatus(MediaTrack track); + } 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 7bfc0892ef0..7422705fda5 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 @@ -747,4 +747,9 @@ public class MediaPlayerManagerComponent extends AbstractComponent f.getMediaPlayer().getMediaTrack()) .collect(Collectors.toSet()); } + + @Override + public Status getMediaTrackStatus(MediaTrack track) { + return mediaTrackStatus.getOrDefault(track, Status.UNDEFINED); + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java index a1bed0c066e..a2ee165491d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java @@ -34,8 +34,7 @@ public class MediaSingleSelectionControl extends AbstractMediaSelectionControl i } public void show() { - Collection mediaTracks = new ArrayList(); - addPotentiallyPlayableMediaTracksTo(mediaTracks); + Collection mediaTracks = new ArrayList(mediaPlayerManager.getAssignedMediaTracks()); Panel mediaPanel = new VerticalPanel(); addMediaEntriesToGridPanel(mediaTracks, mediaPanel); dialogControl.add(mediaPanel); @@ -48,16 +47,12 @@ public class MediaSingleSelectionControl extends AbstractMediaSelectionControl i } } - private void addPotentiallyPlayableMediaTracksTo(Collection mediaTracks) { - for (MediaTrack mediaTrack : mediaPlayerManager.getAssignedMediaTracks()) { - mediaTracks.add(mediaTrack); - } - } - private Button createMediaEntry(final MediaTrack mediaTrack) { - Button mediaSelectButton = new Button(mediaTrack.title); + Button mediaSelectButton = new Button( + mediaPlayerManager.getMediaTrackStatus(mediaTrack).toString() + " " + mediaTrack.title); mediaSelectButton.setStyleName("Media-Select-Button"); - if (mediaTrack.equals(mediaPlayerManager.getPlayingAudioTrack()) || mediaPlayerManager.getPlayingVideoTracks().contains(mediaTrack)) { + if (mediaPlayerManager.getPlayingAudioTrack().contains(mediaTrack) + || mediaPlayerManager.getPlayingVideoTracks().contains(mediaTrack)) { mediaSelectButton.setTitle(stringMessages.mediaHideVideoTooltip()); mediaSelectButton.addStyleName("Media-Select-Button-playing"); mediaSelectButton.addClickHandler(new ClickHandler() { From 254a738b149897e8f066cec1b6fbefa343202cc1 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Tue, 31 Jul 2018 09:43:38 +0200 Subject: [PATCH 053/197] Bug 4693: Added local storage support for IE --- .../selenium/test/AbstractSeleniumTest.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java index 90086e4a7b5..19ee0988477 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java @@ -20,6 +20,7 @@ import org.junit.runner.RunWith; import org.junit.runners.model.FrameworkMethod; import org.openqa.selenium.By; import org.openqa.selenium.Cookie; +import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.Keys; import org.openqa.selenium.OutputType; import org.openqa.selenium.TakesScreenshot; @@ -90,13 +91,22 @@ public abstract class AbstractSeleniumTest { // To be able to access LocalStorage we need to load a page having the target origin getWebDriver().get(contextRoot); - // clear local storage - final WebStorage webStorage = (WebStorage)getWebDriver(); - webStorage.getLocalStorage().clear(); - - // extending the timeout of notifications to 100s to prevent timing failures - webStorage.getLocalStorage().setItem("sse.notification.customTimeOutInSeconds", - Integer.toString(PageObject.DEFAULT_WAIT_TIMEOUT_SECONDS)); + final String notificationTimeoutKey = "sse.notification.customTimeOutInSeconds"; + final String notificationTimeoutValue = Integer.toString(PageObject.DEFAULT_WAIT_TIMEOUT_SECONDS); + if (getWebDriver() instanceof WebStorage) { + // clear local storage + final WebStorage webStorage = (WebStorage)getWebDriver(); + webStorage.getLocalStorage().clear(); + + // extending the timeout of notifications to 100s to prevent timing failures + webStorage.getLocalStorage().setItem(notificationTimeoutKey, + notificationTimeoutValue); + } else { + // Fallback solution for IE + ((JavascriptExecutor)getWebDriver()).executeScript("window.localStorage.clear();"); + ((JavascriptExecutor) getWebDriver()).executeScript("window.localStorage.setItem(\"" + + notificationTimeoutKey + "\", \"" + notificationTimeoutValue + "\");"); + } try { // In IE 11 we sometimes see the problem that IE somehow automatically changes the zoom level to 75%. From 8545745e250714e6c6b5cbee4aa87d9094a23271 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Tue, 31 Jul 2018 09:43:49 +0200 Subject: [PATCH 054/197] Bug 4693: using correct browser window --- .../selenium/test/leaderboard/TestLeaderboardConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java index 71f0effacaf..0e2f84449c7 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java @@ -81,7 +81,7 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest { assertThat(races.size(), equalTo(5)); assertThat(table.getEntries().size(), equalTo(28)); // the regatta already has the races linked; regatta leaderboard obtains competitors from regatta - final WebDriver adminConsoleWindowDriver = leaderboardWindow.switchToWindow(); + final WebDriver adminConsoleWindowDriver = adminConsoleWindow.switchToWindow(); setUpAuthenticatedSession(adminConsoleWindowDriver); AdminConsolePage adminConsole = AdminConsolePage.goToPage(adminConsoleWindowDriver, getContextRoot()); LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration(); From 1442532e69ed6d2c5d04c3efd44dcfae39ee2615 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Tue, 31 Jul 2018 09:52:54 +0200 Subject: [PATCH 055/197] Bug 4693: Fixed test failure that is caused while a CellTable is just updating --- .../com/sap/sailing/selenium/pages/gwt/CellTablePO.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/CellTablePO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/CellTablePO.java index b97c10a0176..e26aee7bc6f 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/CellTablePO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/gwt/CellTablePO.java @@ -345,6 +345,13 @@ public abstract class CellTablePO extends PageArea { } public void waitForTableToShowData() { - waitUntil(() -> !getRows().isEmpty()); + waitUntil(() -> { + try { + return !getRows().isEmpty(); + } catch (Exception e) { + // This can fail while the table is just updating + return false; + } + }); } } From d4a6e9b68f3c7fdbfab6a17fa607bb1be7fc04cc Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Tue, 31 Jul 2018 10:39:40 +0200 Subject: [PATCH 056/197] Bug 4693: Always starting with a clean session in Selenium tests on IE --- .../local-test-environment.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/local-test-environment.xml b/java/com.sap.sailing.selenium.test/local-test-environment.xml index cedae7bcc1c..08bd5aa6c86 100644 --- a/java/com.sap.sailing.selenium.test/local-test-environment.xml +++ b/java/com.sap.sailing.selenium.test/local-test-environment.xml @@ -104,14 +104,20 @@ --> - + + --> diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/authentication/TestAuthenticationSignIn.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/authentication/TestAuthenticationSignIn.java index c6ab6b4b44d..03ec20cf1aa 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/authentication/TestAuthenticationSignIn.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/authentication/TestAuthenticationSignIn.java @@ -16,6 +16,7 @@ public class TestAuthenticationSignIn extends AbstractSeleniumTest { @Before public void setUp() { clearState(getContextRoot()); + getWebDriver().manage().deleteCookieNamed("JSESSIONID"); } @Test From 81507e6ec771e022d49b438e2b4f3c3c85ba5791 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Tue, 31 Jul 2018 14:17:29 +0200 Subject: [PATCH 058/197] Bug 4693: Added TODO --- .../com/sap/sailing/selenium/test/raceboard/SettingsTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java index 46c078b499e..bed51789bf8 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java @@ -450,6 +450,8 @@ public class SettingsTest extends AbstractSeleniumTest { leaderboardSettingsPanel.selectDetailsAndDeselectOther(detailsToSelect); leaderboardSettingsPanel.setNumberOfRacesToDisplay(2); + // TODO the URL generated here is too long for IE11. IE has a URL size limit of 2083 chars. This causes the test to fail. + // open settings dialog of configurated leaderboard and match the set values with forwarded values leaderboardPage = urlConfigurationDialog.openLeaderboard(); leaderboardSettingsPanel = leaderboardPage.getLeaderboardSettings().getLeaderboardSettingsPanelPO(); From 391d55a14570d9d1592bfab413fc3791c4ecacda Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Wed, 1 Aug 2018 08:43:03 +0200 Subject: [PATCH 059/197] Bug 4693: Fixed ConcurrentModificationException introduced during a recent refactoring --- .../src/com/sap/sailing/selenium/core/WindowManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java index e6adf8e9d98..05f3cbe349c 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java @@ -71,11 +71,11 @@ public class WindowManager { } public void forEachOpenedWindow(Consumer windowConsumer) { - this.allWindows.forEach(windowConsumer); + new HashSet<>(this.allWindows).forEach(windowConsumer); } public void closeAllExtraWindows() { - this.allWindows.forEach(window -> { + forEachOpenedWindow(window -> { if (window != defaultWindow) { window.close(); } From d85814968280107c6e7c4481961d4f7eab554af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 1 Aug 2018 11:16:58 +0200 Subject: [PATCH 060/197] bug4695 fixed an issue with ie11 not hitting a checkbox --- .../selenium/pages/adminconsole/regatta/SeriesEditDialogPO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/SeriesEditDialogPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/SeriesEditDialogPO.java index 217c8a43ae8..897d1bb8aeb 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/SeriesEditDialogPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/SeriesEditDialogPO.java @@ -141,7 +141,7 @@ public class SeriesEditDialogPO extends DataEntryDialogPO { public void setMedalSeries(boolean medal) { if(medalSeriesCheckbox.isSelected() != medal) { - medalSeriesCheckbox.click(); + new Actions(driver).moveToElement(medalSeriesCheckbox).click().build().perform(); } } } From fe734eb523adf26b33b53dcc3cc6cf024bc03feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 1 Aug 2018 11:54:05 +0200 Subject: [PATCH 061/197] bug4693 wrong webdriver was used in setUpAuthenticatedSession, causing issues for multi window tests --- .../src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java index 6d11d40d4dd..a9af2a50148 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java @@ -120,7 +120,7 @@ public abstract class AbstractSeleniumTest { protected void setUpAuthenticatedSession(WebDriver webDriver) { // To be able to set a cookie we need to load a page having the target origin - getWebDriver().get(getContextRoot()); + webDriver.get(getContextRoot()); logger.info("Authenticating session..."); Cookie sessionCookie = authenticate(getContextRoot()); From 29d28bf22b0c8de272f8aedae5f3a4d6395bd5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 1 Aug 2018 14:54:19 +0200 Subject: [PATCH 062/197] bug4693 improved reliability of leaderboard refresh button useage --- .../sailing/selenium/pages/leaderboard/LeaderboardPage.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java index 6f1c51babfb..30eeae0cf24 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardPage.java @@ -3,6 +3,7 @@ package com.sap.sailing.selenium.pages.leaderboard; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; @@ -117,9 +118,10 @@ public class LeaderboardPage extends HostPage { JavascriptExecutor executor = (JavascriptExecutor) driver; Long finishedCalls = (Long) executor.executeScript( "return window.PENDING_AJAX_CALLS.numberOfFinishedCalls(arguments[0])", "loadLeaderboardData"); - this.playAndPauseAnchor.click(); + // this.playAndPauseAnchor.click(); + new Actions(driver).moveToElement(playAndPauseAnchor).click().build().perform(); waitForAjaxRequestsExecuted("loadLeaderboardData", finishedCalls.intValue() + 1); - this.playAndPauseAnchor.click(); + new Actions(driver).moveToElement(playAndPauseAnchor).click().build().perform(); } public CompetitorChartsSettingsDialogPO getCompetitorChartsSettings() { From bb89a530fb0a19977b8d116ebd389e13c636345f Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 1 Aug 2018 21:33:47 +0200 Subject: [PATCH 063/197] Added a warning dialog if a query is applied that would override unsafed changes and added an error dialog if components of a query to be applied are missing --- .../client/DataMiningComponentProvider.java | 10 +- .../ui/client/FilterSelectionPresenter.java | 2 +- .../ui/client/GroupingProvider.java | 3 - .../ui/client/QueryDefinitionProvider.java | 15 +- .../datamining/ui/client/StringMessages.java | 11 + .../ui/client/StringMessages.properties | 13 +- .../ui/client/StringMessages_de.properties | 13 +- .../PlainFilterSelectionPresenter.java | 3 +- .../DimensionFilterSelectionProvider.java | 57 ++-- ...lDimensionListFilterSelectionProvider.java | 151 ++++++--- .../MultiDimensionalGroupingProvider.java | 18 +- .../QueryDefinitionProviderWithControls.java | 188 +++++++++-- ...eDataRetrieverChainDefinitionProvider.java | 307 ------------------ .../SuggestBoxStatisticProvider.java | 46 ++- 14 files changed, 398 insertions(+), 439 deletions(-) delete mode 100644 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/main/java/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 index 2a97d6dd7d8..e1d8ad82830 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -1,5 +1,7 @@ package com.sap.sse.datamining.ui.client; +import java.util.function.Consumer; + import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.gwt.client.shared.components.Component; @@ -9,16 +11,16 @@ public interface DataMiningComponentProvider exte /** * Tells the provider, that {@link #reloadComponents()} will be called in the future. */ - public void awaitReloadComponents(); + void awaitReloadComponents(); /** * @return true, if the provider is reloading its components or is waiting for the * {@link #reloadComponents()} call. */ - public boolean isAwaitingReload(); + boolean isAwaitingReload(); - public void reloadComponents(); + void reloadComponents(); - public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); + void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition, Consumer> callback); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 88aa8787e8e..f0ae243afd1 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -3,6 +3,6 @@ package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.AbstractSettings; import com.sap.sse.gwt.client.shared.components.Component; -public interface FilterSelectionPresenter extends Component { +public interface FilterSelectionPresenter extends Component, FilterSelectionChangedListener { } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 88af5fadb97..df571fe808e 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -4,7 +4,6 @@ import java.util.Collection; import com.google.gwt.user.client.ui.ValueListBox; import com.sap.sse.common.settings.SerializableSettings; -import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; public interface GroupingProvider @@ -13,8 +12,6 @@ public interface GroupingProvider String getCustomGrouperScriptText(); - void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); - void addGroupingChangedListener(GroupingChangedListener listener); void removeDimensionToGroupBy(FunctionDTO dimension); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 54f1b5ad05b..2de05ddf9e0 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -2,16 +2,17 @@ package com.sap.sse.datamining.ui.client; import com.sap.sse.common.settings.Settings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; +import com.sap.sse.gwt.client.shared.components.Component; -public interface QueryDefinitionProvider - extends DataMiningComponentProvider { +public interface QueryDefinitionProvider extends Component { - public Iterable validateQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); + void reloadComponents(); - public StatisticQueryDefinitionDTO getQueryDefinition(); + StatisticQueryDefinitionDTO getQueryDefinition(); + Iterable validateQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); + void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); - public void addQueryDefinitionChangedListener(QueryDefinitionChangedListener listener); - - public void removeQueryDefinitionChangedListener(QueryDefinitionChangedListener listener); + void addQueryDefinitionChangedListener(QueryDefinitionChangedListener listener); + void removeQueryDefinitionChangedListener(QueryDefinitionChangedListener listener); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 8af86ea8d14..95da17dba19 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -66,5 +66,16 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String filterShownDimensions(); String selectDimensionsToFilterBy(); String clear(); + String changesWillBeLost(); + String confirmQueryDefinitionChangeLoss(); + String discardChanges(); + String keepChanges(); + String anErrorOccurredWhileApplyingTheQuery(); + String queryBasedOnRetrieverChainCanNotBeApplied(String retrieverChainName); + String statisticNotAvailable(String statisticName); + String aggregatorNotAvailable(String aggregatorName); + String filterDimensionNotAvailable(String dimensionName); + String filterValueNotAvailable(String value); + String groupingDimensionNotAvailable(String dimensionName); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 7a4a80d4d33..af9da51c9d4 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -49,4 +49,15 @@ csvCopiedToClipboard=CSV content has been copied to clipboard. filter=Filter filterShownDimensions=Filter shown dimensions selectDimensionsToFilterBy=Select dimensions to filter by -clear=Clear \ No newline at end of file +clear=Clear +changesWillBeLost=Changes may be lost +confirmQueryDefinitionChangeLoss=A different query will be displayed and there are changes that would be lost.\nChoose whether the changes should be discarded or not, which would prevent the other query from being displayed. +discardChanges=Discard Changes +keepChanges=Keep Changes +anErrorOccurredWhileApplyingTheQuery=An error occurred while applying the query +queryBasedOnRetrieverChainCanNotBeApplied=The query based on {0} can not be applied +statisticNotAvailable=The statistic {0} is not available +aggregatorNotAvailable=The aggregator {0} is not available +filterDimensionNotAvailable=The filter dimension {0} is not available +filterValueNotAvailable=The filter value {0} is not available +groupingDimensionNotAvailable=The grouping dimension {0} is not available \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index bdbd1157bf6..80721309976 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -49,4 +49,15 @@ csvCopiedToClipboard=Der Inhalt wurde als CSV in die Zwischenablage kopiert. filter=Filter filterShownDimensions=Angezeigte Dimensionen filtern selectDimensionsToFilterBy=Dimensionen der Filterung auswählen -clear=Löschen \ No newline at end of file +clear=Löschen +changesWillBeLost=Änderungen können verloren gehen +confirmQueryDefinitionChangeLoss=Eine andere Query soll angezeigt werden und es gibt Änderungen die verloren gehen würden.\nWähle aus, ob die Änderungen verworfen werden sollen oder nicht, wodurch die andere Query nicht angezeigt werden würde. +discardChanges=Änderungen verwerfen +keepChanges=Änderungen behalten +anErrorOccurredWhileApplyingTheQuery=Beim Anzeigen der Query ist ein Fehler aufgetreten +queryBasedOnRetrieverChainCanNotBeApplied=Die Query basierend auf {0} kann nicht angezeigt werden +statisticNotAvailable=Die Statistik {0} ist nicht verfügbar +aggregatorNotAvailable=Der Aggregator {0} ist nicht verfügbar +filterDimensionNotAvailable=Die Filter-Dimension {0} ist nicht verfügbar +filterValueNotAvailable=Der Filter-Wert {0} ist nicht verfügbar +groupingDimensionNotAvailable=Die Gruppierungs-Dimension {0} ist nicht verfügbar \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index f0e5ff2a043..e810541157b 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -22,7 +22,6 @@ import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; 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; @@ -32,7 +31,7 @@ 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 { + FilterSelectionPresenter, DataRetrieverChainDefinitionChangedListener { private final FilterSelectionProvider filterSelectionProvider; private DataRetrieverChainDefinitionDTO retrieverChain; diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java index 2a648f0fefd..fde2f4eac8f 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java @@ -9,6 +9,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; import com.google.gwt.cell.client.CheckboxCell; import com.google.gwt.core.client.Scheduler; @@ -45,6 +46,7 @@ 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.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; @@ -57,12 +59,11 @@ import com.sap.sse.datamining.ui.client.resources.DataMiningResources; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.controls.busyindicator.SimpleBusyIndicator; import com.sap.sse.gwt.client.panels.AbstractFilterablePanel; -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 DimensionFilterSelectionProvider extends AbstractComponent { +public class DimensionFilterSelectionProvider extends AbstractDataMiningComponent { private static final DataMiningResources resources = GWT.create(DataMiningResources.class); private static final NaturalComparator NaturalComparator = new NaturalComparator(); @@ -78,17 +79,20 @@ public class DimensionFilterSelectionProvider extends AbstractComponent selectionToBeApplied; private final DockLayoutPanel mainPanel; private final AbstractFilterablePanel filterPanel; private final LayoutPanel contentContainer; private final SimpleBusyIndicator busyIndicator; + private final Set availableData; private final ListDataProvider filteredData; private final MultiSelectionModel selectionModel; private final DataGrid dataGrid; private final Column checkboxColumn; + + private Iterable selectionToBeApplied; + private Consumer> selectionCallback; public DimensionFilterSelectionProvider(Component parent, ComponentContext componentContext, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, DataMiningSession session, DataRetrieverChainDefinitionProvider retrieverChainProvider, @@ -104,7 +108,6 @@ public class DimensionFilterSelectionProvider extends AbstractComponent(); - selectionToBeApplied = new HashSet<>(); DataMiningDataGridResources dataGridResources = GWT.create(DataMiningDataGridResources.class); dataGrid = new DataGrid<>(Integer.MAX_VALUE, dataGridResources); @@ -112,6 +115,7 @@ public class DimensionFilterSelectionProvider extends AbstractComponent(); filteredData = new ListDataProvider(this::elementAsString); filterPanel = new AbstractFilterablePanel(null, dataGrid, filteredData) { @Override @@ -205,6 +209,7 @@ public class DimensionFilterSelectionProvider extends AbstractComponent dimensions = new HashSet<>(); dimensions.add(dimension); + availableData.clear(); counter.increase(); contentContainer.remove(dataGrid); busyIndicator.setBusy(true); @@ -214,20 +219,23 @@ public class DimensionFilterSelectionProvider extends AbstractComponent> result) { Map> results = result.getResults(); - List content = new ArrayList<>(); + List sortedData = new ArrayList<>(); if (!results.isEmpty()) { GroupKey contentKey = new GenericGroupKey(dimension); - content.addAll((Collection) results.get(contentKey)); - content.sort((o1, o2) -> NaturalComparator.compare(o1.toString(), o2.toString())); + availableData.addAll((Collection) results.get(contentKey)); + sortedData.addAll(availableData); + sortedData.sort((o1, o2) -> NaturalComparator.compare(o1.toString(), o2.toString())); } busyIndicator.setBusy(false); - filterPanel.updateAll(content); + filterPanel.updateAll(sortedData); contentContainer.add(dataGrid); - internalSetSelection(!selectionToBeApplied.isEmpty() ? selectionToBeApplied : selectionModel.getSelectedSet()); - selectionToBeApplied.clear(); + internalSetSelection(selectionToBeApplied != null ? selectionToBeApplied : selectionModel.getSelectedSet(), + selectionCallback != null ? selectionCallback : m -> { }); + selectionToBeApplied = null; + selectionCallback = null; if (callback != null) { callback.run(); @@ -236,6 +244,8 @@ public class DimensionFilterSelectionProvider extends AbstractComponent(selectionModel.getSelectedSet()); } - public void setSelection(Iterable items) { - selectionToBeApplied.clear(); - for (Serializable item : items) { - selectionToBeApplied.add(item); - } + public void setSelection(Iterable selection, Consumer> callback) { + selectionToBeApplied = selection; + selectionCallback = callback; if (!busyIndicator.isBusy()) { - internalSetSelection(selectionToBeApplied); - selectionToBeApplied.clear(); + internalSetSelection(selectionToBeApplied, selectionCallback); + selectionToBeApplied = null;; + selectionCallback = null; } } - private void internalSetSelection(Set selection) { + private void internalSetSelection(Iterable selection, Consumer> callback) { + Collection callbackMessages = new ArrayList<>(); clearSelection(); - if (!selection.isEmpty()) { - for (Serializable item : filterPanel.getAll()) { - if (selection.contains(item)) { - selectionModel.setSelected(item, true); - } + for (Serializable item : selection) { + if (availableData.contains(item)) { + selectionModel.setSelected(item, true); + } else { + callbackMessages.add(getDataMiningStringMessages().filterValueNotAvailable(elementAsString(item))); } } + callback.accept(callbackMessages); } public void clearSelection() { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java index feeb17ed9f6..48a062f2765 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Objects; import java.util.Set; +import java.util.function.Consumer; import java.util.stream.Collectors; import com.google.gwt.cell.client.CheckboxCell; @@ -44,6 +45,7 @@ import com.google.gwt.view.client.DefaultSelectionEventManager.SelectAction; import com.google.gwt.view.client.ListDataProvider; import com.google.gwt.view.client.MultiSelectionModel; import com.google.gwt.view.client.SelectionChangeEvent; +import com.sap.sse.common.Util; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; @@ -51,6 +53,7 @@ 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.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; @@ -63,12 +66,11 @@ import com.sap.sse.datamining.ui.client.resources.DataMiningDataGridResources.Da import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.celltable.BaseCellTableBuilder; import com.sap.sse.gwt.client.panels.AbstractFilterablePanel; -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 HierarchicalDimensionListFilterSelectionProvider extends AbstractComponent implements FilterSelectionProvider { +public class HierarchicalDimensionListFilterSelectionProvider extends AbstractDataMiningComponent implements FilterSelectionProvider { private final static String DimensionListSubheaderAttribute = "subheader"; @@ -87,6 +89,7 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo private boolean isAwaitingReload; private boolean isUpdating; + private boolean ignoreSelectionChangedNotifications; private DataRetrieverChainDefinitionDTO retrieverChain; private ReducedDimensionsDTO reducedDimensions; private final List availableFilterDimensions; @@ -101,16 +104,16 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo private final DockLayoutPanel dimensionFilterSelectionProvidersPanel; private final Map dimensionFilterSelectionProviders; - private boolean updateInProgress; + private boolean filterFilterSelectionInProgress; private final FilterSelectionPresenter filterSelectionPresenter; private final ScrollPanel filterSelectionPresenterContainer; private HashMap>> selectionToBeApplied; + private Consumer> selectionCallback; public HierarchicalDimensionListFilterSelectionProvider(Component parent, ComponentContext context, - DataMiningSession session, StringMessages stringMessages, - DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningSession session, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, DataRetrieverChainDefinitionProvider retrieverChainProvider) { super(parent, context); this.session = session; @@ -124,6 +127,8 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo retrieverChain = null; availableFilterDimensions = new ArrayList<>(); filteredFilterDimensions = new ListDataProvider<>(); + + StringMessages stringMessages = getDataMiningStringMessages(); Label filterDimensionsSelectionTitleLabel = new Label(stringMessages.selectDimensionsToFilterBy()); filterDimensionsSelectionTitleLabel.addStyleName("emphasizedLabel"); @@ -250,8 +255,9 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo filterFilterDimensionsPanel.updateAll(availableFilterDimensions); if (selectionToBeApplied != null) { - setSelection(selectionToBeApplied); + setSelection(selectionToBeApplied, selectionCallback); selectionToBeApplied = null; + selectionCallback = null; } isUpdating = false; } @@ -259,6 +265,7 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo public void onFailure(Throwable caught) { errorReporter.reportError("Error fetching the dimensions of the retriever chain from the server: " + caught.getMessage()); selectionToBeApplied = null; + selectionCallback = null; isUpdating = false; } }); @@ -270,17 +277,6 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo filterDimensionSelectionModel.clear(); filterFilterDimensionsPanel.removeAll(); } - - @Override - public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { - DataRetrieverChainDefinitionDTO retrieverChain = queryDefinition.getDataRetrieverChainDefinition(); - selectionToBeApplied = queryDefinition.getFilterSelection(); - - if (!isUpdating && !isAwaitingReload && retrieverChain.equals(this.retrieverChain)) { - setSelection(selectionToBeApplied); - selectionToBeApplied = null; - } - } @Override public void setHighestRetrieverLevelWithFilterDimension(FunctionDTO dimension, Serializable groupKey) { @@ -288,31 +284,95 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo Collection items = Collections.singleton(groupKey); for (DimensionWithContext dimensionWithContext : availableFilterDimensions) { if (dimensionWithContext.getDimension().equals(reducedDimension)) { - setDimensionSelection(dimensionWithContext, items); + setDimensionSelection(dimensionWithContext, items, m -> { }); break; } } } - - private void setSelection(HashMap>> filterSelection) { - for (DimensionWithContext dimensionWithContext : availableFilterDimensions) { - Collection itemsToSelect = Collections.emptySet(); - HashMap> retrieverLevelSelection = filterSelection.get(dimensionWithContext.getRetrieverLevel()); - if (retrieverLevelSelection != null) { - HashSet items = retrieverLevelSelection.get(dimensionWithContext.getDimension()); - if (items != null && !items.isEmpty()) { - itemsToSelect = items; - } - } - - DimensionFilterSelectionProvider selectionProvider = dimensionFilterSelectionProviders.get(dimensionWithContext); - if (!itemsToSelect.isEmpty() || (selectionProvider != null && !selectionProvider.getSelection().isEmpty())) { - setDimensionSelection(dimensionWithContext, itemsToSelect); - } + + @Override + public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition, Consumer> callback) { + DataRetrieverChainDefinitionDTO retrieverChain = queryDefinition.getDataRetrieverChainDefinition(); + selectionToBeApplied = queryDefinition.getFilterSelection(); + selectionCallback = callback; + if (!isUpdating && !isAwaitingReload && retrieverChain.equals(this.retrieverChain)) { + setSelection(selectionToBeApplied, selectionCallback); + selectionToBeApplied = null; + selectionCallback = null; } } - private void setDimensionSelection(DimensionWithContext dimension, Collection items) { + private void setSelection(HashMap>> filterSelection, Consumer> callback) { + Set innerCallbacks = new HashSet<>(); + Collection callbackMessages = new ArrayList<>(); + ignoreSelectionChangedNotifications = true; + clearSelection(); + for (DataRetrieverLevelDTO retrieverLevel : filterSelection.keySet()) { + HashMap> levelSelection = filterSelection.get(retrieverLevel); + for (FunctionDTO dimension : levelSelection.keySet()) { + DimensionWithContext dimensionWithContext = new DimensionWithContext(dimension, retrieverLevel); + int index = availableFilterDimensions.indexOf(dimensionWithContext); + if (index != -1) { + InnerSelectionCallback innerCallback = new InnerSelectionCallback(callbackMessages, innerCallbacks, callback); + innerCallbacks.add(innerCallback); + setDimensionSelection(availableFilterDimensions.get(index), levelSelection.get(dimension), innerCallback); + } else { + callbackMessages.add(getDataMiningStringMessages().filterDimensionNotAvailable(dimension.getDisplayName())); + } + } + } + + if (!innerCallbacks.isEmpty()) { + for (InnerSelectionCallback innerCallback : innerCallbacks) { + innerCallback.canPublishMessages = true; + } + } else { + setSelectionCompleted(callback, callbackMessages); + } + } + + private void setSelectionCompleted(Consumer> callback, Iterable messages) { + ignoreSelectionChangedNotifications = false; + + // Trigger an update for the values of all selected filter dimensions, so that only values + // that match the current filter selection are shown + filterFilterSelectionInProgress = true; + List dimensionsToUpdate = new ArrayList<>(dimensionFilterSelectionProviders.keySet()); + dimensionsToUpdate.sort(null); + updateDimensionFilterSelectionProviders(dimensionsToUpdate.iterator(), null, () -> { + mainPanel.setWidgetHidden(filterSelectionPresenterContainer, getSelection().isEmpty()); + filterSelectionPresenter.selectionChanged(); + }); + + callback.accept(messages); + } + + private class InnerSelectionCallback implements Consumer> { + + private final Collection allMessages; + private final Set innerCallbacks; + private final Consumer> outerCallback; + private boolean canPublishMessages; + + public InnerSelectionCallback(Collection allMessages, Set innerCallbacks, + Consumer> outerCallback) { + this.allMessages = allMessages; + this.innerCallbacks = innerCallbacks; + this.outerCallback = outerCallback; + } + + @Override + public void accept(Iterable messages) { + Util.addAll(messages, allMessages); + innerCallbacks.remove(this); + if (canPublishMessages && innerCallbacks.isEmpty()) { + setSelectionCompleted(outerCallback, allMessages); + } + } + + } + + private void setDimensionSelection(DimensionWithContext dimension, Collection items, Consumer> callback) { DimensionFilterSelectionProvider selectionProvider; if (filterDimensionSelectionModel.isSelected(dimension)) { selectionProvider = dimensionFilterSelectionProviders.get(dimension); @@ -320,7 +380,7 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo selectionProvider = addDimensionFilterSelectionProvider(dimension); filterDimensionSelectionModel.setSelected(dimension, true); } - selectionProvider.setSelection(items); + selectionProvider.setSelection(items, callback); } private void selectedFilterDimensionsChanged(SelectionChangeEvent event) { @@ -368,37 +428,38 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractCo } private void filterSelectionChanged(DimensionWithContext changedDimension) { - if (!updateInProgress) { - updateInProgress = true; + if (!filterFilterSelectionInProgress && !ignoreSelectionChangedNotifications) { + filterFilterSelectionInProgress = true; int levelToStartWith = changedDimension.getRetrieverLevel().getLevel(); List dimensionsToUpdate = dimensionFilterSelectionProviders.keySet() .stream().filter(d -> d.getRetrieverLevel().getLevel() >= levelToStartWith) .collect(Collectors.toList()); - updateDimensionFilterSelectionProviders(dimensionsToUpdate.iterator(), changedDimension); + dimensionsToUpdate.sort(null); + updateDimensionFilterSelectionProviders(dimensionsToUpdate.iterator(), changedDimension, this::notifyListeners); } } - private void updateDimensionFilterSelectionProviders(Iterator dimensionIterator, DimensionWithContext exceptDimension) { + private void updateDimensionFilterSelectionProviders(Iterator dimensionIterator, DimensionWithContext exceptDimension, Runnable onCompletion) { if (dimensionIterator.hasNext()) { DimensionWithContext dimension = dimensionIterator.next(); if (dimension.equals(exceptDimension)) { - updateDimensionFilterSelectionProviders(dimensionIterator, exceptDimension); + updateDimensionFilterSelectionProviders(dimensionIterator, exceptDimension, onCompletion); } else { DimensionFilterSelectionProvider selectionProvider = dimensionFilterSelectionProviders.get(dimension); HashSet selectionBefore = selectionProvider.getSelection(); selectionProvider.updateContent(() -> { boolean selectionChanged = !selectionBefore.equals(selectionProvider.getSelection()); if (selectionChanged) { - updateInProgress = false; + filterFilterSelectionInProgress = false; filterSelectionChanged(dimension); } else { - updateDimensionFilterSelectionProviders(dimensionIterator, exceptDimension); + updateDimensionFilterSelectionProviders(dimensionIterator, exceptDimension, onCompletion); } }); } } else { - updateInProgress = false; - notifyListeners(); + filterFilterSelectionInProgress = false; + onCompletion.run(); } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 6c6d660368f..7739c19d888 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -9,6 +9,7 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Set; +import java.util.function.Consumer; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; @@ -62,6 +63,7 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen private DataRetrieverChainDefinitionDTO currentRetrieverChainDefinition; private final List availableDimensions; private Iterable dimensionsToSelect; + private Consumer> selectionCallback; public MultiDimensionalGroupingProvider(Component parent, ComponentContext context, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, @@ -130,11 +132,12 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen if (!availableDimensions.isEmpty()) { Collections.sort(availableDimensions, DimensionComparator); if (dimensionsToSelect != null) { - setSelectedDimensions(dimensionsToSelect); + setSelectedDimensions(dimensionsToSelect, selectionCallback); } else { firstDimensionToGroupByBox.setValue(availableDimensions.iterator().next(), true); } dimensionsToSelect = null; + selectionCallback = null; } else { notifyListeners(); } @@ -144,6 +147,7 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen public void onFailure(Throwable caught) { errorReporter.reportError("Error fetching the dimensions from the server: " + caught.getMessage()); dimensionsToSelect = null; + selectionCallback = null; isUpdating = false; } }); @@ -263,24 +267,30 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen } @Override - public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { + public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition, Consumer> callback) { DataRetrieverChainDefinitionDTO newRetrieverChain = queryDefinition.getDataRetrieverChainDefinition(); dimensionsToSelect = queryDefinition.getDimensionsToGroupBy(); + selectionCallback = callback; if (!isAwaitingReload && !isUpdating && currentRetrieverChainDefinition.equals(newRetrieverChain)) { - setSelectedDimensions(dimensionsToSelect); + setSelectedDimensions(dimensionsToSelect, selectionCallback); dimensionsToSelect = null; + selectionCallback = null; } } - private void setSelectedDimensions(Iterable dimensions) { + private void setSelectedDimensions(Iterable dimensions, Consumer> callback) { + Collection callbackMessages = new ArrayList<>(); int boxIndex = 0; for (FunctionDTO dimension : dimensions) { int index = availableDimensions.indexOf(dimension); if (index != -1) { dimensionToGroupByBoxes.get(boxIndex).setValue(availableDimensions.get(index), true); boxIndex++; + } else { + callbackMessages.add(getDataMiningStringMessages().groupingDimensionNotAvailable(dimension.getDisplayName())); } } + callback.accept(callbackMessages); } @Override diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 9dab28369df..510a94e8966 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -6,18 +6,27 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; +import java.util.Set; import java.util.function.Consumer; +import com.google.gwt.dom.builder.shared.HtmlBuilderFactory; +import com.google.gwt.dom.builder.shared.HtmlUListBuilder; 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.i18n.client.LocaleInfo; +import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.DialogBox; import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.HorizontalPanel; 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.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.Util; import com.sap.sse.common.settings.SerializableSettings; @@ -40,6 +49,7 @@ import com.sap.sse.datamining.ui.client.GroupingChangedListener; import com.sap.sse.datamining.ui.client.GroupingProvider; import com.sap.sse.datamining.ui.client.StatisticChangedListener; import com.sap.sse.datamining.ui.client.StatisticProvider; +import com.sap.sse.datamining.ui.client.StringMessages; 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; @@ -74,6 +84,10 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition private final GroupingProvider groupingProvider; private final SplitLayoutPanel filterSplitPanel; private final FilterSelectionProvider filterSelectionProvider; + + private final DialogBox confirmChangeLossDialog; + private StatisticQueryDefinitionDTO queryDefinitionToBeApplied; + private boolean queryDefinitionChanged; public QueryDefinitionProviderWithControls(Component parent, ComponentContext context, DataMiningSession session, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, @@ -119,6 +133,8 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition addControl(queryDefinitionViewerToggleButton); addControl(predefinedQueryRunner.getEntryWidget()); } + + confirmChangeLossDialog = createConfirmChangeLossDialog(); statisticProvider = new SuggestBoxStatisticProvider(parent, context, dataMiningService, errorReporter, settingsControl, settingsManager); @@ -130,8 +146,8 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition groupingProvider.addGroupingChangedListener(providerListener); groupingProvider.getEntryWidget().addStyleName("dataMiningMarginBase"); - filterSelectionProvider = new HierarchicalDimensionListFilterSelectionProvider( - parent, context, session, getDataMiningStringMessages(), dataMiningService, errorReporter, statisticProvider); + filterSelectionProvider = new HierarchicalDimensionListFilterSelectionProvider(parent, context, session, + dataMiningService, errorReporter, statisticProvider); filterSelectionProvider.addSelectionChangedListener(providerListener); filterSelectionProvider.getEntryWidget().addStyleName("dataMiningBorderTop"); @@ -158,6 +174,40 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition reloadComponents(); } + private DialogBox createConfirmChangeLossDialog() { + StringMessages stringMessages = getDataMiningStringMessages(); + + DialogBox dialog = new DialogBox(false, true); + dialog.setAnimationEnabled(true); + dialog.setText(stringMessages.changesWillBeLost()); + dialog.setGlassEnabled(true); + + VerticalPanel contentPanel = new VerticalPanel(); + contentPanel.setSpacing(5); + contentPanel.add(new HTML(new SafeHtmlBuilder() + .appendEscapedLines(stringMessages.confirmQueryDefinitionChangeLoss()).toSafeHtml())); + + HorizontalPanel buttonPanel = new HorizontalPanel(); + buttonPanel.setSpacing(5); + buttonPanel.setHorizontalAlignment(HorizontalPanel.ALIGN_RIGHT); + contentPanel.add(buttonPanel); + + Button discardChanges = new Button(stringMessages.discardChanges()); + discardChanges.addClickHandler(e -> { + dialog.hide(); + setQueryDefinition(queryDefinitionToBeApplied); + queryDefinitionToBeApplied = null; + }); + buttonPanel.add(discardChanges); + + Button keepChanges = new Button(stringMessages.keepChanges()); + keepChanges.addClickHandler(e -> dialog.hide()); + buttonPanel.add(keepChanges); + + dialog.setWidget(contentPanel); + return dialog; + } + /** * 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 @@ -245,13 +295,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition dialog.show(); } - @Override - public void awaitReloadComponents() { - // Nothing to do here - } - - @Override - public boolean isAwaitingReload() { + public boolean providersAwaitingReload() { for (DataMiningComponentProvider provider : providers) { if (provider.isAwaitingReload()) { return true; @@ -289,12 +333,105 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition @Override public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { + if (queryDefinitionChanged) { + queryDefinitionToBeApplied = queryDefinition; + confirmChangeLossDialog.center(); + } else { + setQueryDefinition(queryDefinition); + } + } + + private void setQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { + // TODO The error dialog doesn't work for predefined queries, since they aren't localized + Set callbacks = new HashSet<>(); + Collection errorMessages = new ArrayList<>(); + String retrieverChainName = queryDefinition.getDataRetrieverChainDefinition().getName(); + setBlockChangeNotification(true); - statisticProvider.applyQueryDefinition(queryDefinition); - groupingProvider.applyQueryDefinition(queryDefinition); - filterSelectionProvider.applyQueryDefinition(queryDefinition); - setBlockChangeNotification(false); - notifyQueryDefinitionChanged(); + + ApplyCallback statisticCallback = new ApplyCallback(errorMessages, callbacks, retrieverChainName); + callbacks.add(statisticCallback); + statisticProvider.applyQueryDefinition(queryDefinition, statisticCallback); + // The statistic wasn't available, if the callback was called immediately and an error occurred + // Applying the query to the remaining component providers can be skipped + if (!callbacks.isEmpty() || errorMessages.isEmpty()) { + ApplyCallback groupingCallback = new ApplyCallback(errorMessages, callbacks, retrieverChainName); + callbacks.add(groupingCallback); + groupingProvider.applyQueryDefinition(queryDefinition, groupingCallback); + + ApplyCallback filterCallback = new ApplyCallback(errorMessages, callbacks, retrieverChainName); + callbacks.add(filterCallback); + filterSelectionProvider.applyQueryDefinition(queryDefinition, filterCallback); + } + + if (!callbacks.isEmpty()) { + for (ApplyCallback callback : callbacks) { + callback.isArmed = true; + } + } else { + if (!errorMessages.isEmpty()) { + showErrorWhileApplyingQueryDialog(errorMessages, retrieverChainName); + } + setBlockChangeNotification(false); + queryDefinitionChanged = false; + } + } + + private void showErrorWhileApplyingQueryDialog(Iterable errorMessages, String retrieverChainName) { + StringMessages stringMessages = getDataMiningStringMessages(); + + DialogBox dialog = new DialogBox(false, true); + dialog.setText(stringMessages.anErrorOccurredWhileApplyingTheQuery()); + dialog.setAnimationEnabled(true); + dialog.setGlassEnabled(true); + + VerticalPanel contentPanel = new VerticalPanel(); + contentPanel.add(new HTML(SafeHtmlUtils.fromString(stringMessages.queryBasedOnRetrieverChainCanNotBeApplied(retrieverChainName)))); + + HtmlUListBuilder messagesBuilder = HtmlBuilderFactory.get().createUListBuilder(); + for (String errorMessage : errorMessages) { + messagesBuilder.startLI().text(errorMessage).end(); + } + contentPanel.add(new HTML(messagesBuilder.asSafeHtml())); + + HorizontalPanel buttonPanel = new HorizontalPanel(); + buttonPanel.setHorizontalAlignment(HorizontalPanel.ALIGN_RIGHT); + contentPanel.add(buttonPanel); + + Button okButton = new Button(stringMessages.ok()); + okButton.addClickHandler(e -> dialog.hide()); + buttonPanel.add(okButton); + + dialog.setWidget(contentPanel); + dialog.center(); + } + + private class ApplyCallback implements Consumer> { + + private final Collection allMessages; + private final Set callbacks; + private final String retrieverChainName; + private boolean isArmed; + + public ApplyCallback(Collection allMessages, Set callbacks, String retrieverChainName) { + this.allMessages = allMessages; + this.callbacks = callbacks; + this.retrieverChainName = retrieverChainName; + } + + @Override + public void accept(Iterable messages) { + Util.addAll(messages, allMessages); + callbacks.remove(this); + if (isArmed && callbacks.isEmpty()) { + if (!allMessages.isEmpty()) { + showErrorWhileApplyingQueryDialog(allMessages, retrieverChainName); + } + setBlockChangeNotification(false); + queryDefinitionChanged = false; + } + } + } @Override @@ -377,41 +514,40 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition @Override public void dataRetrieverChainDefinitionChanged(DataRetrieverChainDefinitionDTO newDataRetrieverChainDefinition) { - if (isAwaitingReload()) { + if (providersAwaitingReload()) { groupingProvider.dataRetrieverChainDefinitionChanged(newDataRetrieverChainDefinition); groupingProvider.reloadComponents(); filterSelectionProvider.dataRetrieverChainDefinitionChanged(newDataRetrieverChainDefinition); filterSelectionProvider.reloadComponents(); } else { - notifyQueryDefinitionChanged(); + queryDefinitionChanged(); } } @Override public void aggregatorDefinitionChanged(AggregationProcessorDefinitionDTO newAggregatorDefinition) { - if (!isAwaitingReload()) { - notifyQueryDefinitionChanged(); - } + queryDefinitionChanged(); } @Override public void extractionFunctionChanged(FunctionDTO extractionFunction) { - if (!isAwaitingReload()) { - notifyQueryDefinitionChanged(); - } + queryDefinitionChanged(); } @Override public void groupingChanged() { - if (!isAwaitingReload()) { - notifyQueryDefinitionChanged(); - } + queryDefinitionChanged(); } @Override public void selectionChanged() { - if (!isAwaitingReload()) { + queryDefinitionChanged(); + } + + private void queryDefinitionChanged() { + if (!providersAwaitingReload()) { + queryDefinitionChanged = true; notifyQueryDefinitionChanged(); } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 deleted file mode 100644 index 2e426dac9b3..00000000000 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java +++ /dev/null @@ -1,307 +0,0 @@ -package com.sap.sse.datamining.ui.client.selection; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import com.google.gwt.event.logical.shared.ValueChangeEvent; -import com.google.gwt.event.logical.shared.ValueChangeHandler; -import com.google.gwt.i18n.client.LocaleInfo; -import com.google.gwt.text.shared.AbstractRenderer; -import com.google.gwt.user.client.rpc.AsyncCallback; -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.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.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; -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 AbstractDataMiningComponent - implements DataRetrieverChainDefinitionProvider { - - 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, - DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, - DataMiningSettingsControl settingsControl, DataMiningSettingsInfoManager settingsManager) { - super(parent, context); - this.dataMiningService = dataMiningService; - this.errorReporter = errorReporter; - this.retrieverLevelSettingsComponents = new ArrayList<>(); - listeners = new HashSet<>(); - isAwaitingReload = false; - this.settingsManager = settingsManager; - this.settingsControl = settingsControl; - this.settingsControl.addSettingsComponent(this); - settingsMap = new HashMap<>(); - - mainPanel = new HorizontalPanel(); - mainPanel.setSpacing(5); - mainPanel.add(new Label(getDataMiningStringMessages().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(); - } - - }); - retrieverChainsListBox.addValueChangeHandler(new ValueChangeHandler() { - @Override - public void onValueChange(ValueChangeEvent event) { - notifyListeners(); - } - }); - return retrieverChainsListBox; - } - - @Override - public void awaitReloadComponents() { - isAwaitingReload = true; - } - - @Override - public boolean isAwaitingReload() { - return isAwaitingReload; - } - - @Override - public void reloadComponents() { - updateRetrieverChains(); - } - - private void updateRetrieverChains() { - dataMiningService.getDataRetrieverChainDefinitions(LocaleInfo.getCurrentLocale().getLocaleName(), - new AsyncCallback>() { - @Override - public void onSuccess(ArrayList dataRetrieverChainDefinitions) { - settingsMap.clear(); - if (!dataRetrieverChainDefinitions.isEmpty()) { - fillSettingsMap(dataRetrieverChainDefinitions); - Collections.sort(dataRetrieverChainDefinitions); - - DataRetrieverChainDefinitionDTO currentRetrieverChain = getDataRetrieverChainDefinition(); - 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()); - notifyListeners(); - } - } - - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError( - "Error retrieving the available DataRetrieverChainDefinitions: " + caught.getMessage()); - } - }); - } - - private void fillSettingsMap(ArrayList retrieverChains) { - for (DataRetrieverChainDefinitionDTO retrieverChain : retrieverChains) { - if (retrieverChain.hasSettings()) { - settingsMap.put(retrieverChain, retrieverChain.getDefaultSettings()); - } - } - } - - @Override - public DataRetrieverChainDefinitionDTO getDataRetrieverChainDefinition() { - return retrieverChainsListBox.getValue(); - } - - @Override - public void addDataRetrieverChainDefinitionChangedListener(DataRetrieverChainDefinitionChangedListener listener) { - listeners.add(listener); - } - - private void notifyListeners() { - DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition = getDataRetrieverChainDefinition(); - for (DataRetrieverChainDefinitionChangedListener listener : listeners) { - listener.dataRetrieverChainDefinitionChanged(dataRetrieverChainDefinition); - } - } - - @Override - public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { - retrieverChainsListBox.setValue(queryDefinition.getDataRetrieverChainDefinition(), false); - } - - @Override - public String getLocalizedShortName() { - return getDataMiningStringMessages().dataMiningRetrieval(); - } - - @Override - public Widget getEntryWidget() { - return mainPanel; - } - - @Override - public boolean isVisible() { - return mainPanel.isVisible(); - } - - @Override - public void setVisible(boolean visibility) { - mainPanel.setVisible(visibility); - } - - @Override - public String getDependentCssClassName() { - return "simpleDataRetrieverChainDefinition"; - } - - @Override - public HashMap getRetrieverSettings() { - if (settingsMap.containsKey(getDataRetrieverChainDefinition())) { - return settingsMap.get(getDataRetrieverChainDefinition()); - } else { - return new HashMap<>(); - } - } - - @Override - public boolean hasSettings() { - return getDataRetrieverChainDefinition().hasSettings(); - } - - @Override - public SettingsDialogComponent getSettingsDialogComponent(CompositeSettings settings) { - retrieverLevelSettingsComponents.clear(); - retrieverLevelSettingsComponents.addAll(createSettingsComponentsFor(getDataRetrieverChainDefinition())); - return new CompositeTabbedSettingsDialogComponent(retrieverLevelSettingsComponents); - } - - private List> createSettingsComponentsFor(final DataRetrieverChainDefinitionDTO retrieverChain) { - List> settingsComponents = new ArrayList<>(); - 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()) { - @Override - 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); - } - }); - } - return settingsComponents; - } - - @Override - public void updateSettings(CompositeSettings newSettings) { - Map chainSettings = settingsMap - .get(getDataRetrieverChainDefinition()); - for (Entry settingsPerComponent : newSettings.getSettingsPerComponentId().entrySet()) { - RetrieverLevelSettingsComponent component = (RetrieverLevelSettingsComponent) findComponentById( - settingsPerComponent.getKey()); - SerializableSettings settings = (SerializableSettings) settingsPerComponent.getValue(); - chainSettings.put(component.getRetrieverLevel(), settings); - } - notifyListeners(); - } - - private Component findComponentById(String componentId) { - for (Component component : retrieverLevelSettingsComponents) { - if (component.getId().equals(componentId)) { - return component; - } - } - return null; - } - - @Override - public CompositeSettings getSettings() { - Map settings = new HashMap<>(); - 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()) { - @Override - 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 String getId() { - return "SimpleDataRetrieverChainDefinitionProvider"; - } -} diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 37f54558b27..f0fd25b1a85 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,6 +8,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.function.Consumer; import java.util.Objects; import java.util.Set; @@ -83,6 +84,7 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent availableAggregators; private AggregationProcessorDefinitionDTO aggregatorToSelect; + private Consumer> selectionCallback; public SuggestBoxStatisticProvider(Component parent, ComponentContext componentContext, DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, @@ -246,9 +248,10 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent> callback) { DataRetrieverChainDefinitionDTO retrieverChain = queryDefinition.getDataRetrieverChainDefinition(); FunctionDTO extractionFunction = queryDefinition.getStatisticToCalculate(); ExtractionFunctionWithContext statistic = new ExtractionFunctionWithContext(retrieverChain, extractionFunction); int index = availableExtractionFunctions.indexOf(statistic); if (index != -1) { statistic = availableExtractionFunctions.get(index); - } else { - availableExtractionFunctions.add(statistic); - } - - DataRetrieverChainDefinitionDTO oldRetrieverChain = getDataRetrieverChainDefinition(); - extractionFunctionSuggestBox.setExtractionFunction(statistic); - - AggregationProcessorDefinitionDTO aggregator = queryDefinition.getAggregatorDefinition(); - if (retrieverChain.equals(oldRetrieverChain)) { - if (availableAggregators.contains(aggregator)) { - aggregatorListBox.setValue(aggregator); + DataRetrieverChainDefinitionDTO oldRetrieverChain = getDataRetrieverChainDefinition(); + extractionFunctionSuggestBox.setExtractionFunction(statistic); + + aggregatorToSelect = queryDefinition.getAggregatorDefinition(); + selectionCallback = callback; + if (retrieverChain.equals(oldRetrieverChain)) { + setAggregator(aggregatorToSelect, selectionCallback); + aggregatorToSelect = null; + selectionCallback = null; } } else { - aggregatorToSelect = aggregator; + String errorMessage = getDataMiningStringMessages().statisticNotAvailable( + extractionFunction.getDisplayName()); + callback.accept(Collections.singleton(errorMessage)); } } + private void setAggregator(AggregationProcessorDefinitionDTO aggregator, Consumer> callback) { + Iterable callbackMessages = Collections.emptySet(); + if (availableAggregators.contains(aggregator)) { + aggregatorListBox.setValue(aggregator, true); + } else { + String errorMessage = getDataMiningStringMessages() + .aggregatorNotAvailable(aggregator.getDisplayName()); + callbackMessages = Collections.singleton(errorMessage); + } + callback.accept(callbackMessages); + } + @Override public void addStatisticChangedListener(StatisticChangedListener listener) { retrieverChainListeners.add(listener); From 58ae193adbf1a072e06546c8d0bc2a1391e4c49a Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 1 Aug 2018 21:38:28 +0200 Subject: [PATCH 064/197] Removed the dependency from PlainFilterSelectionPresenter to DataRetrieverChainDefinitionProvider --- .../PlainFilterSelectionPresenter.java | 22 ++----------------- ...lDimensionListFilterSelectionProvider.java | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index e810541157b..1c5a2a2e4d5 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,7 +8,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import com.google.gwt.dom.client.Style.FontWeight; import com.google.gwt.dom.client.Style.Unit; @@ -17,11 +16,8 @@ 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.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.client.DataRetrieverChainDefinitionChangedListener; -import com.sap.sse.datamining.ui.client.DataRetrieverChainDefinitionProvider; import com.sap.sse.datamining.ui.client.FilterSelectionPresenter; import com.sap.sse.datamining.ui.client.FilterSelectionProvider; import com.sap.sse.datamining.ui.client.StringMessages; @@ -30,24 +26,18 @@ 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, DataRetrieverChainDefinitionChangedListener { +public class PlainFilterSelectionPresenter extends AbstractComponent implements FilterSelectionPresenter { 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, - FilterSelectionProvider filterSelectionProvider) { + StringMessages stringMessages, FilterSelectionProvider filterSelectionProvider) { super(parent, context); this.filterSelectionProvider = filterSelectionProvider; this.filterSelectionProvider.addSelectionChangedListener(this); - // TODO Is listening to the retriever chain really necessary? Shouldn't the filter selection change - // if the filter selection provider is affected by a changing retriever chain? - retrieverChainProvider.addDataRetrieverChainDefinitionChangedListener(this); Label currentSelectionLabel = new Label(stringMessages.currentFilterSelection()); currentSelectionLabel.setWidth("75px"); @@ -59,14 +49,6 @@ public class PlainFilterSelectionPresenter extends AbstractComponent Date: Wed, 1 Aug 2018 21:52:38 +0200 Subject: [PATCH 065/197] Implemented feedback from the query runner to the query definition provider to prevent that the change loss dialog is shown after the query was stored in the results presenter --- .../ui/client/QueryDefinitionProvider.java | 2 + .../client/execution/SimpleQueryRunner.java | 27 +++++---- .../QueryDefinitionProviderWithControls.java | 59 ++++++++++--------- 3 files changed, 49 insertions(+), 39 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 2de05ddf9e0..2358ac5204b 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -11,6 +11,8 @@ public interface QueryDefinitionProvider extends StatisticQueryDefinitionDTO getQueryDefinition(); Iterable validateQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition); + + void queryDefinitionChangesHaveBeenStored(); void addQueryDefinitionChangedListener(QueryDefinitionChangedListener listener); void removeQueryDefinitionChangedListener(QueryDefinitionChangedListener listener); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 48fcf9b818c..bbf1c90004d 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -52,7 +52,7 @@ public class SimpleQueryRunner extends AbstractDataMiningComponent parent, ComponentContext context, DataMiningSession session, - DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, + DataMiningServiceAsync dataMiningService, ErrorReporter errorReporter, QueryDefinitionProvider queryDefinitionProvider, CompositeResultsPresenter resultsPresenter) { super(parent, context); this.session = session; @@ -90,17 +90,20 @@ public class SimpleQueryRunner extends AbstractDataMiningComponent(counter) { - @Override - protected void handleFailure(Throwable caught) { - errorReporter.reportError("Error running the query: " + caught.getMessage()); - resultsPresenter.showError(presenterId, getDataMiningStringMessages().errorRunningDataMiningQuery() + "."); - } - @Override - protected void handleSuccess(QueryResultDTO result) { - resultsPresenter.showResult(presenterId, queryDefinition, result); - } - }); + dataMiningService.runQuery(session, queryDefinition, + new ManagedDataMiningQueryCallback(counter) { + @Override + protected void handleSuccess(QueryResultDTO result) { + resultsPresenter.showResult(presenterId, queryDefinition, result); + queryDefinitionProvider.queryDefinitionChangesHaveBeenStored(); + } + @Override + protected void handleFailure(Throwable caught) { + errorReporter.reportError("Error running the query: " + caught.getMessage()); + resultsPresenter.showError(presenterId, + getDataMiningStringMessages().errorRunningDataMiningQuery() + "."); + } + }); } else { resultsPresenter.showError(presenterId, getDataMiningStringMessages().queryNotValidBecause(), errorMessages); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 510a94e8966..b803f705e29 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -405,33 +405,10 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition dialog.setWidget(contentPanel); dialog.center(); } - - private class ApplyCallback implements Consumer> { - - private final Collection allMessages; - private final Set callbacks; - private final String retrieverChainName; - private boolean isArmed; - - public ApplyCallback(Collection allMessages, Set callbacks, String retrieverChainName) { - this.allMessages = allMessages; - this.callbacks = callbacks; - this.retrieverChainName = retrieverChainName; - } - - @Override - public void accept(Iterable messages) { - Util.addAll(messages, allMessages); - callbacks.remove(this); - if (isArmed && callbacks.isEmpty()) { - if (!allMessages.isEmpty()) { - showErrorWhileApplyingQueryDialog(allMessages, retrieverChainName); - } - setBlockChangeNotification(false); - queryDefinitionChanged = false; - } - } - + + @Override + public void queryDefinitionChangesHaveBeenStored() { + queryDefinitionChanged = false; } @Override @@ -510,6 +487,34 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition return "QueryDefinitionProviderWithControls"; } + private class ApplyCallback implements Consumer> { + + private final Collection allMessages; + private final Set callbacks; + private final String retrieverChainName; + private boolean isArmed; + + public ApplyCallback(Collection allMessages, Set callbacks, String retrieverChainName) { + this.allMessages = allMessages; + this.callbacks = callbacks; + this.retrieverChainName = retrieverChainName; + } + + @Override + public void accept(Iterable messages) { + Util.addAll(messages, allMessages); + callbacks.remove(this); + if (isArmed && callbacks.isEmpty()) { + if (!allMessages.isEmpty()) { + showErrorWhileApplyingQueryDialog(allMessages, retrieverChainName); + } + setBlockChangeNotification(false); + queryDefinitionChanged = false; + } + } + + } + private class ProviderListener implements StatisticChangedListener, FilterSelectionChangedListener, GroupingChangedListener { @Override From 72571b00a3e92b4ae040be52ec7ed7e3af5799e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 2 Aug 2018 08:49:04 +0200 Subject: [PATCH 066/197] bug4693 fix for ie11 not reliably interacting with stale adminconsole --- .../TestSwitchingOffStartOfRaceInference.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java index 45ad3626cc8..5d36883156b 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java @@ -56,7 +56,7 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { this.raceColumn = new RaceDescriptor("D3", "Default", false, false, 0.0); clearState(getContextRoot()); super.setUp(); - adminConsole = configureRegattaAndLeaderboard(); + configureRegattaAndLeaderboard(); } @Test @@ -73,7 +73,9 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { String raceColumnContent = e.getColumnContent(d3ColumnIndex); assertTrue(Integer.parseInt(raceColumnContent) > 0); // all competitors have a positive score in R3 } - adminConsoleWindow.switchToWindow(); + + WebDriver driver = adminConsoleWindow.switchToWindow(); + AdminConsolePage adminConsole = AdminConsolePage.goToPage(driver, getContextRoot()); // Go to the administration console and unset the "useStartTimeInference" flag RegattaStructureManagementPanelPO regattaManagementPanel = adminConsole.goToRegattaStructure(); RegattaListCompositePO regattaList = regattaManagementPanel.getRegattaList(); @@ -90,7 +92,7 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { }); } - private AdminConsolePage configureRegattaAndLeaderboard() { + private void configureRegattaAndLeaderboard() { // Open the admin console for some configuration steps AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); // Create a regatta with 1 series and 5 races as well as a leaderboard @@ -114,6 +116,5 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { leaderboardConfiguration.createRegattaLeaderboard(this.regatta); LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(LEADERBOARD); leaderboardDetails.linkRace(this.raceColumn, this.trackedRace); - return adminConsole; } } From 6131d621ac83769accc77f111d4412f986fef3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 2 Aug 2018 08:52:28 +0200 Subject: [PATCH 067/197] bug4693 removed leftover variable --- .../test/leaderboard/TestSwitchingOffStartOfRaceInference.java | 1 - 1 file changed, 1 deletion(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java index 5d36883156b..9d192680e73 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java @@ -45,7 +45,6 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest { private TrackableRaceDescriptor trackableRace; private TrackedRaceDescriptor trackedRace; private RaceDescriptor raceColumn; - private AdminConsolePage adminConsole; @Override @Before From 2dc182558a7812df234bb32bebb223e7e9fee3c0 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 2 Aug 2018 10:22:27 +0200 Subject: [PATCH 068/197] Added a method to DataMiningService to newly localize a query definition DTO --- .../gwt/ui/server/DataMiningServiceImpl.java | 14 ++++- .../ui/client/DataMiningService.java | 4 +- .../ui/client/DataMiningServiceAsync.java | 6 +- .../developer/PredefinedQueryRunner.java | 24 ++++---- .../QueryDefinitionProviderWithControls.java | 3 +- .../factories/DataMiningDTOFactory.java | 55 +++++++++++++++++++ 6 files changed, 90 insertions(+), 16 deletions(-) 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 d0c6ef76c69..b2e81643876 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 @@ -350,10 +350,10 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM } @Override - public StatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier) { + public StatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier, String localeInfoName) { SecurityUtils.getSubject().checkPermission( Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, identifier.getIdentifier())); - return getDataMiningServer().getPredefinedQueryDefinitionDTO(identifier); + return localize(getDataMiningServer().getPredefinedQueryDefinitionDTO(identifier), localeInfoName); } @Override @@ -370,6 +370,16 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM } return null; } + + @Override + public StatisticQueryDefinitionDTO localize(StatisticQueryDefinitionDTO queryDefinitionDTO, String localeInfoName) { + SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, + queryDefinitionDTO.getDataRetrieverChainDefinition().getName())); + DataMiningServer dataMiningServer = getDataMiningServer(); + StatisticQueryDefinition queryDefinition = dataMiningServer.getQueryDefinitionForDTO(queryDefinitionDTO); + Locale locale = ResourceBundleStringMessages.Util.getLocaleFor(localeInfoName); + return dtoFactory.createQueryDefinitionDTO(queryDefinition, dataMiningServer.getStringMessages(), locale, localeInfoName); + } @Override public SerializationDummy pseudoMethodSoThatSomeClassesAreAddedToTheGWTSerializationPolicy() { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 94042c62b44..4930cd1ed66 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -53,10 +53,12 @@ public interface DataMiningService extends RemoteService { HashSet getPredefinedQueryIdentifiers(); - StatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier); + StatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier, String localeInfoName); QueryResultDTO runPredefinedQuery(DataMiningSession session, PredefinedQueryIdentifier identifier, String localeInfoName); + + StatisticQueryDefinitionDTO localize(StatisticQueryDefinitionDTO queryDefinition, String localeInfoName); SerializationDummy pseudoMethodSoThatSomeClassesAreAddedToTheGWTSerializationPolicy(); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index f156e632972..c3ab732fdd5 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -55,11 +55,15 @@ public interface DataMiningServiceAsync { void getPredefinedQueryIdentifiers(AsyncCallback> callback); - void getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier, AsyncCallback callback); + void getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier, String localeInfoName, + AsyncCallback callback); void runPredefinedQuery(DataMiningSession session, PredefinedQueryIdentifier identifier, String localeInfoName, AsyncCallback> callback); + + void localize(StatisticQueryDefinitionDTO queryDefinition, String localeInfoName, + AsyncCallback callback); /** * This method does nothing, but is needed to ensure, that some classes for the data mining (like diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index f4030a377fe..5e01eebdd83 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -7,6 +7,7 @@ import java.util.function.Consumer; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.i18n.client.LocaleInfo; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.DialogBox; @@ -138,17 +139,18 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { protected void runSelectedPredefinedQuery() { PredefinedQueryIdentifier predefinedQueryIdentifier = selectionListBox.getValue(); - dataMiningService.getPredefinedQueryDefinition(predefinedQueryIdentifier, new AsyncCallback() { - @Override - public void onSuccess(StatisticQueryDefinitionDTO queryDefinition) { - queryDefinitionProvider.applyQueryDefinition(queryDefinition); - queryRunner.accept(queryDefinition); - } - @Override - public void onFailure(Throwable error) { - errorReporter.reportError("Error running the query: " + error.getMessage()); - } - }); + dataMiningService.getPredefinedQueryDefinition(predefinedQueryIdentifier, + LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback() { + @Override + public void onSuccess(StatisticQueryDefinitionDTO queryDefinition) { + queryDefinitionProvider.applyQueryDefinition(queryDefinition); + queryRunner.accept(queryDefinition); + } + @Override + public void onFailure(Throwable error) { + errorReporter.reportError("Error running the query: " + error.getMessage()); + } + }); dialogBox.hide(); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index b803f705e29..880f5762b64 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -342,9 +342,10 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition } private void setQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { - // TODO The error dialog doesn't work for predefined queries, since they aren't localized Set callbacks = new HashSet<>(); Collection errorMessages = new ArrayList<>(); + errorMessages.add("Test"); + errorMessages.add(queryDefinition.getStatisticToCalculate().getDisplayName()); String retrieverChainName = queryDefinition.getDataRetrieverChainDefinition().getName(); setBlockChangeNotification(true); diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/DataMiningDTOFactory.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/DataMiningDTOFactory.java index 0e2f36bd1a7..1bade7728ac 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/DataMiningDTOFactory.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/DataMiningDTOFactory.java @@ -2,9 +2,16 @@ package com.sap.sse.datamining.factories; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Locale; +import java.util.Map; +import java.util.Map.Entry; +import com.sap.sse.common.settings.SerializableSettings; +import com.sap.sse.datamining.StatisticQueryDefinition; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Dimension; import com.sap.sse.datamining.components.AggregationProcessorDefinition; @@ -12,16 +19,64 @@ import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.data.QueryResult; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.impl.components.DataRetrieverLevel; +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.DataRetrieverLevelDTO; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.shared.impl.dto.LocalizedTypeDTO; +import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.i18n.ResourceBundleStringMessages; public class DataMiningDTOFactory { + public StatisticQueryDefinitionDTO createQueryDefinitionDTO(StatisticQueryDefinition queryDefinition, + ResourceBundleStringMessages stringMessages, Locale locale, String localeInfoName) { + FunctionDTO statisticToCalculate = createFunctionDTO(queryDefinition.getStatisticToCalculate(), stringMessages, + locale); + AggregationProcessorDefinitionDTO aggregatorDefinition = createAggregationProcessorDefinitionDTO( + queryDefinition.getAggregatorDefinition(), stringMessages, locale); + DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition = createDataRetrieverChainDefinitionDTO( + queryDefinition.getDataRetrieverChainDefinition(), stringMessages, locale); + ModifiableStatisticQueryDefinitionDTO queryDefinitionDTO = new ModifiableStatisticQueryDefinitionDTO( + localeInfoName, statisticToCalculate, aggregatorDefinition, dataRetrieverChainDefinition); + + Map, SerializableSettings> retrieverSettings = queryDefinition.getRetrieverSettings(); + Map, Map, Collection>> filterSelection = queryDefinition + .getFilterSelection(); + DataRetrieverChainDefinition retrieverChain = queryDefinition.getDataRetrieverChainDefinition(); + List> retrieverLevels = retrieverChain.getDataRetrieverLevels(); + for (int level = 0; level < retrieverLevels.size(); level++) { + DataRetrieverLevel retrieverLevel = retrieverLevels.get(level); + DataRetrieverLevelDTO retrieverLevelDTO = dataRetrieverChainDefinition.getRetrieverLevel(level); + + SerializableSettings levelSettings = retrieverSettings.get(retrieverLevel); + if (levelSettings != null) { + queryDefinitionDTO.setRetrieverSettings(retrieverLevelDTO, levelSettings); + } + + HashMap> levelFilterSelection = new HashMap<>(); + if (filterSelection.containsKey(retrieverLevel)) { + for (Entry, Collection> dimensionFilterSelection : filterSelection.get(retrieverLevel) + .entrySet()) { + @SuppressWarnings("unchecked") + HashSet filterValues = new HashSet<>( + (Collection) dimensionFilterSelection.getValue()); + levelFilterSelection.put( + createFunctionDTO(dimensionFilterSelection.getKey(), stringMessages, locale), filterValues); + } + } + queryDefinitionDTO.setFilterSelectionFor(retrieverLevelDTO, levelFilterSelection); + } + + for (Function dimensionToGroupBy : queryDefinition.getDimensionsToGroupBy()) { + queryDefinitionDTO.appendDimensionToGroupBy(createFunctionDTO(dimensionToGroupBy, stringMessages, locale)); + } + + return queryDefinitionDTO; + } + /** * Creates the corresponding DTO for the given {@link Function}, without localization.
* The display name of the resulting DTO is the {@link Function#getSimpleName() simple name} of the given function. From 1e0352ffb2380c491d3457dd608c084b49e0db97 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 2 Aug 2018 10:27:29 +0200 Subject: [PATCH 069/197] Forgot to remove test error messages when applying a query definition --- .../client/selection/QueryDefinitionProviderWithControls.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 880f5762b64..fdfeacd1861 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -344,8 +344,6 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition private void setQueryDefinition(StatisticQueryDefinitionDTO queryDefinition) { Set callbacks = new HashSet<>(); Collection errorMessages = new ArrayList<>(); - errorMessages.add("Test"); - errorMessages.add(queryDefinition.getStatisticToCalculate().getDisplayName()); String retrieverChainName = queryDefinition.getDataRetrieverChainDefinition().getName(); setBlockChangeNotification(true); From ddcbaf2e4c9138b8cbdc8b8b2a3744f67220c2f2 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Thu, 2 Aug 2018 10:33:43 +0200 Subject: [PATCH 070/197] Fixed title of run predefined query dialog --- .../datamining/ui/client/developer/PredefinedQueryRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 5e01eebdd83..bf6a7b7ddcb 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -61,7 +61,7 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings { }); dialogBox = new DialogBox(false, true); - dialogBox.setText(stringMessages.viewQueryDefinition()); + dialogBox.setText(stringMessages.runPredefinedQuery()); dialogBox.setAnimationEnabled(true); Button closeButton = new Button(stringMessages.close(), new ClickHandler() { From 01fdcfe1bad2059b3afe9a4592e5af795ee1e361 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Thu, 2 Aug 2018 11:10:53 +0200 Subject: [PATCH 071/197] Bug 4693: We solved the incompatibilities with IEDriverServer 3.13. Removed notes about this from local-test-environment.xml --- .../local-test-environment.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/local-test-environment.xml b/java/com.sap.sailing.selenium.test/local-test-environment.xml index 8b030fa110d..c8123f620ce 100644 --- a/java/com.sap.sailing.selenium.test/local-test-environment.xml +++ b/java/com.sap.sailing.selenium.test/local-test-environment.xml @@ -72,12 +72,6 @@ With IE 10/11, only the 32Bit version works by the time of writing. - In addition, versions 3.11 to 3.13 are known bad because these often fail with a - org.openqa.selenium.ElementClickInterceptedException in case of modal GWT dialogs are shown. - This is probably related to the following bug: https://github.com/SeleniumHQ/selenium/issues/5935 - If you see suspicous ElementClickInterceptedExceptions, use IEDriverServer version 3.10: - https://selenium-release.storage.googleapis.com/index.html?path=3.10/ - Some further configuration steps may be required depending on the OS and IE version: https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver#required-configuration --> From c780d0f3a5562f5db3c2b5c8647b58a8713d7856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 2 Aug 2018 13:31:39 +0200 Subject: [PATCH 072/197] bug4693 in some rare cases, the test are faster than the data loads in the table, wait for the data --- .../LeaderboardDetailsPanelPO.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardDetailsPanelPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardDetailsPanelPO.java index 20174b1bacd..a9ba620a57b 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardDetailsPanelPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/leaderboard/LeaderboardDetailsPanelPO.java @@ -3,9 +3,11 @@ package com.sap.sailing.selenium.pages.adminconsole.leaderboard; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.function.Function; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.WebDriverWait; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; @@ -166,10 +168,19 @@ public class LeaderboardDetailsPanelPO extends PageArea { } public void linkRace(RaceDescriptor race, TrackedRaceDescriptor tracking) { - DataEntryPO raceRow = findRace(race); - DataEntryPO trackingRow = findTracking(tracking); - if(raceRow == null || trackingRow == null) { - } + WebDriverWait webDriverWait = new WebDriverWait(driver, DEFAULT_LOOKUP_TIMEOUT); + DataEntryPO raceRow = webDriverWait.until(new Function() { + @Override + public DataEntryPO apply(WebDriver t) { + return findRace(race); + } + }); + DataEntryPO trackingRow = webDriverWait.until(new Function() { + @Override + public DataEntryPO apply(WebDriver t) { + return findTracking(tracking); + } + }); raceRow.select(); trackingRow.select(); waitForAjaxRequests(); // the selection will update elements of the cell table; wait until the callback has been received From 285351e6943562203efa6ed28cc18752784841e5 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Fri, 3 Aug 2018 08:31:26 +0200 Subject: [PATCH 073/197] Bug 4693: Always creating a new WebDriver per test case --- .../sailing/selenium/core/WindowManager.java | 34 ++++++++++++------- .../core/impl/TestEnvironmentImpl.java | 9 ++--- .../selenium/test/AbstractSeleniumTest.java | 2 +- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java index 05f3cbe349c..c4607808d70 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java @@ -16,9 +16,9 @@ import org.openqa.selenium.WebDriver; * Riccardo Nimser (D049941) */ public class WindowManager { - private final WebDriverWindow defaultWindow; + private WebDriverWindow defaultWindow; private final Set allWindows = new HashSet<>(); - private final WebDriver driver; + private WebDriver driver; private final Supplier webDriverFactory; @@ -28,15 +28,23 @@ public class WindowManager { * @param driver * */ - public WindowManager(WebDriver driver, Supplier webDriverFactory) { - this.driver = driver; - defaultWindow = new ManagedWebDriverWindow(this.driver, this.driver.getWindowHandle()); + public WindowManager(Supplier webDriverFactory) { this.webDriverFactory = webDriverFactory; - - setWindowMaximized(this.driver); + } + + public WebDriver getDefaultWebDriver() { + if (this.driver == null) { + this.driver = webDriverFactory.get(); + this.defaultWindow = new ManagedWebDriverWindow(this.driver, this.driver.getWindowHandle()); + setWindowMaximized(this.driver); + } + return this.driver; } public void withExtraWindow(BiConsumer defaultAndExtraWindow) { + // ensures that a default window exists + getDefaultWebDriver(); + final WebDriver extraDriver = webDriverFactory.get(); final WebDriverWindow extraWindow = new ManagedWebDriverWindow(extraDriver, extraDriver.getWindowHandle()); @@ -74,12 +82,8 @@ public class WindowManager { new HashSet<>(this.allWindows).forEach(windowConsumer); } - public void closeAllExtraWindows() { - forEachOpenedWindow(window -> { - if (window != defaultWindow) { - window.close(); - } - }); + public void closeAllWindows() { + forEachOpenedWindow(WebDriverWindow::close); } private class ManagedWebDriverWindow extends WebDriverWindow { @@ -90,6 +94,10 @@ public class WindowManager { @Override public void close() { allWindows.remove(this); + if (this == defaultWindow) { + defaultWindow = null; + driver = null; + } super.close(); } } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/TestEnvironmentImpl.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/TestEnvironmentImpl.java index 410c28113f3..a1396cf2e87 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/TestEnvironmentImpl.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/impl/TestEnvironmentImpl.java @@ -15,7 +15,6 @@ import com.sap.sailing.selenium.core.WindowManager; * D049941 */ public class TestEnvironmentImpl implements TestEnvironment { - private WebDriver driver; private WindowManager manager; private String root; private File screenshotsFolder; @@ -31,16 +30,15 @@ public class TestEnvironmentImpl implements TestEnvironment { * The folder where screenshots should be stored. */ public TestEnvironmentImpl(Supplier webDriverFactory, String root, File screenshotsFolder) { - this.driver = webDriverFactory.get(); this.root = root; this.screenshotsFolder = screenshotsFolder; - this.manager = new WindowManager(driver, webDriverFactory); + this.manager = new WindowManager(webDriverFactory); } @Override public WebDriver getWebDriver() { - return this.driver; + return this.manager.getDefaultWebDriver(); } @Override @@ -62,8 +60,7 @@ public class TestEnvironmentImpl implements TestEnvironment { *

Closes the test environment. This quits the web driver, closing every associated window.

*/ public void close() { - this.driver.quit(); - this.driver = null; + this.manager.closeAllWindows(); this.root = null; this.screenshotsFolder = null; } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java index a9af2a50148..19b9552bddd 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java @@ -201,7 +201,7 @@ public abstract class AbstractSeleniumTest { @Override public void finished(FrameworkMethod method) { try { - environment.getWindowManager().closeAllExtraWindows(); + environment.getWindowManager().closeAllWindows(); } finally { super.finished(method); } From 4ccf20116f61067f71e7cb7da0766ac6920bc222 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Fri, 3 Aug 2018 10:10:43 +0200 Subject: [PATCH 074/197] Bug 4693: Updated selenium documentation regarding IE11 --- .../local-test-environment.xml | 8 +------- wiki/howto/development/selenium-ui-tests.md | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/local-test-environment.xml b/java/com.sap.sailing.selenium.test/local-test-environment.xml index c8123f620ce..2082cb0737b 100644 --- a/java/com.sap.sailing.selenium.test/local-test-environment.xml +++ b/java/com.sap.sailing.selenium.test/local-test-environment.xml @@ -66,14 +66,8 @@ --> diff --git a/java/com.sap.sailing.gwt.ui/AutoPlay.html b/java/com.sap.sailing.gwt.ui/AutoPlay.html index 66bf31d3024..660aef8d4d7 100644 --- a/java/com.sap.sailing.gwt.ui/AutoPlay.html +++ b/java/com.sap.sailing.gwt.ui/AutoPlay.html @@ -41,7 +41,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html b/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html index 7d41e6e92cc..2fad77c4f0d 100644 --- a/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html +++ b/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html @@ -20,7 +20,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/Home.html b/java/com.sap.sailing.gwt.ui/Home.html index 7682288bf02..47a0eaede71 100644 --- a/java/com.sap.sailing.gwt.ui/Home.html +++ b/java/com.sap.sailing.gwt.ui/Home.html @@ -12,7 +12,7 @@ href="/sailing-normalize-3.0.2.cache.css"> - + diff --git a/java/com.sap.sailing.gwt.ui/Leaderboard.html b/java/com.sap.sailing.gwt.ui/Leaderboard.html index 39007c2c267..ca564a6ef2a 100755 --- a/java/com.sap.sailing.gwt.ui/Leaderboard.html +++ b/java/com.sap.sailing.gwt.ui/Leaderboard.html @@ -18,7 +18,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/PairingList.html b/java/com.sap.sailing.gwt.ui/PairingList.html index 88c34a0df56..ba01a9bf78a 100644 --- a/java/com.sap.sailing.gwt.ui/PairingList.html +++ b/java/com.sap.sailing.gwt.ui/PairingList.html @@ -18,7 +18,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/RaceBoard.html b/java/com.sap.sailing.gwt.ui/RaceBoard.html index 2d27aa88a80..2d5cf793546 100644 --- a/java/com.sap.sailing.gwt.ui/RaceBoard.html +++ b/java/com.sap.sailing.gwt.ui/RaceBoard.html @@ -20,7 +20,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/js/jquery-1.11.1.min.js b/java/com.sap.sailing.gwt.ui/js/jquery-1.11.1.min.js deleted file mode 100644 index ab28a24729b..00000000000 --- a/java/com.sap.sailing.gwt.ui/js/jquery-1.11.1.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h; -if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:k.htmlSerialize?[0,"",""]:[1,"X
","
"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m(" - - \ No newline at end of file diff --git a/java/com.sap.sailing.server.gateway/utils/tvScreenWithTwoIFrames.html b/java/com.sap.sailing.server.gateway/utils/tvScreenWithTwoIFrames.html deleted file mode 100755 index 171f52b881f..00000000000 --- a/java/com.sap.sailing.server.gateway/utils/tvScreenWithTwoIFrames.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - URL 1: 
- URL 2: 
- Position:  Left: Top:
- Size:  Width: Height:
- - - - - - - -
X
- - - - \ No newline at end of file From fd2073314591c642bb298de9bb2212b1046ae7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 20 Aug 2018 10:06:50 +0200 Subject: [PATCH 140/197] bug4718 updated dashboards to use jquery 3.3.1 --- java/com.sap.sailing.dashboards.gwt/RibDashboard.html | 2 +- java/com.sap.sailing.dashboards.gwt/js/jquery-3.3.1.min.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 java/com.sap.sailing.dashboards.gwt/js/jquery-3.3.1.min.js diff --git a/java/com.sap.sailing.dashboards.gwt/RibDashboard.html b/java/com.sap.sailing.dashboards.gwt/RibDashboard.html index 44d3171f5e4..3bea985d183 100644 --- a/java/com.sap.sailing.dashboards.gwt/RibDashboard.html +++ b/java/com.sap.sailing.dashboards.gwt/RibDashboard.html @@ -17,7 +17,7 @@ Dashboard - + diff --git a/java/com.sap.sailing.dashboards.gwt/js/jquery-3.3.1.min.js b/java/com.sap.sailing.dashboards.gwt/js/jquery-3.3.1.min.js new file mode 100644 index 00000000000..4d9b3a25875 --- /dev/null +++ b/java/com.sap.sailing.dashboards.gwt/js/jquery-3.3.1.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"
","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w(" + diff --git a/java/com.sap.sailing.gwt.ui/imprint.json b/java/com.sap.sailing.gwt.ui/imprint.json index 35a4a619717..cae3e2c9ada 100644 --- a/java/com.sap.sailing.gwt.ui/imprint.json +++ b/java/com.sap.sailing.gwt.ui/imprint.json @@ -563,6 +563,16 @@ "Copyright 2011, John Resig" ], "key": "MITL" + }, + { + "name": "JQuery", + "version": "3.3.1", + "owner": "jQuery Foundation and other contributors", + "homepage": "http://jquery.com/", + "acknowledgements": [ + "Copyright 2018 jQuery Foundation and other contributors" + ], + "key": "MITL" }, { "name": "json-simple", @@ -731,7 +741,7 @@ "owner": "\"Mr.doob\"", "homepage": "https://threejs.org/", "acknowledgements": [ - "Copyright © 2010-2017 three.js authors" + "Copyright � 2010-2017 three.js authors" ], "key": "MIT" }, From df583172cb42cfaec5384adc4d993449aa67a6f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 20 Aug 2018 10:10:05 +0200 Subject: [PATCH 142/197] bug4718 updated Datamining.html to use jquery 3.3.1 --- java/com.sap.sailing.gwt.ui/DataMining.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/DataMining.html b/java/com.sap.sailing.gwt.ui/DataMining.html index 9f93882c9d2..46a0764ba3a 100644 --- a/java/com.sap.sailing.gwt.ui/DataMining.html +++ b/java/com.sap.sailing.gwt.ui/DataMining.html @@ -17,7 +17,7 @@ - + From d98b3d9f9473290181fe3a22207d9d1a1b80d58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 20 Aug 2018 10:10:22 +0200 Subject: [PATCH 143/197] bug4718 updated DashBoardManifest to use jquery 3.3.1 --- .../dashboards/gwt/client/linker/DashboardManifestLinker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/linker/DashboardManifestLinker.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/linker/DashboardManifestLinker.java index 29e8ec2ec0b..9ce145b54d3 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/linker/DashboardManifestLinker.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/linker/DashboardManifestLinker.java @@ -16,7 +16,7 @@ public class DashboardManifestLinker extends ManifestLinker { return new String[] { "/dashboards/RibDashboard.html", "/dashboards/RibDashboard.css", "/dashboards/images/dashboardicon.png", - "/dashboards/js/jquery-1.5.2.min.js", + "/dashboards/js/jquery-3.3.1.min.js", "/sailing-fontface-1.0.cache.css"}; } } From 668a49dedc3717f735ef15113f355696dc106891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 20 Aug 2018 10:11:36 +0200 Subject: [PATCH 144/197] bug4718 removed old comments regarding highcharts & jquery version. Most bugs described there are related to wrong initialisation of highcharts. This was already solved with the upgrade of the highcharts library and wrapper --- wiki/info/landscape/development-environment.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/wiki/info/landscape/development-environment.md b/wiki/info/landscape/development-environment.md index 33393c125b6..8912e8a0c85 100644 --- a/wiki/info/landscape/development-environment.md +++ b/wiki/info/landscape/development-environment.md @@ -87,8 +87,4 @@ We use the Highcharts library to present graphs to the user. These graphs are us * The GWT Highcharts Wrapper – The source code can be found in our project and it’s slightly modified to match our scenario * The actual Highcharts Library -* The jQuery Library - -To support polar diagrams we use version 3.5.0 of the wrapper. This version is tested with version 2.3.3 of the Highcharts library. We tried using 2.3.5 but that led to problems when resizing the RaceBoard. - -Highcharts uses the jQuery library. We do know that version 1.4.2 does NOT work with the versions of Highcharts mentioned above. Multiple yAxis are not initialized correctly. We know use version 1.5.2 of this library. \ No newline at end of file +* The jQuery Library \ No newline at end of file From 5762043b6862d1940c88a6846335ab7ac58d6f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Mon, 20 Aug 2018 11:36:25 +0200 Subject: [PATCH 145/197] bug4718 fixed typo in jquery url --- java/com.sap.sailing.gwt.ui/AutoPlay.html | 2 +- java/com.sap.sailing.gwt.ui/Leaderboard.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/AutoPlay.html b/java/com.sap.sailing.gwt.ui/AutoPlay.html index 660aef8d4d7..911b2e94ae1 100644 --- a/java/com.sap.sailing.gwt.ui/AutoPlay.html +++ b/java/com.sap.sailing.gwt.ui/AutoPlay.html @@ -41,7 +41,7 @@ - diff --git a/java/com.sap.sailing.gwt.ui/Leaderboard.html b/java/com.sap.sailing.gwt.ui/Leaderboard.html index ca564a6ef2a..c3cd86f5304 100755 --- a/java/com.sap.sailing.gwt.ui/Leaderboard.html +++ b/java/com.sap.sailing.gwt.ui/Leaderboard.html @@ -18,7 +18,7 @@ - From cfc3c7ff91704bc6275885d34844c9803b71db88 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Mon, 20 Aug 2018 11:58:51 +0200 Subject: [PATCH 146/197] bug4134_2: SailingAnalyticsNotes.html --- .../places/whatsnew/resources/SailingAnalyticsNotes.html | 4 ++++ 1 file changed, 4 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 aa3858de21b..0111b5dde64 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,10 @@

What's New - SAP Sailing Analytics

+
August 2018
+
    +
  • The windstreamlets are now colored according to the maximum and minimum windspeed in the windfield. +
    July 2018
    • The Maneuver Table now uses the same color coding for competitors as the leaderboard to help From f5313a113a52b6dd26737ba1dc95dd26ed9272f6 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Aug 2018 13:25:33 +0200 Subject: [PATCH 147/197] added a CountDownLatch to ensure all Receiver queues have finished processing during test execution Change-Id: Iab4cbf963efa742cd0041aea01c7f81add3f0fef --- .../sailing/domain/test/OnlineTracTracBasedTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java index 53d5c170ac0..7895eb8e3fd 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java @@ -14,6 +14,7 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.CountDownLatch; import java.util.logging.Logger; import java.util.regex.Pattern; @@ -184,7 +185,16 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest i getSemaphor().wait(); } } - logger.info("Stored data has been loaded for " + race.getName()); + logger.info("Stored data has been loaded for " + race.getName()+". Waiting for receivers to process it..."); + final CountDownLatch latch = new CountDownLatch(receivers.size()); + for (Receiver receiver : receivers) { + receiver.callBackWhenLoadingQueueIsDone(r->{ + latch.countDown(); + logger.info(receiver+" done loading"); + }); + } + latch.await(); + logger.info("Stored data has been processed by receivers"); for (Receiver receiver : receivers) { logger.info("Stopping receiver "+receiver); receiver.stopAfterNotReceivingEventsForSomeTime(/* timeoutInMilliseconds */ 5000l); From 9b49623147a056053a973aac223d7f4a35530858 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Aug 2018 16:56:38 +0200 Subject: [PATCH 148/197] changed test verdict for wind estimation from maneuvers test Change-Id: I318e0dce03ae64902b862558cb0f00a7e775eb9b --- .../TestWindEstimationFromManeuversOnAFew505Races.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 849603756b1..a3f851d524c 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 @@ -108,7 +108,7 @@ public class TestWindEstimationFromManeuversOnAFew505Races extends OnlineTracTra CreateModelException, NotEnoughDataHasBeenAddedException { setUp("event_20110609_KielerWoch-505_race_4"); Wind average = getManeuverBasedAverageWind(); - assertEquals(270, average.getFrom().getDegrees(), 9.0); + assertEquals(265, average.getFrom().getDegrees(), 9.0); } @Test From 3565ab0510e25e1fcf4b186cd749fc2d3555b06e Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Mon, 20 Aug 2018 17:14:24 +0200 Subject: [PATCH 149/197] bug4134_2: Added try catch block to ColorMapper --- .../ui/simulator/streamlets/ColorMapper.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java index a1bdd263d44..05fcf948197 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java @@ -38,15 +38,21 @@ public class ColorMapper implements ValueRangeFlexibleBoundariesChangedListener * value outside the {@link #valueRange} an {@link IllegalArgumentException} will be thrown. */ public String getColor(double value) { - if (value < minValue || value > maxValue) { - throw new IllegalArgumentException("The value "+value+" is out of the value range: "+valueRange.getMinLeft()+" - "+valueRange.getMaxRight()); - } final String result; - if (isGrey) { - result = "rgba(255,255,255," + Math.min(1.0, (value - minValue) / (maxValue - minValue)) + ")"; - } else { - double h = (1 - (value - minValue) / (maxValue - minValue)) * 240; - result = "hsl(" + Math.round(h) + ", 100%, 50%)"; + try { + if (value < minValue || value > maxValue) { + throw new IllegalArgumentException("The value " + value + " is out of the value range: " + + valueRange.getMinLeft() + " - " + valueRange.getMaxRight()); + } + } catch (IllegalArgumentException e) { + + } finally { + if (isGrey) { + result = "rgba(255,255,255," + Math.min(1.0, (value - minValue) / (maxValue - minValue)) + ")"; + } else { + double h = (1 - (value - minValue) / (maxValue - minValue)) * 240; + result = "hsl(" + Math.round(h) + ", 100%, 50%)"; + } } return result; } From 43fb04513e919e2740801347d284807223da7cc3 Mon Sep 17 00:00:00 2001 From: Vladislav Chumak Date: Mon, 20 Aug 2018 18:21:17 +0200 Subject: [PATCH 150/197] Set log level to info for debugging of wind estimation test failures --- .../sap/sailing/domain/tracking/impl/TrackedRaceImpl.java | 4 ++-- .../ManeuverBasedWindEstimationTrackImpl.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 86501ccd376..ba3321bc397 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 @@ -2684,11 +2684,11 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl private List computeManeuvers(Competitor competitor, ManeuverDetector maneuverDetector) throws NoWindException { - logger.finest("computeManeuvers(" + competitor.getName() + ") called in tracked race " + this); + logger.info("computeManeuvers(" + competitor.getName() + ") called in tracked race " + this); long startedAt = System.currentTimeMillis(); // compute the maneuvers for competitor List result = maneuverDetector.detectManeuvers(); - logger.finest("computeManeuvers(" + competitor.getName() + ") called in tracked race " + this + " took " + logger.info("computeManeuvers(" + competitor.getName() + ") called in tracked race " + this + " took " + (System.currentTimeMillis() - startedAt) + "ms"); return result; } 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 54188f2d1d0..d244d681936 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 @@ -156,7 +156,7 @@ public class ManeuverBasedWindEstimationTrackImpl extends WindTrackImpl { this.weightedAverageMiddleCOGForManeuverType = new HashMap<>(); long start = System.currentTimeMillis(); Triple, Pair, ScalableBearingAndScalableDouble>>, List, Pair, ScalableBearingAndScalableDouble>>, List, Pair, ScalableBearingAndScalableDouble>>> clusterStructure = analyzeRace(waitForLatest); - logger.fine("Computed virtual wind fixes from maneuvers for race " + trackedRace.getRace().getName() + " in " + logger.info("Computed virtual wind fixes from maneuvers for race " + trackedRace.getRace().getName() + " in " + (System.currentTimeMillis() - start) + "ms"); clusters = clusterStructure.getA(); tackClusters = clusterStructure.getB(); @@ -387,7 +387,9 @@ public class ManeuverBasedWindEstimationTrackImpl extends WindTrackImpl { */ private Triple, Pair, ScalableBearingAndScalableDouble>>, List, Pair, ScalableBearingAndScalableDouble>>, List, Pair, ScalableBearingAndScalableDouble>>> analyzeRace( boolean waitForLatest) throws NotEnoughDataHasBeenAddedException { + logger.info("Starting wind estimation"); final Map maneuvers = getAllManeuvers(waitForLatest); + logger.info("Maneuvers fixed have been queried"); // cluster into eight clusters by middle COG first, then aggregate tack likelihoods for each, and jibe // likelihoods for opposite cluster final int numberOfClusters = 16; @@ -403,7 +405,7 @@ public class ManeuverBasedWindEstimationTrackImpl extends WindTrackImpl { IntStream.range(0, numberOfClusters / 2).mapToObj( (i) -> new Pair<>(new DegreeBearingImpl(((double) i) * 360. / (double) numberOfClusters / 2), -45.)))); - logger.fine("K-Means maneuver clusterer for wind estimation took " + clusterer.getNumberOfIterations() + logger.info("K-Means maneuver clusterer for wind estimation took " + clusterer.getNumberOfIterations() + " iterations"); final Set, Pair, ScalableBearingAndScalableDouble>> clusters = clusterer .getClusters(); From e4eefd55cdc56f703a93e4298daefe06ce20b1b9 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Mon, 20 Aug 2018 18:45:46 +0200 Subject: [PATCH 151/197] bug4134_2: Swarm now updates also minMax for new particles. ColorMapper.getColor() returns null if value is outside valueRange. --- .../ui/simulator/streamlets/ColorMapper.java | 23 +++++++------------ .../gwt/ui/simulator/streamlets/Swarm.java | 20 ++++++++-------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java index 05fcf948197..794c4055187 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java @@ -35,24 +35,17 @@ public class ColorMapper implements ValueRangeFlexibleBoundariesChangedListener /** * Returns a string with a rgba representation of a the value mapped to the color spectrum in case {@link #isGrey} * = true or the hsl representation of the color in case {@link #isGrey} = false . If called with a - * value outside the {@link #valueRange} an {@link IllegalArgumentException} will be thrown. + * value outside the {@link #valueRange} the return will be null. */ public String getColor(double value) { final String result; - try { - if (value < minValue || value > maxValue) { - throw new IllegalArgumentException("The value " + value + " is out of the value range: " - + valueRange.getMinLeft() + " - " + valueRange.getMaxRight()); - } - } catch (IllegalArgumentException e) { - - } finally { - if (isGrey) { - result = "rgba(255,255,255," + Math.min(1.0, (value - minValue) / (maxValue - minValue)) + ")"; - } else { - double h = (1 - (value - minValue) / (maxValue - minValue)) * 240; - result = "hsl(" + Math.round(h) + ", 100%, 50%)"; - } + if (value < minValue || value > maxValue) { + result = null; + } else if (isGrey) { + result = "rgba(255,255,255," + Math.min(1.0, (value - minValue) / (maxValue - minValue)) + ")"; + } else { + double h = (1 - (value - minValue) / (maxValue - minValue)) * 240; + result = "hsl(" + Math.round(h) + ", 100%, 50%)"; } return result; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java index ac2b37584f1..337e309efc1 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java @@ -78,7 +78,7 @@ public class Swarm implements TimeListener { timePoint = timer.getTime(); cosineOfAverageLatitude = 1.0; // default to equator diffPx = new Vector(0, 0); - valueRange = new ValueRangeFlexibleBoundaries(/*wind speed in knots*/ 0.0,/*wind speed in knots*/ 60.0, /*percentage*/ 0.15); + valueRange = new ValueRangeFlexibleBoundaries(/*wind speed in knots*/ 0.0,/*wind speed in knots*/ 60.0, /*percentage*/ 0.2); colorMapper = new ColorMapper(valueRange, !colored); } @@ -280,13 +280,6 @@ public class Swarm implements TimeListener { particle.stepsToLive--; if ((particle.stepsToLive > 0) && (this.field.inBounds(particle.currentPosition))) { particle.v = field.getVector(particle.currentPosition, timePoint); - final double length = particle.v.length(); - if (length > maxSpeedInKnots) { - maxSpeedInKnots = length; - } - if (length < minSpeedInKnots) { - minSpeedInKnots = length; - } } else { particle.v = null; } @@ -294,11 +287,20 @@ public class Swarm implements TimeListener { // particle timed out (age became 0) or was never created (e.g., weight too low); try to create a new one particles[idx] = this.createParticle(); } + if (particles[idx] != null && particles[idx].v != null) { + final double length = particles[idx].v.length(); + if (length > maxSpeedInKnots) { + maxSpeedInKnots = length; + } + if (length < minSpeedInKnots) { + minSpeedInKnots = length; + } + } } if (minSpeedInKnots <= maxSpeedInKnots) { valueRange.setMinMax(minSpeedInKnots, maxSpeedInKnots); - drawSwarm(); } + drawSwarm(); return true; } From 9c43f84ca3a9bc2de5ff7637d47770b0b42ca4b1 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Mon, 20 Aug 2018 18:55:39 +0200 Subject: [PATCH 152/197] bug4134_2: Changed the threeshold value for Swarms ValueRange to 15%. --- .../java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.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/simulator/streamlets/Swarm.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java index 337e309efc1..1a7ce6d46c7 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java @@ -78,7 +78,7 @@ public class Swarm implements TimeListener { timePoint = timer.getTime(); cosineOfAverageLatitude = 1.0; // default to equator diffPx = new Vector(0, 0); - valueRange = new ValueRangeFlexibleBoundaries(/*wind speed in knots*/ 0.0,/*wind speed in knots*/ 60.0, /*percentage*/ 0.2); + valueRange = new ValueRangeFlexibleBoundaries(/*wind speed in knots*/ 0.0,/*wind speed in knots*/ 60.0, /*percentage*/ 0.15); colorMapper = new ColorMapper(valueRange, !colored); } From 232fd836ab3dd8a3237283f5b2fa6b243eb47bb5 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Mon, 20 Aug 2018 19:02:43 +0200 Subject: [PATCH 153/197] bug4134_2: ColorMapperTest tests null return for ColorMapper.getColor(). --- .../com/sap/sailing/gwt/ui/test/ColorMapperTest.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java index 33daf27cf9e..2754c7f90ca 100755 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java @@ -1,7 +1,6 @@ package com.sap.sailing.gwt.ui.test; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.mockito.Mockito.*; import java.util.HashSet; @@ -47,13 +46,8 @@ public class ColorMapperTest { } @Test - public void testExceptionForValueOutOfBoundaries() { - try { - colorMapper.getColor(-10.0); - fail("Expected illegal argument exception"); - } catch (IllegalArgumentException e) { - // expected - } + public void testNullForValueOutOfBoundaries() { + assertTrue(colorMapper.getColor(-10.0) == null); } @Test From b7f7c934d9d971adf3db42eb85efd9e2a9109b99 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Mon, 20 Aug 2018 19:12:26 +0200 Subject: [PATCH 154/197] bug4134_2: added 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 0111b5dde64..2bf6bd29e38 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 @@
      August 2018
        -
      • The windstreamlets are now colored according to the maximum and minimum windspeed in the windfield. +
      • The windstreamlets are now colored dynamically according to the wind fields maximum and minimum wind speed.
        • July 2018
          From 1eaf81a02bf4069a94d1a1757119a967779e4e2b Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 20 Aug 2018 22:38:12 +0200 Subject: [PATCH 155/197] enhanced DB backup script to exclude older DBs from bup historizing backup --- configuration/backup_full.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/configuration/backup_full.sh b/configuration/backup_full.sh index afca4a1c32c..87b3aa26747 100755 --- a/configuration/backup_full.sh +++ b/configuration/backup_full.sh @@ -18,7 +18,7 @@ BACKUP_DIRECTORIES="/etc /var/log/mongodb" PREFIX="database" # Directory for temporary files -TARGET_DIR=/var/lib/mysql/backup +TARGET_DIR=/var/lib/mongodb/backup # Configuration for MongoDB backup MONGO_PORTS="10202 10201" @@ -26,7 +26,7 @@ MONGO_INSTALLATION=/opt/mongodb-linux-x86_64-2.6.7 MONGO_CMD=$MONGO_INSTALLATION/bin/mongo MONGOEXPORT_CMD=$MONGO_INSTALLATION/bin/mongoexport MONGODB_COLLECTION_WIND="WIND_TRACKS" -MONGODB_COLLECTION_LOCAL="local" +MONGODB_EXCLUDE_DBS="local 29erWorlds2016 29erWorlds2016-replica 49er-n17-euros2017 49er-n17-euros2017-replica 49erEuros2015 49erEuros2016 49erEuros2016-replica 49erJWC2015 49erWorlds_2016 49erWorlds_2016-replica 49erWorlds_2016-replica2 49erWorlds_2016-replica3 49erworlds2015 505-2017 505-2017-replica 505-2017-replica-1 505-2017-replica-2 505Worlds2016 505Worlds2016-replica 505_WORLDS_2015 6mworlds2017 6mworlds2017-replica 8MWORLDS2017 8MWORLDS2017-replica AustrianLeague2015 Bodenseewoche_2015 Championsleague_2015 Championsleague_2015-Replica DANISHLEAGUE2017 DANISHLEAGUE2017-replica DUTCH_LEAGUE_2017 DUTCH_LEAGUE_2017-replica DanishSailingLeague_2015 DutchSailingLeague_2015 FinnishSailingLeague_2015 GermanSailingLeague_2015 GermanSailingLeague_2015-Replica HANSESAIL2017 IDMFINN2017 KW2015 KW2015-replica KW2015-replica2 KW2017 KW2017-replica Norwegianleague_2015 POLISHLEAGUE2017 RosAtomCup_2015 SAPOPTICUP2015 SCL2017 SCL2017-replica SGCN_Smartphone_2016 SGCN_Smartphone_2016-replica SPEEDSAILING2016 SWC2016-Melbourne SWC2016-Melbourne-replica SWC2016-Qingdao SWC2016-Qingdao-replica SWC2017-Aarhus SWC2017-HYERES SWC2017-HYERES-replica SWC2017-Miami SWC2017-Miami-replica SWC2017-SANTANDER SWC2017-SANTANDER-replica SWEDISHLEAGUE2017 SWEDISHLEAGUE2017-replica TW2015 TW2015-REPLICA TW2015-test-replica TW2017 TW2017-replica WORLDCUPSYLT2015 YES2015 YES2015-REPLICA YES2015-REPLICA2 allsvenskan2015 austrianleague2016 austrianleague2017 bartsbash2015 bundesliga2-2017 bundesliga2-2017-replica bundesliga2016 bundesliga2016-replica bundesliga2016_2 bundesliga2017 bundesliga2017-replica crw2016 crw2016-replica danishleague2016 danishleague2016-replica dsl-pokal2017 dutchleague2016 dutchleague2016-replica ess2015 ess2016 ess2017 ess2017_foiling_test ess40-2015-replica2 finnishleague2016 finnishleague2017 forumvostok2016 frenchleague2017 germanleague2016-replica idmstar2016 isafwc2014 kielerwoche2016 kielerwoche2016-replica kiellauf2017 northsearegatta2017 northstreamrace2017 norwegianleague2016 norwegianleague2016-replica norwegianleague2017 norwegianleague2017-replica rsc2016 scl2016 scl2016-replica swedishleague2016 swedishleague2016-replica tw2016 tw2016-replica usoda2016 wmrt2016" # Configuration for MySQL MYSQL_DATABASES="bugs mysql" @@ -40,7 +40,8 @@ BACKUP_SERVER="backup@172.31.25.136" BACKUP_DATE=`date +%s` # Aliases -BUP_CMD="/opt/bup/bup" +BUP_DIR=/var/lib/mongodb/backup/bup +BUP_CMD="/opt/bup/bup -d $BUP_DIR" BUP_ADDITIONAL="-r $BACKUP_SERVER:/home/backup/$PREFIX" BUP_IGNORES='--exclude-rx=/war/$' BUP_CMD_INDEX="$BUP_CMD index $BUP_IGNORES" @@ -92,7 +93,14 @@ show collections" | $MONGO_CMD --port $MONGO_PORT | tail -n +4 | grep -v "^syste else DB_DIR=$TARGET_DIR/mongodb-$MONGO_PORT$WIND_SUFFIX fi - if [ "$i" != "$MONGODB_COLLECTION_LOCAL" -a \( "$i" != "$MONGODB_COLLECTION_WIND" -o "$PARAM" = "weekly" \) ]; then + exclude=0 + for exclude_collection in $MONGODB_EXCLUDE_DBS; do + if [ "$i" = "$exclude_collection" ]; then + echo "Excluding $i from backup based on exclude list" + exclude=1 + fi + done + if [ "$exclude" = "0" -a \( "$j" != "$MONGODB_COLLECTION_WIND" -o "$PARAM" = "weekly" \) ]; then echo " Backing up collection $j in MongoDB $i running on port $MONGO_PORT" echo "$MONGOEXPORT_CMD --port $MONGO_PORT -d $i -c $j > $DB_DIR/$j.json" mkdir -p $DB_DIR From dfe8c36dacab9124c6b8f00ed9eb7f430729c031 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Tue, 21 Aug 2018 11:13:07 +0200 Subject: [PATCH 156/197] bug4134_2: ColorMapper.getColor() returns minimum or maximum color if value is outside range. --- .../ui/simulator/streamlets/ColorMapper.java | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java index 794c4055187..af8f91002c8 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java @@ -35,17 +35,28 @@ public class ColorMapper implements ValueRangeFlexibleBoundariesChangedListener /** * Returns a string with a rgba representation of a the value mapped to the color spectrum in case {@link #isGrey} * = true or the hsl representation of the color in case {@link #isGrey} = false . If called with a - * value outside the {@link #valueRange} the return will be null. + * value outside the {@link #valueRange} the return will be the minimum or the maximum of the spectrum, depending if + * the input value is smaller or greater then the {@link #minValue} or {@link #maxValue} of the {@link #valueRange}. */ public String getColor(double value) { final String result; - if (value < minValue || value > maxValue) { - result = null; - } else if (isGrey) { - result = "rgba(255,255,255," + Math.min(1.0, (value - minValue) / (maxValue - minValue)) + ")"; + if (isGrey) { + if (value < minValue) { + result = "rgba(255,255,255,0.0)"; + } else if (value > maxValue) { + result = "rgba(255,255,255,1.0)"; + } else { + result = "rgba(255,255,255," + Math.min(1.0, (value - minValue) / (maxValue - minValue)) + ")"; + } } else { - double h = (1 - (value - minValue) / (maxValue - minValue)) * 240; - result = "hsl(" + Math.round(h) + ", 100%, 50%)"; + if (value < minValue) { + result = "hsl(0, 100%, 50%)"; + } else if (value > maxValue) { + result = "hsl(240, 100%, 50%)"; + } else { + double h = (1 - (value - minValue) / (maxValue - minValue)) * 240; + result = "hsl(" + Math.round(h) + ", 100%, 50%)"; + } } return result; } From 46c29e99bc18024545a64377c1a4cf886c4a44aa Mon Sep 17 00:00:00 2001 From: Vladislav Chumak Date: Tue, 21 Aug 2018 11:22:34 +0200 Subject: [PATCH 157/197] Revert "Set log level to info for debugging of wind estimation test failures" This reverts commit 43fb04513e919e2740801347d284807223da7cc3. --- .../sap/sailing/domain/tracking/impl/TrackedRaceImpl.java | 4 ++-- .../ManeuverBasedWindEstimationTrackImpl.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) 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 ba3321bc397..86501ccd376 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 @@ -2684,11 +2684,11 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl private List computeManeuvers(Competitor competitor, ManeuverDetector maneuverDetector) throws NoWindException { - logger.info("computeManeuvers(" + competitor.getName() + ") called in tracked race " + this); + logger.finest("computeManeuvers(" + competitor.getName() + ") called in tracked race " + this); long startedAt = System.currentTimeMillis(); // compute the maneuvers for competitor List result = maneuverDetector.detectManeuvers(); - logger.info("computeManeuvers(" + competitor.getName() + ") called in tracked race " + this + " took " + logger.finest("computeManeuvers(" + competitor.getName() + ") called in tracked race " + this + " took " + (System.currentTimeMillis() - startedAt) + "ms"); return result; } 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 d244d681936..54188f2d1d0 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 @@ -156,7 +156,7 @@ public class ManeuverBasedWindEstimationTrackImpl extends WindTrackImpl { this.weightedAverageMiddleCOGForManeuverType = new HashMap<>(); long start = System.currentTimeMillis(); Triple, Pair, ScalableBearingAndScalableDouble>>, List, Pair, ScalableBearingAndScalableDouble>>, List, Pair, ScalableBearingAndScalableDouble>>> clusterStructure = analyzeRace(waitForLatest); - logger.info("Computed virtual wind fixes from maneuvers for race " + trackedRace.getRace().getName() + " in " + logger.fine("Computed virtual wind fixes from maneuvers for race " + trackedRace.getRace().getName() + " in " + (System.currentTimeMillis() - start) + "ms"); clusters = clusterStructure.getA(); tackClusters = clusterStructure.getB(); @@ -387,9 +387,7 @@ public class ManeuverBasedWindEstimationTrackImpl extends WindTrackImpl { */ private Triple, Pair, ScalableBearingAndScalableDouble>>, List, Pair, ScalableBearingAndScalableDouble>>, List, Pair, ScalableBearingAndScalableDouble>>> analyzeRace( boolean waitForLatest) throws NotEnoughDataHasBeenAddedException { - logger.info("Starting wind estimation"); final Map maneuvers = getAllManeuvers(waitForLatest); - logger.info("Maneuvers fixed have been queried"); // cluster into eight clusters by middle COG first, then aggregate tack likelihoods for each, and jibe // likelihoods for opposite cluster final int numberOfClusters = 16; @@ -405,7 +403,7 @@ public class ManeuverBasedWindEstimationTrackImpl extends WindTrackImpl { IntStream.range(0, numberOfClusters / 2).mapToObj( (i) -> new Pair<>(new DegreeBearingImpl(((double) i) * 360. / (double) numberOfClusters / 2), -45.)))); - logger.info("K-Means maneuver clusterer for wind estimation took " + clusterer.getNumberOfIterations() + logger.fine("K-Means maneuver clusterer for wind estimation took " + clusterer.getNumberOfIterations() + " iterations"); final Set, Pair, ScalableBearingAndScalableDouble>> clusters = clusterer .getClusters(); From 1f5c5d1c53606633f2566dd82257c9cee63c485c Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Tue, 21 Aug 2018 11:23:37 +0200 Subject: [PATCH 158/197] bug4134_2: ColorMapperTest tests for value out of range. --- .../src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java index 2754c7f90ca..975b880cefe 100755 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java @@ -14,6 +14,7 @@ import com.sap.sailing.gwt.ui.simulator.streamlets.ColorMapperChangedListener; import com.sap.sailing.gwt.ui.simulator.streamlets.ValueRangeFlexibleBoundaries; public class ColorMapperTest { + private static final double EPSILON = 0.00000001; ColorMapper colorMapper; ColorMapperChangedListener listener; ValueRangeFlexibleBoundaries valueRange; @@ -30,6 +31,7 @@ public class ColorMapperTest { updateValueSet(valueSet); colorSet = new HashSet<>(); fillColorSet(); + } public void updateValueSet(Set valueSet) { @@ -46,8 +48,9 @@ public class ColorMapperTest { } @Test - public void testNullForValueOutOfBoundaries() { - assertTrue(colorMapper.getColor(-10.0) == null); + public void testForValueOutOfBoundaries() { + assertTrue(colorMapper.getColor(valueRange.getMinLeft() - EPSILON) == "hsl(0, 100%, 50%)"); + assertTrue(colorMapper.getColor(valueRange.getMaxRight() + EPSILON) == "hsl(240, 100%, 50%)"); } @Test From 33f62caaa6357a9ae14074a5663be33349af674e Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 21 Aug 2018 14:55:19 +0200 Subject: [PATCH 159/197] bug4508 Removed unnecessary casts / code format changes --- .../server/gateway/jaxrs/api/RegattasResource.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 5ffa02314a3..8a9eb6d9ded 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 @@ -1725,7 +1725,8 @@ public class RegattasResource extends AbstractSailingServerResource { Regatta regatta = getService().getRegattaByName(regattaName); if (regatta != null) { - SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); + SecurityUtils.getSubject() + .checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regatta.getName())); String seriesName = (String) requestObject.get("seriesName"); String seriesNameNew = (String) requestObject.get("seriesNameNew"); boolean isMedal = (boolean) requestObject.get("isMedal"); @@ -1737,7 +1738,7 @@ public class RegattasResource extends AbstractSailingServerResource { Integer maximumNumberOfDiscards = null; if (requestObject.containsKey("maximumNumberOfDiscards")) { - maximumNumberOfDiscards = (int) (long) requestObject.get("maximumNumberOfDiscards"); + maximumNumberOfDiscards = (int) requestObject.get("maximumNumberOfDiscards"); } int[] resultDiscardingThresholds = null; @@ -1745,7 +1746,7 @@ public class RegattasResource extends AbstractSailingServerResource { JSONArray resultDiscardingThresholdsRaw = (JSONArray) requestObject.get("resultDiscardingThresholds"); resultDiscardingThresholds = new int[resultDiscardingThresholdsRaw.size()]; for (int i = 0; i < resultDiscardingThresholdsRaw.size(); i++) { - resultDiscardingThresholds[i] = (int) (long) resultDiscardingThresholdsRaw.get(i); + resultDiscardingThresholds[i] = (int) resultDiscardingThresholdsRaw.get(i); } } @@ -1754,7 +1755,7 @@ public class RegattasResource extends AbstractSailingServerResource { for (Object fleetRaw : fleetsRaw) { JSONObject fleet = Helpers.toJSONObjectSafe(fleetRaw); String fleetName = (String) fleet.get("fleetName"); - int orderNo = (int) (long) fleet.get("orderNo"); + int orderNo = (int) fleet.get("orderNo"); String htmlColor = (String) fleet.get("htmlColor"); fleets.add(new FleetDTO(fleetName, orderNo, new RGBColor(htmlColor))); } From 6252116d903ba336608c70e05de03e8f97aac449 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Tue, 21 Aug 2018 15:25:08 +0200 Subject: [PATCH 160/197] bug4735: Copied the necessary parts of the default suggestion display --- java/com.sap.sailing.gwt.ui/DataMining.css | 7 +- .../ExtractionFunctionSuggestBox.java | 161 +++++++++++++++--- 2 files changed, 147 insertions(+), 21 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/DataMining.css b/java/com.sap.sailing.gwt.ui/DataMining.css index 620934514a3..27f011779a0 100644 --- a/java/com.sap.sailing.gwt.ui/DataMining.css +++ b/java/com.sap.sailing.gwt.ui/DataMining.css @@ -263,14 +263,17 @@ input.magnifier { .statisticSuggestBoxPopup { z-index: 2; } -.statisticSuggestBoxPopup .suggestPopupContent { +.statisticSuggestBoxPopupContent { max-height: 700px; overflow-y: scroll; + background: white; } .statisticSuggestBoxPopup .item { padding: 2px; color: #000; cursor: default; + white-space: nowrap; + font-size: 105%; } .statisticSuggestBoxPopup .item-selected { background: #D5E2FF; @@ -315,7 +318,7 @@ input.magnifier { border-left: 2px solid #6f7277; } .dataMiningBorderBottom { - border-border: 2px solid #6f7277; + border-bottom: 2px solid #6f7277; } .dataMiningBorderRight { border-right: 2px solid #6f7277; diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java index 01cd6d846d1..0bbf99f207f 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java @@ -3,7 +3,15 @@ package com.sap.sse.datamining.ui.client.selection.statistic; import java.util.Collection; import java.util.Objects; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.dom.client.Element; +import com.google.gwt.user.client.ui.HasAnimation; +import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.MenuItem; +import com.google.gwt.user.client.ui.PopupPanel; +import com.google.gwt.user.client.ui.PopupPanel.AnimationType; +import com.google.gwt.user.client.ui.SuggestBox; +import com.google.gwt.user.client.ui.SuggestOracle.Suggestion; import com.sap.sse.common.Util; import com.sap.sse.gwt.client.suggestion.AbstractListSuggestOracle; import com.sap.sse.gwt.client.suggestion.CustomSuggestBox; @@ -16,8 +24,8 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox suggestOracle; - private final ExtractionFunctionSuggestBox.ScrollableSuggestionDisplay display; - private ExtractionFunctionSuggestBox.ValueChangeHandler valueChangeHandler; + private final GroupingSuggestionDisplay display; + private ValueChangeHandler valueChangeHandler; private ExtractionFunctionWithContext extractionFunction; @@ -47,13 +55,13 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox) getSuggestOracle(); - display = (ExtractionFunctionSuggestBox.ScrollableSuggestionDisplay) getSuggestionDisplay(); + display = (GroupingSuggestionDisplay) getSuggestionDisplay(); addSuggestionSelectionHandler(this::setExtractionFunction); } - public void setValueChangeHandler(ExtractionFunctionSuggestBox.ValueChangeHandler valueChangeHandler) { + public void setValueChangeHandler(ValueChangeHandler valueChangeHandler) { this.valueChangeHandler = valueChangeHandler; } @@ -81,33 +89,148 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox suggestions, + boolean isDisplayStringHTML, boolean isAutoSelectEnabled, SuggestionCallback callback) { + if (suggestionPopup.isAttached()) { + suggestionPopup.hide(); + } + + suggestionMenu.clearItems(); + for (Suggestion suggestion : suggestions) { + SuggestionMenuItem menuItem = new SuggestionMenuItem(suggestion, isDisplayStringHTML, + () -> callback.onSuggestionSelected(suggestion)); + suggestionMenu.addItem(menuItem); + } + + if (isAutoSelectEnabled && suggestionMenu.size() > 0) { + suggestionMenu.selectItem(0); + } + + updateAutoHidePartner(suggestBox.getElement()); + suggestionPopup.showRelativeTo(suggestBox); + } + + private void updateAutoHidePartner(Element newAutoHidePartner) { + if (autoHidePartner != newAutoHidePartner) { + if (autoHidePartner != null) { + suggestionPopup.removeAutoHidePartner(autoHidePartner); + } + suggestionPopup.addAutoHidePartner(newAutoHidePartner); + autoHidePartner = newAutoHidePartner; + } + } + + @Override + public boolean isAnimationEnabled() { + return suggestionPopup.isAnimationEnabled(); + } + + @Override + public void setAnimationEnabled(boolean enable) { + suggestionPopup.setAnimationEnabled(enable); + } + + } + + private static class GroupingSuggestionMenu extends MenuBar { + + public GroupingSuggestionMenu(boolean vertical) { + super(vertical); + setStyleName("statisticSuggestBoxPopupContent"); + setFocusOnHoverEnabled(false); + } + + public int size() { + return getItems().size(); + } + + public int getSelectedIndex() { + MenuItem selectedItem = getSelectedItem(); + return selectedItem == null ? -1 : getItems().indexOf(selectedItem); + } + + public void selectItem(int index) { + if (index >= 0 && index < size()) { + MenuItem itemToSelect = getItems().get(index); + selectItem(itemToSelect); + itemToSelect.getElement().scrollIntoView(); + } + } + + public Suggestion getSelectedSuggestion() { + return ((SuggestionMenuItem) getSelectedItem()).getSuggestion(); + } + + } + + private static class SuggestionMenuItem extends MenuItem { + + private final Suggestion suggestion; + + public SuggestionMenuItem(Suggestion suggestion, boolean asHTML, ScheduledCommand command) { + super(suggestion.getDisplayString(), asHTML, command); + this.suggestion = suggestion; + setStyleName("item"); + } + + public Suggestion getSuggestion() { + return suggestion; + } } From 92d489b4e7c0c4c7e96800f7703affef50656393 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Tue, 21 Aug 2018 17:05:45 +0200 Subject: [PATCH 161/197] Changed the localization of the pair collecting aggregator from Identity to Scatter --- .../resources/stringmessages/StringMessages.properties | 2 +- .../resources/stringmessages/StringMessages_de.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties b/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties index 4ccb493d9c2..c5fa2845db6 100644 --- a/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties +++ b/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties @@ -1,7 +1,7 @@ Average=Average PairAverage=Average Median=Median -PairCollecting=Identity +PairCollecting=Scatter Sum=Sum Maximum=Maximum Minimum=Minimum diff --git a/java/com.sap.sse.datamining/resources/stringmessages/StringMessages_de.properties b/java/com.sap.sse.datamining/resources/stringmessages/StringMessages_de.properties index 941ee9622c6..a501a8c9771 100644 --- a/java/com.sap.sse.datamining/resources/stringmessages/StringMessages_de.properties +++ b/java/com.sap.sse.datamining/resources/stringmessages/StringMessages_de.properties @@ -1,6 +1,6 @@ Average=Durchschnitt PairAverage=Durchschnitt -PairCollecting=Identität +PairCollecting=Streuung Median=Median Sum=Summe Maximum=Maximum From fa49836b9582fd9213ecd16dedcc1d1b6026b9c8 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Tue, 21 Aug 2018 17:19:04 +0200 Subject: [PATCH 162/197] bug4134_2: Moved ColorMapper and ValueRangeFlexibleBoundaries to com.sap.sse.common and the tests to com.sap.sse.common.test --- .../ui/shared/racemap/WindStreamletsRaceboardOverlay.java | 2 +- .../sap/sailing/gwt/ui/simulator/streamlets/Swarm.java | 2 ++ .../src/com/sap/sse/common}/test/ColorMapperTest.java | 8 ++++---- .../common}/test/ValueRangeFlexibleBoundariesTest.java | 6 +++--- .../src/com/sap/sse/common}/ColorMapper.java | 2 +- .../com/sap/sse/common}/ColorMapperChangedListener.java | 2 +- .../com/sap/sse/common}/ValueRangeFlexibleBoundaries.java | 2 +- .../ValueRangeFlexibleBoundariesChangedListener.java | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) rename java/{com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui => com.sap.sse.common.test/src/com/sap/sse/common}/test/ColorMapperTest.java (90%) rename java/{com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui => com.sap.sse.common.test/src/com/sap/sse/common}/test/ValueRangeFlexibleBoundariesTest.java (94%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets => com.sap.sse.common/src/com/sap/sse/common}/ColorMapper.java (98%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets => com.sap.sse.common/src/com/sap/sse/common}/ColorMapperChangedListener.java (61%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets => com.sap.sse.common/src/com/sap/sse/common}/ValueRangeFlexibleBoundaries.java (98%) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets => com.sap.sse.common/src/com/sap/sse/common}/ValueRangeFlexibleBoundariesChangedListener.java (67%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java index c27e1105c60..89ccb55a5ea 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java @@ -28,10 +28,10 @@ import com.sap.sailing.gwt.ui.shared.WindInfoForRaceDTO; import com.sap.sailing.gwt.ui.shared.WindTrackInfoDTO; import com.sap.sailing.gwt.ui.simulator.StreamletParameters; import com.sap.sailing.gwt.ui.simulator.racemap.MovingCanvasOverlay; -import com.sap.sailing.gwt.ui.simulator.streamlets.ColorMapperChangedListener; import com.sap.sailing.gwt.ui.simulator.streamlets.Swarm; import com.sap.sailing.gwt.ui.simulator.streamlets.VectorField; import com.sap.sailing.gwt.ui.simulator.streamlets.WindInfoForRaceVectorField; +import com.sap.sse.common.ColorMapperChangedListener; import com.sap.sse.common.Util; import com.sap.sse.gwt.client.Notification; import com.sap.sse.gwt.client.Notification.NotificationType; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java index 1a7ce6d46c7..fb031139dcd 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java @@ -15,6 +15,8 @@ import com.sap.sailing.gwt.ui.client.shared.racemap.BoundsUtil; import com.sap.sailing.gwt.ui.client.shared.racemap.CoordinateSystem; import com.sap.sailing.gwt.ui.simulator.StreamletParameters; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; +import com.sap.sse.common.ColorMapper; +import com.sap.sse.common.ValueRangeFlexibleBoundaries; import com.sap.sse.gwt.client.player.TimeListener; public class Swarm implements TimeListener { diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ColorMapperTest.java similarity index 90% rename from java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java rename to java/com.sap.sse.common.test/src/com/sap/sse/common/test/ColorMapperTest.java index 975b880cefe..57b32c76382 100755 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ColorMapperTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ColorMapperTest.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.test; +package com.sap.sse.common.test; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; @@ -9,9 +9,9 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.gwt.ui.simulator.streamlets.ColorMapper; -import com.sap.sailing.gwt.ui.simulator.streamlets.ColorMapperChangedListener; -import com.sap.sailing.gwt.ui.simulator.streamlets.ValueRangeFlexibleBoundaries; +import com.sap.sse.common.ColorMapper; +import com.sap.sse.common.ColorMapperChangedListener; +import com.sap.sse.common.ValueRangeFlexibleBoundaries; public class ColorMapperTest { private static final double EPSILON = 0.00000001; diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ValueRangeFlexibleBoundariesTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ValueRangeFlexibleBoundariesTest.java similarity index 94% rename from java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ValueRangeFlexibleBoundariesTest.java rename to java/com.sap.sse.common.test/src/com/sap/sse/common/test/ValueRangeFlexibleBoundariesTest.java index 1b545cc473e..f68eff1d443 100755 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/ValueRangeFlexibleBoundariesTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/ValueRangeFlexibleBoundariesTest.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.test; +package com.sap.sse.common.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.Mockito.*; @@ -6,8 +6,8 @@ import static org.mockito.Mockito.*; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.gwt.ui.simulator.streamlets.ValueRangeFlexibleBoundaries; -import com.sap.sailing.gwt.ui.simulator.streamlets.ValueRangeFlexibleBoundariesChangedListener; +import com.sap.sse.common.ValueRangeFlexibleBoundaries; +import com.sap.sse.common.ValueRangeFlexibleBoundariesChangedListener; public class ValueRangeFlexibleBoundariesTest { private static final double EPSILON = 0.00000001; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java b/java/com.sap.sse.common/src/com/sap/sse/common/ColorMapper.java similarity index 98% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java rename to java/com.sap.sse.common/src/com/sap/sse/common/ColorMapper.java index af8f91002c8..d6642be8fdc 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapper.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/ColorMapper.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.simulator.streamlets; +package com.sap.sse.common; import java.util.HashSet; import java.util.Set; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapperChangedListener.java b/java/com.sap.sse.common/src/com/sap/sse/common/ColorMapperChangedListener.java similarity index 61% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapperChangedListener.java rename to java/com.sap.sse.common/src/com/sap/sse/common/ColorMapperChangedListener.java index f5cb90277a2..d0c25c11113 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ColorMapperChangedListener.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/ColorMapperChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.simulator.streamlets; +package com.sap.sse.common; public interface ColorMapperChangedListener { void onColorMappingChanged(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ValueRangeFlexibleBoundaries.java b/java/com.sap.sse.common/src/com/sap/sse/common/ValueRangeFlexibleBoundaries.java similarity index 98% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ValueRangeFlexibleBoundaries.java rename to java/com.sap.sse.common/src/com/sap/sse/common/ValueRangeFlexibleBoundaries.java index 37c07089915..4d42bac3c13 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ValueRangeFlexibleBoundaries.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/ValueRangeFlexibleBoundaries.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.simulator.streamlets; +package com.sap.sse.common; import java.util.HashSet; import java.util.Set; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ValueRangeFlexibleBoundariesChangedListener.java b/java/com.sap.sse.common/src/com/sap/sse/common/ValueRangeFlexibleBoundariesChangedListener.java similarity index 67% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ValueRangeFlexibleBoundariesChangedListener.java rename to java/com.sap.sse.common/src/com/sap/sse/common/ValueRangeFlexibleBoundariesChangedListener.java index ff3f0f45f8b..5581b6b1e7e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/ValueRangeFlexibleBoundariesChangedListener.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/ValueRangeFlexibleBoundariesChangedListener.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.simulator.streamlets; +package com.sap.sse.common; public interface ValueRangeFlexibleBoundariesChangedListener { void onValueRangeBoundariesChanged(); From e55c86d78aa41be6f3f95b8e9cf1de517f18c596 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 21 Aug 2018 17:29:30 +0200 Subject: [PATCH 163/197] bug4682 Minor code style and format refactorings --- .../domain/common/media/MediaTrack.java | 4 +- .../client/media/AbstractMediaContainer.java | 5 +- .../media/FloatingMediaPlayerContainer.java | 10 +- .../client/media/MediaManagementControl.java | 5 +- .../ui/client/media/MediaPlayerManager.java | 19 +++- .../media/MediaPlayerManagerComponent.java | 101 +++++------------- .../media/MediaSingleSelectionControl.java | 10 +- .../gwt/ui/client/media/VideoJSPlayer.java | 62 ++++------- .../media/popup/PopoutWindowPlayer.java | 3 +- .../client/media/popup/VideoPopupWindow.java | 16 ++- 10 files changed, 90 insertions(+), 145 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java index 1b2829289d3..a79c0a4f395 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java @@ -25,11 +25,10 @@ public class MediaTrack implements Serializable { private static final long serialVersionUID = 1L; - @Deprecated /** * Deprecated, as the server only used undefined in all cases. Left in, to not break serialisation/storage - * */ + @Deprecated public enum Status { UNDEFINED('?'), CANNOT_PLAY('-'), NOT_REACHABLE('#'), REACHABLE('+'); @@ -51,7 +50,6 @@ public class MediaTrack implements Serializable { public Duration duration; public MimeType mimeType; @Deprecated - // should not be used public Status status = Status.UNDEFINED; public Set assignedRaces; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaContainer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaContainer.java index f7d23be1003..dd846032757 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaContainer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/AbstractMediaContainer.java @@ -12,9 +12,10 @@ public abstract class AbstractMediaContainer implements MediaPlayerContainer { protected final MediaSynchPlayer mediaPlayer; protected final Panel rootPanel; - public AbstractMediaContainer(Panel rootPanel, MediaSynchPlayer videoPlayer, PopoutListener popoutListener, PlayerCloseListener playerCloseListener) { + public AbstractMediaContainer(Panel rootPanel, MediaSynchPlayer mediaPlayer, PopoutListener popoutListener, + PlayerCloseListener playerCloseListener) { this.rootPanel = rootPanel; - this.mediaPlayer = videoPlayer; + this.mediaPlayer = mediaPlayer; this.popoutListener = popoutListener; this.popupCloseListener = playerCloseListener; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainer.java index ace9f7dd336..a8ded192e0b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/FloatingMediaPlayerContainer.java @@ -32,15 +32,15 @@ public class FloatingMediaPlayerContainer extends AbstractMediaContainer impleme private final PopupPositionProvider popupPositionProvider; private Anchor edit; - public FloatingMediaPlayerContainer(MediaSynchPlayer videoPlayer, PopupPositionProvider popupPositionProvider, + public FloatingMediaPlayerContainer(MediaSynchPlayer mediaPlayer, PopupPositionProvider popupPositionProvider, UserService userservice, MediaServiceAsync mediaService, ErrorReporter errorReporter, PlayerCloseListener playerCloseListener, PopoutListener popoutListener) { - super(new FlowPanel(), videoPlayer, popoutListener, playerCloseListener); + super(new FlowPanel(), mediaPlayer, popoutListener, playerCloseListener); this.popupPositionProvider = popupPositionProvider; rootPanel.addStyleName("video-root-panel"); - rootPanel.add(videoPlayer.asWidget()); + rootPanel.add(mediaPlayer.asWidget()); this.edit = new Anchor(); this.edit.getElement().getStyle().setBackgroundImage("url('" + res.editIcon().getSafeUri().asString() + "')"); @@ -70,9 +70,9 @@ public class FloatingMediaPlayerContainer extends AbstractMediaContainer impleme mediaSynchControl.widget().addStyleName("media-synch-control"); rootPanel.add(mediaSynchControl.widget()); - videoPlayer.setEditFlag(mediaSynchControl); + mediaPlayer.setEditFlag(mediaSynchControl); - this.dialogBox = new WindowBox(videoPlayer.getMediaTrack().title, videoPlayer.getMediaTrack().toString(), + this.dialogBox = new WindowBox(mediaPlayer.getMediaTrack().title, mediaPlayer.getMediaTrack().toString(), rootPanel, new WindowBox.PopoutHandler() { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java index 5ffe8ef7359..d4c84b13302 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java @@ -112,9 +112,6 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem case audio: audioTracks.add(mediaTrack); break; - case image: - case unknown: - break; default: break; } @@ -241,7 +238,7 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem if (changeEvent.getValue()) { Set currentlyPlaying = mediaPlayerManager.getPlayingAudioTrack(); if (audioTrack == null) { - currentlyPlaying.forEach(f -> mediaPlayerManager.closeFloatingPlayer(f)); + currentlyPlaying.forEach(mediaPlayerManager::closeFloatingPlayer); } else { mediaPlayerManager.playAudio(audioTrack); } 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 5f3c6195bea..e5d76becbda 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 @@ -7,7 +7,6 @@ import java.util.Set; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; -import com.sap.sailing.gwt.ui.client.media.MediaPlayerManagerComponent.Status; import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.useragent.UserAgentDetails; @@ -19,6 +18,24 @@ public interface MediaPlayerManager { } + public enum Status { + UNDEFINED('?'), CANNOT_PLAY('-'), NOT_REACHABLE('#'), REACHABLE('+'); + + private final char symbol; + + private Status(char symbol) { + this.symbol = symbol; + } + + public String toString() { + return String.valueOf(this.symbol); + } + + public boolean isPotentiallyPlayable() { + return this == UNDEFINED || this == REACHABLE; + } + } + 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 7422705fda5..3948041238c 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,23 +85,6 @@ public class MediaPlayerManagerComponent extends AbstractComponent playerChangeListener = new ArrayList<>(); - public enum Status { - UNDEFINED('?'), - CANNOT_PLAY('-'), - NOT_REACHABLE('#'), - REACHABLE('+'); - - private final char symbol; - - private Status(char symbol) { - this.symbol = symbol; - } - - public String toString() { - return String.valueOf(this.symbol); - } - } - public MediaPlayerManagerComponent(Component parent, ComponentContext context, MediaPlayerLifecycle mediaPlayerLifecycle, RegattaAndRaceIdentifier selectedRaceIdentifier, @@ -154,19 +137,19 @@ public class MediaPlayerManagerComponent extends AbstractComponent getActiveAudioContainers() { return activePlayerContainers.entrySet().stream() - .filter(f -> (f.getKey().mimeType.mediaType == MediaType.audio)).map(f -> f.getValue()) + .filter(f -> f.getKey().mimeType.mediaType == MediaType.audio).map(f -> f.getValue()) .collect(Collectors.toList()); } @@ -409,8 +377,6 @@ public class MediaPlayerManagerComponent extends AbstractComponent(activePlayerContainers.values())) { // using a - // copy to - // prevent - // a - // ConcurrentModificationException + for (MediaPlayerContainer mediaContainer : new ArrayList<>(activePlayerContainers.values())) { + // using a copy to prevent a ConcurrentModificationException mediaContainer.shutDown(); } activePlayerContainers.clear(); @@ -652,24 +615,18 @@ public class MediaPlayerManagerComponent extends AbstractComponent getVideoTracks() { - List result = new ArrayList(); - for (MediaTrack mediaTrack : assignedMediaTracks) { - if (mediaTrack.mimeType != null && mediaTrack.mimeType.mediaType == MediaType.video) { - result.add(mediaTrack); - } - } - return result; + return getMediaTracks(MediaType.video); } @Override public List getAudioTracks() { - List result = new ArrayList(); - for (MediaTrack mediaTrack : assignedMediaTracks) { - if (mediaTrack.mimeType != null && mediaTrack.mimeType.mediaType == MediaType.audio) { - result.add(mediaTrack); - } - } - return result; + return getMediaTracks(MediaType.audio); + } + + private List getMediaTracks(MediaType mediaType) { + return assignedMediaTracks.stream() + .filter(mediaTrack -> mediaTrack.mimeType != null && mediaType == mediaTrack.mimeType.mediaType) + .collect(Collectors.toList()); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java index a2ee165491d..eeb8141e89c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java @@ -34,19 +34,13 @@ public class MediaSingleSelectionControl extends AbstractMediaSelectionControl i } public void show() { - Collection mediaTracks = new ArrayList(mediaPlayerManager.getAssignedMediaTracks()); + final Collection mediaTracks = new ArrayList<>(mediaPlayerManager.getAssignedMediaTracks()); Panel mediaPanel = new VerticalPanel(); - addMediaEntriesToGridPanel(mediaTracks, mediaPanel); + mediaTracks.forEach(track -> mediaPanel.add(createMediaEntry(track))); dialogControl.add(mediaPanel); dialogControl.showRelativeTo(popupLocation); } - private void addMediaEntriesToGridPanel(Collection mediaTracks, Panel mediaPanel) { - for (MediaTrack videoTrack : mediaTracks) { - mediaPanel.add(createMediaEntry(videoTrack)); - } - } - private Button createMediaEntry(final MediaTrack mediaTrack) { Button mediaSelectButton = new Button( mediaPlayerManager.getMediaTrackStatus(mediaTrack).toString() + " " + mediaTrack.title); 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 2b31a754885..3e11b41aba7 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 @@ -40,7 +40,7 @@ public class VideoJSPlayer extends Widget implements RequiresResize { @UiField DivElement playerHolder; - Element videoElement; + private Element videoElement; private String elementId; private JavaScriptObject player; @@ -165,8 +165,7 @@ public class VideoJSPlayer extends Widget implements RequiresResize { } private native int getNativeCurrentTime() /*-{ - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player - .currentTime(); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.currentTime(); }-*/; /** @@ -189,8 +188,7 @@ public class VideoJSPlayer extends Widget implements RequiresResize { } private native void setNativeCurrentTime(int currentTime) /*-{ - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player - .currentTime(currentTime); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.currentTime(currentTime); }-*/; public void play() { @@ -202,8 +200,7 @@ public class VideoJSPlayer extends Widget implements RequiresResize { } private native void nativePlay() /*-{ - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player - .play(); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.play(); }-*/; /** @@ -215,8 +212,7 @@ public class VideoJSPlayer extends Widget implements RequiresResize { if (this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { return false; } - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player - .isFullscreen(); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.isFullscreen(); }-*/; /** @@ -228,8 +224,7 @@ public class VideoJSPlayer extends Widget implements RequiresResize { if (this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { return true; } - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player - .paused(); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.paused(); }-*/; private void onPlay() { @@ -249,31 +244,22 @@ public class VideoJSPlayer extends Widget implements RequiresResize { var that = this; var elemid = this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::elementId; - var player = $wnd - .videojs(elemid, { - "playsInline" : true, - "customControlsOnMobile" : true - }) - .ready( - function() { - this - .on( - 'play', - function() { - that.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::onPlay()(); - }); - this - .on( - 'pause', - function() { - that.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::onPause()(); - }); + var player = $wnd.videojs(elemid, { + "playsInline" : true, + "customControlsOnMobile" : true + }).ready(function() { + this.on('play', function() { + that.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::onPlay()(); + }); + this.on('pause', function() { + that.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::onPause()(); + }); - console.log("play: " + autoplay); - if (autoplay) { - this.play(); - } - }); + console.log("play: " + autoplay); + if (autoplay) { + this.play(); + } + }); if (withPanorama) { player.panorama({ showNotice : true, @@ -306,8 +292,7 @@ public class VideoJSPlayer extends Widget implements RequiresResize { if (this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player == null) { return; } - return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player - .pause(); + return this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.pause(); }-*/; public int getVideoWidth() { @@ -333,8 +318,7 @@ public class VideoJSPlayer extends Widget implements RequiresResize { } private native void setVolumeNative(float volume) /*-{ - this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player - .volume(volume); + this.@com.sap.sailing.gwt.ui.client.media.VideoJSPlayer::player.volume(volume); }-*/; public void setPlaybackRate(double newPlaySpeedFactor) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopoutWindowPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopoutWindowPlayer.java index 15d4086de15..a537da64afa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopoutWindowPlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopoutWindowPlayer.java @@ -152,8 +152,7 @@ public abstract class PopoutWindowPlayer extends AbstractMediaPlayer implements window.parent.videoPlayer.setPlaybackSpeed(playbackSpeed); } }-*/; - - + @Override public MediaPlayer getMediaPlayer() { return this; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/VideoPopupWindow.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/VideoPopupWindow.java index cdfe634674c..83b1c91e2eb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/VideoPopupWindow.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/VideoPopupWindow.java @@ -25,7 +25,7 @@ public class VideoPopupWindow extends AbstractPopupWindow implements ContextMenu String videoUrl = Window.Location.getParameter("url"); String mimeType = Window.Location.getParameter("mimetype"); isDebug = Window.Location.getParameter("gwt.codesvr") != null; - + if (videoUrl != null) { videoJSDelegate = new VideoJSPlayer(true, false); videoJSDelegate.setVideo(MimeType.valueOf(mimeType), videoUrl); @@ -36,21 +36,19 @@ public class VideoPopupWindow extends AbstractPopupWindow implements ContextMenu } } - - native void initPlay(Element videoElement) /*-{ - var that = this; - var deferredPlayState = $wnd.deferredPlayState - if (deferredPlayState && !$wnd.videoPlayer) { - that.@com.sap.sailing.gwt.ui.client.media.popup.VideoPopupWindow::initPlayState(DZDZ)(deferredPlayState.deferredMediaTime, deferredPlayState.deferredIsMuted, deferredPlayState.deferredPlaybackSpeed, deferredPlayState.deferredIsPlaying); - } + var that = this; + var deferredPlayState = $wnd.deferredPlayState + if (deferredPlayState && !$wnd.videoPlayer) { + that.@com.sap.sailing.gwt.ui.client.media.popup.VideoPopupWindow::initPlayState(DZDZ)(deferredPlayState.deferredMediaTime, deferredPlayState.deferredIsMuted, deferredPlayState.deferredPlaybackSpeed, deferredPlayState.deferredIsPlaying); + } }-*/; public void loadedmetadata() { adjustWindowSize(); } - + @Override public void play() { videoJSDelegate.play(); From c19c8b0c9f320ba6e77b08a4b5e572cdce1a31ce Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 21 Aug 2018 17:29:30 +0200 Subject: [PATCH 164/197] bug4682 Minor code style and format refactorings From d68226e0d95f3d6fdbec2f42ef95da326d4abfd8 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Tue, 21 Aug 2018 17:57:08 +0200 Subject: [PATCH 165/197] Fixed an issue where the filter selection control wasn't cleared when the components have been reloaded --- ...lDimensionListFilterSelectionProvider.java | 87 ++++++++++--------- .../SuggestBoxStatisticProvider.java | 9 +- 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java index bd3a0e33d51..c434d6c1ed6 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java @@ -223,72 +223,77 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractDa @Override public void reloadComponents() { - updateFilterDimensions(); isAwaitingReload = false; - notifyListeners(); + updateFilterDimensions(); } @Override public void dataRetrieverChainDefinitionChanged(DataRetrieverChainDefinitionDTO newDataRetrieverChainDefinition) { if (!Objects.equals(retrieverChain, newDataRetrieverChainDefinition)) { retrieverChain = newDataRetrieverChainDefinition; - if (!isAwaitingReload && retrieverChain != null) { - HashMap>> currentSelection = getSelection(); - if (!currentSelection.isEmpty()) { - selectionToBeApplied = currentSelection; - selectionCallback = EmptyCallback; - } + if (!isAwaitingReload) { updateFilterDimensions(); - } else if (!isAwaitingReload) { - clearContent(); - updateControls(); - selectionToBeApplied = null; - selectionCallback = null; } } } private void updateFilterDimensions() { - isUpdatingFilterDimensions = true; - clearContent(); - dataMiningService.getReducedDimensionsMappedByLevelFor(retrieverChain, LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback() { - @Override - public void onSuccess(ReducedDimensionsDTO result) { - reducedDimensions = result; - for (Entry> entry : reducedDimensions.getReducedDimensions().entrySet()) { - DataRetrieverLevelDTO retrieverlevel = entry.getKey(); - for (FunctionDTO dimension : entry.getValue()) { - availableFilterDimensions.add(new DimensionWithContext(dimension, retrieverlevel)); + if (retrieverChain != null) { + isUpdatingFilterDimensions = true; + clearContent(); + HashMap>> currentSelection = getSelection(); + if (!currentSelection.isEmpty()) { + selectionToBeApplied = currentSelection; + selectionCallback = EmptyCallback; + } + dataMiningService.getReducedDimensionsMappedByLevelFor(retrieverChain, LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback() { + @Override + public void onSuccess(ReducedDimensionsDTO result) { + reducedDimensions = result; + for (Entry> entry : reducedDimensions.getReducedDimensions().entrySet()) { + DataRetrieverLevelDTO retrieverlevel = entry.getKey(); + for (FunctionDTO dimension : entry.getValue()) { + availableFilterDimensions.add(new DimensionWithContext(dimension, retrieverlevel)); + } } + availableFilterDimensions.sort(null); + filterFilterDimensionsPanel.updateAll(availableFilterDimensions); + + updateControls(); + if (selectionToBeApplied != null) { + ignoreSelectionChangedNotifications = true; + setSelection(selectionToBeApplied, selectionCallback); + selectionToBeApplied = null; + selectionCallback = null; + } + isUpdatingFilterDimensions = false; } - availableFilterDimensions.sort(null); - filterFilterDimensionsPanel.updateAll(availableFilterDimensions); - - updateControls(); - if (selectionToBeApplied != null) { - ignoreSelectionChangedNotifications = true; - setSelection(selectionToBeApplied, selectionCallback); + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError("Error fetching the dimensions of the retriever chain from the server: " + caught.getMessage()); + updateControls(); selectionToBeApplied = null; selectionCallback = null; + isUpdatingFilterDimensions = false; } - isUpdatingFilterDimensions = false; - } - @Override - public void onFailure(Throwable caught) { - errorReporter.reportError("Error fetching the dimensions of the retriever chain from the server: " + caught.getMessage()); - updateControls(); - selectionToBeApplied = null; - selectionCallback = null; - isUpdatingFilterDimensions = false; - } - }); + }); + } else { + clearContent(); + updateControls(); + selectionToBeApplied = null; + selectionCallback = null; + } } private void clearContent() { + boolean notifyListeners = !getSelection().isEmpty(); reducedDimensions = null; availableFilterDimensions.clear(); filterDimensionSelectionModel.clear(); filterFilterDimensionsPanel.removeAll(); + if (notifyListeners) { + notifyListeners(); + } } private void updateControls() { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java index 4ab2f29b62a..470a05ea68b 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java @@ -217,7 +217,7 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent retrieverChains) { availableStatistics.clear(); if (retrieverChains.isEmpty()) { - extractionFunctionSuggestBox.setValue(null); + extractionFunctionSuggestBox.setExtractionFunction(null); extractionFunctionSuggestBox.setSelectableValues(Collections.emptySet()); return; } @@ -265,7 +265,7 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent Date: Tue, 21 Aug 2018 18:13:25 +0200 Subject: [PATCH 166/197] Changed the grouping dimension selected by default to the one with the lowest ordinal --- .../selection/MultiDimensionalGroupingProvider.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index e829596ab29..fb887b3d473 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -8,6 +8,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -138,7 +139,12 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen if (dimensionsToSelect != null) { setSelectedDimensions(dimensionsToSelect, selectionCallback); } else { - firstDimensionToGroupByBox.setValue(availableDimensions.iterator().next(), true); + Optional dimensionWithLowestOrdinal = availableDimensions.stream().min((d1, d2) -> { + int ordinal1 = d1 == null ? Integer.MAX_VALUE : d1.getOrdinal(); + int ordinal2 = d2 == null ? Integer.MAX_VALUE : d2.getOrdinal(); + return Integer.compare(ordinal1, ordinal2); + }); + dimensionWithLowestOrdinal.ifPresent(d -> firstDimensionToGroupByBox.setValue(d, true)); } dimensionsToSelect = null; selectionCallback = null; From 71ee396339fddf7cdd990b45165066590a935d25 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Tue, 21 Aug 2018 19:37:20 +0200 Subject: [PATCH 167/197] Added a tooltip to the run button, if the current query definition isn't valid --- .../datamining/ui/client/StringMessages.java | 2 + .../ui/client/StringMessages.properties | 2 + .../ui/client/StringMessages_de.properties | 11 ++--- .../client/execution/SimpleQueryRunner.java | 16 +++++-- .../AbstractQueryDefinitionProvider.java | 45 ++++++------------- 5 files changed, 37 insertions(+), 39 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 63a748fd950..44d4b9a148d 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -46,6 +46,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String noDimensionToGroupBySelectedError(); String noDataRetrieverChainDefinitonSelectedError(); String noStatisticSelectedError(); + String noAggregatorSelectedError(); String calculateThe(); String statisticProvider(); String groupingProvider(); @@ -92,5 +93,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String any(); String of(); String the(); + String and(); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index c08829ddc86..162dd9d9b63 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -33,6 +33,7 @@ dataMiningComponentsNeedReloadDialogMessage=Click Reload to reload the component noDimensionToGroupBySelectedError=No dimension to group by is selected noDataRetrieverChainDefinitonSelectedError=No data retriever is selected noStatisticSelectedError=No statistic to calculate is selected +noAggregatorSelectedError=No aggregator is selected calculateThe=Calculate the statisticProvider=Statistic Provider groupingProvider=Grouping Provider @@ -76,3 +77,4 @@ keepChangesChangeLossStrategyTooltip=Keep current selection preventing the query applyingQuery=Applying Query searchAvailableStatistics=Search the available statistics reloadComponents=Reload Components +and=and diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 8978866141a..b65021fe95b 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -12,7 +12,7 @@ run=Ausführen any=Beliebig of=von the=die -queryNotValidBecause=Keine Datenabfrage möglich, da +queryNotValidBecause=Keine Datenabfrage möglich, denn queryRunner=Abfrageverarbeiter runAQuery=Führe eine Anfrage aus runningQuery=Datenabfrage läuft @@ -27,12 +27,12 @@ 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 +noDimensionToGroupBySelectedError=Keine Gruppierungs-Dimension wurde ausgewählt +noDataRetrieverChainDefinitonSelectedError=Kein Datenbeschaffer wurde ausgewählt +noStatisticSelectedError=Keine zu berechnende Kennzahl wurde ausgewählt +noAggregatorSelectedError=Kein Aggregator wurde ausgewählt calculateThe=Berechne die statisticProvider=Statistik-Versorger groupingProvider=Gruppierungs-Versorger @@ -76,3 +76,4 @@ keepChangesChangeLossStrategyTooltip=Aktuelle Selektion zu behalten, wodurch die applyingQuery=Query wird angezeigt searchAvailableStatistics=Verfügbare Statistiken durchsuchen reloadComponents=Kompnenten neu laden +and=und \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 3a9724fce83..01f485201c7 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -1,6 +1,7 @@ package com.sap.sse.datamining.ui.client.execution; import java.io.Serializable; +import java.util.Iterator; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -67,7 +68,6 @@ public class SimpleQueryRunner extends AbstractDataMiningComponent errors = queryDefinitionProvider.validateQueryDefinition(newQueryDefinition); boolean isValid = Util.isEmpty(errors); runButton.setEnabled(isValid); - if (isValid && settings.isRunAutomatically()) { - queryReleaseTimer.schedule(queryBufferTimeInMillis); + if (isValid) { + runButton.setTitle(null); + if (settings.isRunAutomatically()) { + queryReleaseTimer.schedule(queryBufferTimeInMillis); + } + } else { + Iterator errorsIterator = errors.iterator(); + StringBuilder tooltipBuilder = new StringBuilder(errorsIterator.next()); + errorsIterator.forEachRemaining(e -> tooltipBuilder.append("\n").append(e)); + runButton.setTitle(tooltipBuilder.toString()); } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 82c0ad88c2a..128278bf854 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -18,11 +18,11 @@ import com.google.gwt.user.client.ui.HTML; 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.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.datamining.ui.client.StringMessages; 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; @@ -135,42 +135,25 @@ public abstract class AbstractQueryDefinitionProvider errorMessages = new ArrayList(); if (queryDefinition != null) { - String grouperError = validateGrouper(queryDefinition); - if (grouperError != null && !grouperError.isEmpty()) { - errorMessages.add(grouperError); - } - String statisticError = validateStatisticAndAggregator(queryDefinition); - if (statisticError != null && !statisticError.isEmpty()) { - errorMessages.add(statisticError); - } - String retrieverChainError = validateDataRetrieverChain(queryDefinition); - if (retrieverChainError != null && !retrieverChainError.isEmpty()) { - errorMessages.add(retrieverChainError); + StringMessages stringMessages = getDataMiningStringMessages(); + if (queryDefinition.getStatisticToCalculate() == null || + queryDefinition.getDataRetrieverChainDefinition() == null) { + errorMessages.add(stringMessages.noStatisticSelectedError()); + } else { + // Other components aren't available if no statistic has been selected + // Reporting an error for something that isn't there would be misleading + if (queryDefinition.getAggregatorDefinition() == null) { + errorMessages.add(stringMessages.noAggregatorSelectedError()); + } + if (queryDefinition.getDimensionsToGroupBy().isEmpty()) { + errorMessages.add(stringMessages.noDimensionToGroupBySelectedError()); + } } } return errorMessages; } - private String validateGrouper(StatisticQueryDefinitionDTO queryDefinition) { - for (FunctionDTO dimension : queryDefinition.getDimensionsToGroupBy()) { - if (dimension != null) { - return null; - } - } - return getDataMiningStringMessages().noDimensionToGroupBySelectedError(); - } - - private String validateStatisticAndAggregator(StatisticQueryDefinitionDTO queryDefinition) { - return queryDefinition.getStatisticToCalculate() == null || queryDefinition.getAggregatorDefinition() == null - ? getDataMiningStringMessages().noStatisticSelectedError() : null; - } - - private String validateDataRetrieverChain(StatisticQueryDefinitionDTO queryDefinition) { - return queryDefinition.getDataRetrieverChainDefinition() == null - ? getDataMiningStringMessages().noDataRetrieverChainDefinitonSelectedError() : null; - } - @Override public void addQueryDefinitionChangedListener(QueryDefinitionChangedListener listener) { listeners.add(listener); From d0759fd9989856ec5b824d94f2aca02d98047254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 22 Aug 2018 11:32:55 +0200 Subject: [PATCH 168/197] bug4682 fix for potential null duration mediatrack --- .../src/com/sap/sailing/domain/common/media/MediaTrack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java index a79c0a4f395..227f4c3aacd 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java @@ -81,7 +81,7 @@ public class MediaTrack implements Serializable { } public TimePoint deriveEndTime() { - if (startTime != null) { + if (startTime != null && duration != null) { return startTime.plus(duration); } else { return null; From 2eff757a305ff6e8e1f085cf8c927f0dcac13b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 22 Aug 2018 11:34:00 +0200 Subject: [PATCH 169/197] bug4682 also show playing audio tracks in timepanel overlay bar, filter very small MediaTracks to prevent empty rows. --- .../gwt/ui/raceboard/RaceBoardPanel.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 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 4c430dcea21..e2780ab9deb 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 @@ -451,17 +451,23 @@ public class RaceBoardPanel protected void updateRaceTimePanelOverlay() { ArrayList overlays = new ArrayList(); - Set playing = mediaPlayerManagerComponent.getPlayingVideoTracks(); + Set videoPlaying = mediaPlayerManagerComponent.getPlayingVideoTracks(); + Set audioPlaying = mediaPlayerManagerComponent.getPlayingAudioTrack(); 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(); + // do not show bars for very short videos but show for live streaming ones + if (track.duration == null || track.duration.asMinutes() > 1) { + TimePoint endTp = track.deriveEndTime(); + double end; + if (endTp == null) { + end = Double.MAX_VALUE; + } else { + end = endTp.asMillis(); + } + final boolean isPlaying = videoPlaying.contains(track) || audioPlaying.contains(track); + overlays.add(new BarOverlay(start, end, isPlaying, + track.title)); } - overlays.add(new BarOverlay(start, end, playing.contains(track), track.title)); } racetimePanel.setBarOverlays(overlays); } From 0a1054c5050151635c5a5ea180aedf57e61f1896 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 22 Aug 2018 12:22:48 +0200 Subject: [PATCH 170/197] bug4735: Implemented a custom suggestion display for the statistics that groups them by their retriever chains --- java/com.sap.sailing.gwt.ui/DataMining.css | 34 +++- .../client/resources/DataMiningDataGrid.css | 8 + .../DimensionFilterSelectionProvider.java | 1 + .../ExtractionFunctionSuggestBox.java | 189 ++++++++++++++---- .../ExtractionFunctionWithContext.java | 32 ++- .../IdentityFunctionWithContext.java | 24 --- .../statistic/StatisticWithContext.java | 24 --- .../SuggestBoxStatisticProvider.java | 5 +- .../suggestion/AbstractListSuggestOracle.java | 5 + .../suggestion/AbstractSuggestOracle.java | 10 +- 10 files changed, 229 insertions(+), 103 deletions(-) delete mode 100644 java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/IdentityFunctionWithContext.java delete mode 100644 java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/StatisticWithContext.java diff --git a/java/com.sap.sailing.gwt.ui/DataMining.css b/java/com.sap.sailing.gwt.ui/DataMining.css index 27f011779a0..45b9f88c594 100644 --- a/java/com.sap.sailing.gwt.ui/DataMining.css +++ b/java/com.sap.sailing.gwt.ui/DataMining.css @@ -263,20 +263,37 @@ input.magnifier { .statisticSuggestBoxPopup { z-index: 2; } + .statisticSuggestBoxPopupContent { max-height: 700px; - overflow-y: scroll; + overflow-y: auto; background: white; } -.statisticSuggestBoxPopup .item { - padding: 2px; +.statisticSuggestBoxPopupContent table { + border-spacing: 0px; +} +.statisticSuggestBoxPopupContent .item { + padding: 2px 5px; color: #000; cursor: default; white-space: nowrap; - font-size: 105%; + font-size: 15px; } -.statisticSuggestBoxPopup .item-selected { - background: #D5E2FF; +.statisticSuggestBoxPopupContent .item-even { + background: #fff; +} +.statisticSuggestBoxPopupContent .item-odd { + background: #f3f7fb; +} +.statisticSuggestBoxPopupContent .item-selected { + background: #d5e2ff; +} + +.statisticSuggestBoxPopupContentSeparator { + padding: 8px 5px 0px 5px; + border-bottom: 2px solid #6f7277; + font-weight: 600; + font-size: 15px; } .dataMiningListBox { @@ -306,11 +323,6 @@ input.magnifier { padding-top: 5px; } -.dimensionFilterSelectionHeader .gwt-Label { - color: #4b4a4a; - text-shadow: #ddf 1px 1px 0; -} - .dataMiningBorderTop { border-top: 2px solid #6f7277; } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/resources/DataMiningDataGrid.css b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/resources/DataMiningDataGrid.css index 9f3ff36a969..7e7fc8240c7 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/resources/DataMiningDataGrid.css +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/resources/DataMiningDataGrid.css @@ -9,6 +9,12 @@ .dataGridHoveredRow { cursor: default; + background: #d5e2ff; +} + +.dataGridSelectedRow { + background: #628cd5; + color: white; } .dataGridSubHeader { @@ -20,6 +26,8 @@ .dataGridSubHeaderLabel { position: relative; left: -20px; + font-weight: 600; + text-shadow: none; } .dataGridSpacedSubHeader { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java index 7779fe4b651..77a960fbd54 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/DimensionFilterSelectionProvider.java @@ -175,6 +175,7 @@ public class DimensionFilterSelectionProvider extends AbstractDataMiningComponen headerPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); Label headerLabel = new Label(dimension.getDisplayName()); + headerLabel.addStyleName("emphasizedLabel"); headerPanel.add(headerLabel); headerPanel.setCellWidth(headerLabel, "100%"); headerPanel.setCellHorizontalAlignment(headerLabel, HasHorizontalAlignment.ALIGN_CENTER); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java index 0bbf99f207f..5b69ec865d9 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java @@ -1,6 +1,11 @@ package com.sap.sse.datamining.ui.client.selection.statistic; +import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Objects; import com.google.gwt.core.client.Scheduler.ScheduledCommand; @@ -8,11 +13,13 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.ui.HasAnimation; import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.MenuItem; +import com.google.gwt.user.client.ui.MenuItemSeparator; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.PopupPanel.AnimationType; import com.google.gwt.user.client.ui.SuggestBox; import com.google.gwt.user.client.ui.SuggestOracle.Suggestion; import com.sap.sse.common.Util; +import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; import com.sap.sse.gwt.client.suggestion.AbstractListSuggestOracle; import com.sap.sse.gwt.client.suggestion.CustomSuggestBox; @@ -24,46 +31,26 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox suggestOracle; - private final GroupingSuggestionDisplay display; + private final ExtractionFunctionSuggestionDisplay display; private ValueChangeHandler valueChangeHandler; private ExtractionFunctionWithContext extractionFunction; @SuppressWarnings("unchecked") public ExtractionFunctionSuggestBox() { - super(new AbstractListSuggestOracle() { - @Override - protected Iterable getKeywordStrings(Iterable queryTokens) { - String filterText = Util.first(queryTokens); - if (filterText == null) { - return queryTokens; - } - return Util.splitAlongWhitespaceRespectingDoubleQuotedPhrases(filterText); - } - - @Override - protected Iterable getMatchingStrings(ExtractionFunctionWithContext value) { - return value.getMatchingStrings(); - } - - @Override - protected String createSuggestionKeyString(ExtractionFunctionWithContext value) { - return value.getDisplayString(); - } - - @Override - protected String createSuggestionAdditionalDisplayString(ExtractionFunctionWithContext value) { - return value.getAdditionalDisplayString(); - } - }, new GroupingSuggestionDisplay()); + super(new ExtractionFunctionSuggestOracle(), new ExtractionFunctionSuggestionDisplay()); suggestOracle = (AbstractListSuggestOracle) getSuggestOracle(); - display = (GroupingSuggestionDisplay) getSuggestionDisplay(); + display = (ExtractionFunctionSuggestionDisplay) getSuggestionDisplay(); addSuggestionSelectionHandler(this::setExtractionFunction); } public void setValueChangeHandler(ValueChangeHandler valueChangeHandler) { this.valueChangeHandler = valueChangeHandler; } + + public Collection getSelectableValues() { + return suggestOracle.getSelectableValues(); + } public void setSelectableValues(Collection selectableValues) { suggestOracle.setSelectableValues(selectableValues); @@ -90,15 +77,76 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox { + + @Override + protected Iterable getKeywordStrings(Iterable queryTokens) { + String filterText = Util.first(queryTokens); + if (filterText == null) { + return queryTokens; + } + return Util.splitAlongWhitespaceRespectingDoubleQuotedPhrases(filterText); + } + + @Override + protected Iterable getMatchingStrings(ExtractionFunctionWithContext value) { + return value.getMatchingStrings(); + } + + @Override + protected String createSuggestionKeyString(ExtractionFunctionWithContext value) { + return value.getDisplayString(); + } + + @Override + protected String createSuggestionAdditionalDisplayString(ExtractionFunctionWithContext value) { + return null; + } - private final GroupingSuggestionMenu suggestionMenu; + @Override + protected SimpleSuggestion createSuggestion(ExtractionFunctionWithContext match, Iterable queryTokens) { + return new ExtractionFunctionSuggestion(match, queryTokens); + } + + private class ExtractionFunctionSuggestion extends SimpleSuggestion implements Comparable { + + public ExtractionFunctionSuggestion(ExtractionFunctionWithContext suggestObject, + Iterable queryTokens) { + super(suggestObject, queryTokens); + } + + @Override + public int compareTo(ExtractionFunctionSuggestion other) { + if (other == null) { + return -1; + } + String displayName = getSuggestObject().getExtractionFunction().getDisplayName(); + String otherDisplayName = other.getSuggestObject().getExtractionFunction().getDisplayName(); + return displayName.compareToIgnoreCase(otherDisplayName); + } + + } + + } + + private static class ExtractionFunctionSuggestionDisplay extends SuggestionDisplay implements HasAnimation { + + private final ExtractionFunctionSuggestionMenu suggestionMenu; private final PopupPanel suggestionPopup; + private boolean groupingSuggestionsByRetrieverChain; private Element autoHidePartner; - public GroupingSuggestionDisplay() { - suggestionMenu = new GroupingSuggestionMenu(/*vertical*/ true); + public ExtractionFunctionSuggestionDisplay() { + suggestionMenu = new ExtractionFunctionSuggestionMenu(/*vertical*/ true); suggestionPopup = new PopupPanel(/*autoHide*/ true, /*modal*/ false); suggestionPopup.setStyleName("statisticSuggestBoxPopup"); suggestionPopup.addStyleName("dataMiningBorderLeft"); @@ -142,6 +190,14 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox suggestions, @@ -149,12 +205,19 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox callback.onSuggestionSelected(suggestion)); - suggestionMenu.addItem(menuItem); + if (groupingSuggestionsByRetrieverChain) { + showSuggestionsGroupedByRetrieverChain(suggestions, isDisplayStringHTML, callback); + } else { + int count = 0; + for (Suggestion suggestion : suggestions) { + boolean isEven = count % 2 == 0; + SuggestionMenuItem menuItem = createSuggestionMenuItem(suggestion, isDisplayStringHTML, isEven, callback); + suggestionMenu.addItem(menuItem); + count++; + } } if (isAutoSelectEnabled && suggestionMenu.size() > 0) { @@ -165,6 +228,47 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox suggestions, + boolean isDisplayStringHTML, SuggestionCallback callback) { + Map> groupedSuggestions = new HashMap<>(); + for (Suggestion suggestion : suggestions) { + ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion extractionFunctionSuggestion = + (ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion) suggestion; + ExtractionFunctionWithContext extractionFunction = extractionFunctionSuggestion.getSuggestObject(); + DataRetrieverChainDefinitionDTO retrieverChain = extractionFunction.getRetrieverChain(); + List suggestionsOfRetrieverChain = groupedSuggestions.get(retrieverChain); + if (suggestionsOfRetrieverChain == null) { + suggestionsOfRetrieverChain = new ArrayList<>(); + groupedSuggestions.put(retrieverChain, suggestionsOfRetrieverChain); + } + suggestionsOfRetrieverChain.add(extractionFunctionSuggestion); + } + + List orderedRetrieverChains = new ArrayList<>(groupedSuggestions.keySet()); + Collections.sort(orderedRetrieverChains); + for (DataRetrieverChainDefinitionDTO retrieverChain : orderedRetrieverChains) { + suggestionMenu.addSeparator(new ExtractionFunctionSeparator(retrieverChain)); + + List suggestionsOfRetrieverChain = groupedSuggestions.get(retrieverChain); + suggestionsOfRetrieverChain.sort(null); + int count = 0; + for (Suggestion suggestion : suggestionsOfRetrieverChain) { + boolean isEven = count % 2 == 0; + SuggestionMenuItem menuItem = createSuggestionMenuItem(suggestion, isDisplayStringHTML, isEven, callback); + suggestionMenu.addItem(menuItem); + count++; + } + } + } + + private SuggestionMenuItem createSuggestionMenuItem(Suggestion suggestion, boolean isDisplayStringHTML, + boolean isEven, SuggestionCallback callback) { + SuggestionMenuItem menuItem = new SuggestionMenuItem(suggestion, isDisplayStringHTML, + () -> callback.onSuggestionSelected(suggestion)); + menuItem.addStyleName("item-" + (isEven ? "even" : "odd")); + return menuItem; + } + private void updateAutoHidePartner(Element newAutoHidePartner) { if (autoHidePartner != newAutoHidePartner) { if (autoHidePartner != null) { @@ -187,9 +291,9 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox getMatchingStrings() { return matchingStrings; } @@ -79,5 +77,35 @@ abstract class ExtractionFunctionWithContext implements Comparable extends AbstractSuggestOracle return suggestionMatchingFilter; } + public Collection getSelectableValues() { + return Collections.unmodifiableList(suggestionObjectList); + } + public void setSelectableValues(Collection selectableValues) { suggestionObjectList.clear(); suggestionObjectList.addAll(selectableValues); diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractSuggestOracle.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractSuggestOracle.java index 5b737ee34f8..4d617d90fb2 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractSuggestOracle.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/suggestion/AbstractSuggestOracle.java @@ -20,7 +20,7 @@ public abstract class AbstractSuggestOracle extends SuggestOracle { } int count = 0; for (T match : suggestionObjects) { - suggestions.add(new SimpleSuggestion(match, normalizedQueryTokens)); + suggestions.add(createSuggestion(match, normalizedQueryTokens)); if (++count >= request.getLimit()) { break; } @@ -30,6 +30,10 @@ public abstract class AbstractSuggestOracle extends SuggestOracle { callback.onSuggestionsReady(request, response); } + protected SimpleSuggestion createSuggestion(T match, Iterable queryTokens) { + return new SimpleSuggestion(match, queryTokens); + } + protected abstract void getSuggestions(Request request, Callback callback, Iterable queryTokens); protected abstract String createSuggestionKeyString(T value); @@ -57,14 +61,14 @@ public abstract class AbstractSuggestOracle extends SuggestOracle { return true; } - class SimpleSuggestion implements Suggestion { + public class SimpleSuggestion implements Suggestion { private static final String STRONG_TAG_OPEN = "", STRONG_TAG_CLOSE = ""; private static final String ITALIC_TAG_OPEN = "", ITALIC_TAG_CLOSE = ""; private final T suggestObject; private final Iterable queryTokens; - private SimpleSuggestion(T suggestObject, Iterable queryTokens) { + public SimpleSuggestion(T suggestObject, Iterable queryTokens) { this.suggestObject = suggestObject; this.queryTokens = queryTokens; } From cd1df8dfce467ca157e5c74c765b3ea69a4d79d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 22 Aug 2018 12:56:02 +0200 Subject: [PATCH 171/197] bug4682 changed video to media, as now audio is included as well (and with tagging images might come) --- .../sap/sailing/gwt/ui/client/StringMessages.java | 1 + .../gwt/ui/client/StringMessages.properties | 15 ++++++++------- .../gwt/ui/client/StringMessages_de.properties | 15 ++++++++------- .../gwt/ui/client/StringMessages_es.properties | 8 -------- .../gwt/ui/client/StringMessages_fr.properties | 8 -------- .../gwt/ui/client/StringMessages_ja.properties | 8 -------- .../gwt/ui/client/StringMessages_pt.properties | 8 -------- .../gwt/ui/client/StringMessages_ru.properties | 8 -------- .../gwt/ui/client/StringMessages_zh.properties | 8 -------- 9 files changed, 17 insertions(+), 62 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 68e9e4c4474..0e105b842da 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 @@ -2094,6 +2094,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String manage2SailPort(); String windFinderSpotCollectionsList(); String audioFiles(); + String selectMedia(); String swissTimingUpdateURL(); String swissTimingUpdateUsername(); String swissTimingUpdatePassword(); 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 94edf540898..f779c327463 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 @@ -1198,13 +1198,13 @@ raceIsInLiveTimePanelMode=Race is Live backToLiveTimePanelMode=Back to Live windChart=Wind Chart windChartLoading=Loading wind data... -mediaNoVideosCaption=No Videos -mediaShowVideoCaption=Show Video -mediaShowVideoTooltip=Click to show video: {0} -mediaHideVideoCaption=Hide Video -mediaHideVideoTooltip=Click to hide video -mediaSelectVideoCaption={0} Videos -mediaSelectVideoTooltip=Click to select video +mediaNoVideosCaption=No media tracks +mediaShowVideoCaption=Show media track +mediaShowVideoTooltip=Click to show media track: {0} +mediaHideVideoCaption=Hide media track +mediaHideVideoTooltip=Click to hide media track +mediaSelectVideoCaption={0} Media tracks +mediaSelectVideoTooltip=Click to select media track mediaManageMediaCaption=Manage Media mediaManageMediaTooltip=Configure audio and video clips, synchronize times showAll=Show all @@ -2089,6 +2089,7 @@ manage2SailEventURLBox=Manage2Sail EventURL (json) manage2SailEventIdBoxTooltip=Event ID or a URL that contains the event ID from Manage2Sail manage2SailPort=Port audioFiles=Audio tracks +selectMedia=Select Media swissTimingUpdateURL=Update URL (e.g., for start time and course change feedback) swissTimingUpdateUsername=Username for sending updates swissTimingUpdatePassword=Password for sending updates \ 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 edf41ab3046..9033f5483c6 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 @@ -1186,13 +1186,13 @@ raceIsInLiveTimePanelMode=Rennen ist live backToLiveTimePanelMode=Zurück zu live windChart=Winddiagramm windChartLoading=Winddaten werden geladen... -mediaNoVideosCaption=Keine Videos -mediaShowVideoCaption=Video ein -mediaShowVideoTooltip=Video abspielen: {0} -mediaHideVideoCaption=Video aus -mediaHideVideoTooltip=Video ausblenden -mediaSelectVideoCaption={0} Videos -mediaSelectVideoTooltip=Video auswählen +mediaNoVideosCaption=Keine Medienspuren +mediaShowVideoCaption=Medienspur an +mediaShowVideoTooltip=Medienspur abspielen: {0} +mediaHideVideoCaption=Medienspur stop +mediaHideVideoTooltip=Medienspur ausblenden +mediaSelectVideoCaption={0} Medien Dateien +mediaSelectVideoTooltip=Medienspur auswählen mediaManageMediaCaption=Medien verwalten mediaManageMediaTooltip=Audio- und Video-Clips verwalten, Zeiten synchronisieren showAll=Alle zeigen @@ -2084,6 +2084,7 @@ manage2SailEventURL=Manage2Sail Event URL (json) manage2SailEventIdBoxTooltip=Event ID von Manage 2 Sail oder URL die die Event ID beinhaltet manage2SailPort=Port audioFiles=Tonspuren +selectMedia=Medium auswählen swissTimingUpdateURL=Update URL (z.B. für Startzeit-Ãœbertragung) swissTimingUpdateUsername=Benutzername zum Versenden der Updates swissTimingUpdatePassword=Passwort zum Versenden der Updates \ 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_es.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties index ce2097d50d3..0c9211bf492 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 @@ -1194,14 +1194,6 @@ raceIsInLiveTimePanelMode=La carrera es en directo backToLiveTimePanelMode=Volver a directo windChart=Gráfico de vientos windChartLoading=Cargando datos de vientos... -mediaNoVideosCaption=No hay vídeos -mediaShowVideoCaption=Mostrar vídeo -mediaShowVideoTooltip=Haga clic para mostrar vídeo: {0} -mediaHideVideoCaption=Ocultar vídeo -mediaHideVideoTooltip=Haga clic para ocultar vídeo -mediaSelectVideoCaption={0} Vídeos -mediaSelectVideoTooltip=Haga clic para seleccionar vídeo -mediaManageMediaCaption=Gestionar medios mediaManageMediaTooltip=Configurar clips de audio y vídeo, sincronizar tiempos showAll=Mostrar todo raceVisibilityColumn=Visibilidad 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 b8b9cb74d27..61f845bcaa3 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 @@ -1194,14 +1194,6 @@ raceIsInLiveTimePanelMode=La course est en direct. backToLiveTimePanelMode=Retour au direct windChart=Graphique du vent windChartLoading=Chargement des données de vent... -mediaNoVideosCaption=Aucune vidéo -mediaShowVideoCaption=Afficher vidéo -mediaShowVideoTooltip=Cliquer pour afficher la vidéo : {0} -mediaHideVideoCaption=Masquer vidéo -mediaHideVideoTooltip=Cliquer pour masquer la vidéo -mediaSelectVideoCaption={0} vidéos -mediaSelectVideoTooltip=Cliquer pour sélectionner la vidéo -mediaManageMediaCaption=Gestion des médias mediaManageMediaTooltip=Configurer des clips audio et vidéo, synchroniser durées showAll=Afficher tout raceVisibilityColumn=Visibilité 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 e0c8d0e911b..3182dbc677d 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 @@ -1194,14 +1194,6 @@ raceIsInLiveTimePanelMode=レースãŒãƒ©ã‚¤ãƒ–中 backToLiveTimePanelMode=ライブã«æˆ»ã‚‹ windChart=風ãƒãƒ£ãƒ¼ãƒˆ windChartLoading=風データをロード中... -mediaNoVideosCaption=å‹•ç”»ãªã— -mediaShowVideoCaption=動画表示 -mediaShowVideoTooltip=クリックã—ã¦å‹•ç”»ã‚’表示: {0} -mediaHideVideoCaption=å‹•ç”»éžè¡¨ç¤º -mediaHideVideoTooltip=クリックã—ã¦å‹•ç”»ã‚’éžè¡¨ç¤º -mediaSelectVideoCaption={0} å‹•ç”» -mediaSelectVideoTooltip=クリックã—ã¦å‹•ç”»ã‚’é¸æŠž -mediaManageMediaCaption=ãƒ¡ãƒ‡ã‚£ã‚¢ç®¡ç† mediaManageMediaTooltip=音声ãŠã‚ˆã³å‹•ç”»ã‚¯ãƒªãƒƒã‚¯ã‚’設定ã—ã¦ã€æ™‚é–“ã‚’åŒæœŸ showAll=全表示 raceVisibilityColumn=å¯è¦–性 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 625263609c3..14a935a589d 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 @@ -1194,14 +1194,6 @@ raceIsInLiveTimePanelMode=Corrida ao vivo backToLiveTimePanelMode=Voltar ao tempo real windChart=Carta de ventos windChartLoading=Carregando dados do vento... -mediaNoVideosCaption=Nenhum vídeo -mediaShowVideoCaption=Visualizar vídeo -mediaShowVideoTooltip=Clicar para visualizar vídeo: {0} -mediaHideVideoCaption=Ocultar vídeo -mediaHideVideoTooltip=Clicar para ocultar vídeo -mediaSelectVideoCaption={0} vídeos -mediaSelectVideoTooltip=Clicar para selecionar vídeo -mediaManageMediaCaption=Administrar mídia mediaManageMediaTooltip=Configurar clipes de áudio e vídeo, sincronizar horas showAll=Visualizar tudo raceVisibilityColumn=Visibilidade 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 2a7922d60ed..36024486f96 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 @@ -1194,14 +1194,6 @@ raceIsInLiveTimePanelMode=Гонка активна backToLiveTimePanelMode=ВернутьÑÑ Ð² оперативный режим windChart=Диаграмма ветра windChartLoading=Загрузка данных о ветре... -mediaNoVideosCaption=Ðет видео -mediaShowVideoCaption=Показать видео -mediaShowVideoTooltip=Щелкните, чтобы показать видео: {0} -mediaHideVideoCaption=Скрыть видео -mediaHideVideoTooltip=Щелкните, чтобы Ñкрыть видео -mediaSelectVideoCaption={0} видео -mediaSelectVideoTooltip=Щелкните, чтобы выбрать видео -mediaManageMediaCaption=Управление мультимедиа mediaManageMediaTooltip=ÐаÑтройка аудио- и видеоклипов, ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ showAll=Показать вÑе raceVisibilityColumn=ВидимоÑÑ‚ÑŒ 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 d687e24ab83..1626d270d6e 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 @@ -1194,14 +1194,6 @@ raceIsInLiveTimePanelMode=正在直播比赛轮次 backToLiveTimePanelMode=返回实况 windChart=风力记录 windChartLoading=正在加载风力数æ®... -mediaNoVideosCaption=无视频 -mediaShowVideoCaption=显示视频 -mediaShowVideoTooltip=点击显示视频： {0} -mediaHideVideoCaption=éšè—视频 -mediaHideVideoTooltip=点击éšè—视频 -mediaSelectVideoCaption={0}个视频 -mediaSelectVideoTooltip=点击选择视频 -mediaManageMediaCaption=管ç†åª’体 mediaManageMediaTooltip=é…置音频和视频短片，åŒæ­¥æ—¶é—´ showAll=显示全部 raceVisibilityColumn=å¯è§æ€§ From 57f2e6aa57d15a865b0eb3256f4a8a3a94612a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 22 Aug 2018 12:56:17 +0200 Subject: [PATCH 172/197] bug4682 added missing i18n --- .../gwt/ui/client/media/MediaSingleSelectionControl.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/client/media/MediaSingleSelectionControl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java index eeb8141e89c..fcf1c5ad508 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSingleSelectionControl.java @@ -28,7 +28,7 @@ public class MediaSingleSelectionControl extends AbstractMediaSelectionControl i this.dialogControl = new DialogBox(true, false); this.dialogControl.addStyleName("Media-Select-Popup"); - this.dialogControl.setText("Select Video"); + this.dialogControl.setText(stringMessages.selectMedia()); this.dialogControl.addCloseHandler(this); } From bfd90c3710ab3c1f03c1608ce2bbb998d0109c2d Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 22 Aug 2018 13:08:02 +0200 Subject: [PATCH 173/197] Improved styling of the plain filter selection presenter --- java/com.sap.sailing.gwt.ui/DataMining.css | 8 +++++++ .../PlainFilterSelectionPresenter.java | 21 ++++++++++--------- ...lDimensionListFilterSelectionProvider.java | 1 - 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/DataMining.css b/java/com.sap.sailing.gwt.ui/DataMining.css index 45b9f88c594..9446b099028 100644 --- a/java/com.sap.sailing.gwt.ui/DataMining.css +++ b/java/com.sap.sailing.gwt.ui/DataMining.css @@ -323,6 +323,14 @@ input.magnifier { padding-top: 5px; } +.filterSelectionPresenter { + margin: 5px; +} +.filterSelectionPresenter .dimensionLabel { + margin-right: 2px; + text-shadow: 0 0 1px #888; +} + .dataMiningBorderTop { border-top: 2px solid #6f7277; } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 1c5a2a2e4d5..5cb68dd08a8 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -9,7 +9,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import com.google.gwt.dom.client.Style.FontWeight; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; @@ -41,10 +40,11 @@ public class PlainFilterSelectionPresenter extends AbstractComponent 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); - if (!first) { - levelSelectionPresenter.getEntryWidget().getElement().getStyle().setMarginTop(5, Unit.PX); - } + levelSelectionPresenter.getEntryWidget().addStyleName("dataMiningMarginBottom"); presentationPanel.add(levelSelectionPresenter.getEntryWidget()); - first = false; } } @@ -78,17 +74,22 @@ public class PlainFilterSelectionPresenter extends AbstractComponent> levelSelection) { Label levelLabel = new Label(retrieverLevel.getRetrievedDataType().getDisplayName()); - levelLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD); levelLabel.setWidth("100px"); + levelLabel.addStyleName("emphasizedLabel"); VerticalPanel presentationPanel = new VerticalPanel(); List sortedDimensions = new ArrayList<>(levelSelection.keySet()); Collections.sort(sortedDimensions); + boolean first = true; for (FunctionDTO dimension : sortedDimensions) { Collection dimensionSelection = levelSelection.get(dimension); DimensionFilterSelectionPresenter dimensionSelectionPresenter = new DimensionFilterSelectionPresenter( dimension, dimensionSelection); + if (!first) { + dimensionSelectionPresenter.getEntryWidget().getElement().getStyle().setMarginTop(2, Unit.PX); + } presentationPanel.add(dimensionSelectionPresenter.getEntryWidget()); + first = false; } mainPanel = new HorizontalPanel(); @@ -110,7 +111,7 @@ public class PlainFilterSelectionPresenter extends AbstractComponent dimensionSelection) { mainPanel = new HorizontalPanel(); Label dimensionLabel = new Label(dimension.getDisplayName() + ":"); - dimensionLabel.getElement().getStyle().setMarginRight(2, Unit.PX); + dimensionLabel.addStyleName("dimensionLabel"); mainPanel.add(dimensionLabel); StringBuilder selectionStringBuilder = new StringBuilder(); @@ -153,7 +154,7 @@ public class PlainFilterSelectionPresenter extends AbstractComponent Date: Wed, 22 Aug 2018 15:02:09 +0200 Subject: [PATCH 174/197] added content about the orchestration use cases Change-Id: Ie6d962528cca959ecdfa066808eef2ea51b87666 --- wiki/projects/cloud-orchestrator.md | 79 ++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/wiki/projects/cloud-orchestrator.md b/wiki/projects/cloud-orchestrator.md index 0fdf6024670..41a8ef25481 100644 --- a/wiki/projects/cloud-orchestrator.md +++ b/wiki/projects/cloud-orchestrator.md @@ -192,7 +192,7 @@ A user wants to create a new event. But instead of creating it on an existing se The steps are: -- Launch a new instance from a prepared AMI (either the AMI is regularly updated with the latest packages and kernel patches, or a "yum update" needs to be run and then the instance rebooted) +- Launch a new instance from a prepared AMI (either the AMI is regularly updated with the latest packages and kernel patches, or a "yum update" needs to be run and then the instance rebooted). The user provide hints as to the sizing of the instance in terms of CPU and memory. Ideally, these sizing parameters would be given in domain concepts, such as number of tracked competitors expected, or number of competitors in largest leaderboard in the event. - The latest (or a specified) release is installed to */home/sailing/servers/server* - The */home/sailing/servers/server/env.sh* file is adjusted to reflect the server name, MongoDB settings, as well as the ports to be used (for a dedicated server probably the defaults at 8888 for the HTTP server, 14888 for the OSGi console telnet port, and 2010 for the Expedition UDP connector) - The Java process is launched @@ -203,24 +203,99 @@ The steps are: - The Apache *httpd* server is launched - Two target groups *S-ded-<servername>* and *S-ded-<servername>-master* are created, and the new instance is added to both of them - Two new ALB rules for *<servername>.sapsailing.com* and *<servername>-master.sapsailing.com* are created, forwarding their requests to the respective target group from the previous step +- If requested, a remote server reference is added to www.sapsailing.com that points to the public URL of the replication cluster -asdf +Monitoring for the target groups shall be established and wired to the auto-scaling procedures which will launch more replicas or terminate replicas as needed. See also [Observe and Automatically Scale a Replication Cluster](#observe-and-automatically-scale-a-replication-cluster). ### Create a New "Club Set-Up" in a Multi-Instance +This is a variant of [Create a New Event on a Dedicated Replication Cluster](#create-a-new-event-on-a-dedicated-replication-cluster). Likewise, the user will provide a technical server name, such as "LYC" for "Lübecker Yacht-Club." A point of contact may be provided, in the form of a name and an e-mail address, telling whom to contact for questions about the instance. + +The difference compared to a dedicated replication cluster set-up is that a multi-instance host needs to be identified that has resources available to run the new Java process. This requires enough disk space, as well as enough available fast swap space and a CPU usage that is not saturated. When such a host has been identified, no *yum* activity or anything related to the AMI will be conducted. Otherwise, a new multi-instance host needs to be launched from an AMI, and the same *yum* activities as above apply. + +A port combination for Jetty/Telnet/Expedition UDP is identified based on any already mapped Java processes on that host. The port combination together with the MongoDB and RabbitMQ settings are stored in an *env.sh* file under */home/sailing/servers/<servername>* and the process can be launched as usual. + +The Apache configuration entry needs to be added, pointing to the respective Jetty port, usually with a "*Plain*" or "*Home*" macro because such club servers usually don't serve a single event. As in the scenario above, the Apache *httpd* server process will then need to load the new configuration. + +The load balancer handling varies slightly compared to the dedicated replication cluster set-up. The health checks need to be set to probe the Java instance using HTTP at the registered Jetty port, not the HTTPS set-up through the Apache server because the Apache server on a multi-instance can handle several Java processes. + +Using a separate *-master* URL seems advisable because when migrating the Java process to a larger set-up later, all devices have already been bound to the *-master* URL, and no re-configuration will be required. + ### Migrate from a Multi-Instance to a Dedicated Replication Cluster +When the orchestrator figures that an event is approaching on a Java server hosted in a multi-instance set-up and the event seems too large to be handled successfully by such set-up, migration to a dedicated replication cluster is a good way to handle the load. This migration should ideally happen when there is no write-load applied to the instance. + +As a first step, the *-master* target group is emptied. This will avoid any write requests such as those coming from the Race Manager app or the Sail InSight app reaching a master process that is deprecated and will be stopped anytime soon. Then, the [Create a New Event on a Dedicated Replication Cluster](#create-a-new-event-on-a-dedicated-replication-cluster) scenario is executed, except for the step of creating a new event and new load balancer rules and target groups. Just by configuring the MongoDB database name, all existing data held so far by the Java process hosted in the multi-instance set-up will be loaded into a dedicated master instance. + +The new dedicated master server can be added to the public-facing target group for the server name as well as to the *-master* target group. The health checks of both, public and *-master* target group need to be changed to the default health check rules for dedicated replication clusters (using the default HTTPS port). When healthy, the old master server will be removed from the public-facing target group. The Java process on the multi-instance host can be shut down. Its resources such as the directory on the multi-host and the port "reservations" that this entailed can be freed. The Apache httpd configuration entry on the multi-instance host shall be removed, and the Apache configuration shall be reloaded. + ### Migrate from a Dedicated Replication Cluster into a Multi-Instance +This is the reverse case to [Migrate from a Multi-Instance to a Dedicated Replication Cluster](#migrate-from-a-multi-instance-to-a-dedicated-replication-cluster). In detail: + +- Start out with removing the existing master server from the *-master* target group +- [Create a New "Club Set-Up" in a Multi-Instance](#create-a-new-club-set-up-in-a-multi-instance), except that the database already exists, and the data will be loaded from that existing database, and the target groups and load balancer rules do not have to be created +- add the new multi-instance Java server to the two target groups +- change the health check rules for both target groups so they use HTTP for the multi-instance Java server's HTTPS port +- when the new Java server process is considered healthy by both target groups, remove the dedicated master and all replicas from all target groups +- terminate all instances of dedicated replication cluster + ### Observe and Automatically Scale a Replication Cluster +According to our experience, in most cases scalability limitations are caused by bandwidth bottlenecks. Less frequently, CPU limitations cause performance degradations when several large leaderboards need to be re-calculated at high frequency. This can also be caused by several dedicated requests for specific, non-live time points. There are different approaches to handling these two different kinds of bottlenecks. The former requires more bandwidth in the form or more instances to be made available to the load balancer. The latter requires more CPU resources and optionally the use of [sharding](#sharding). + +When bandwidth limitations are observed, adding replicas is the simple remedy. The replicas are launched with the exact same release as the master to which they shall belong. Note that replication can also be used for master server processes running on a multi-instance host. The master server may or may not be part of the public-facing target group. If it is low on network resources it may be a good idea to not include it in the public-facing target group. The new replica will be added to the public-facing target group. A solid health check will avoid that it receives any application domain-oriented requests unless the replication process has completed the initial load phase successfully. + +When a master server process is CPU bound, this will usually be because of abundant leaderboard (re-)calculation requests hitting that server. The quickest remedy is to add replicas to the public-facing target group and to remove the master server from that group. Those replicas can have more CPU resources than the master. Their memory should not be less than that of the master. + +If replicas are bound by their CPU power, simply adding more replicas will usually not help. Instead, [sharding](#sharding) may provide a solution (see also [Configure Sharding in a Replication Cluster](#configure-sharding-in-a-replication-cluster)). It allows spreading leaderboard (re-)calculation load across several target groups, avoiding a situation where all replicas have to (re-)calculate all leaderboards all the time. Target groups will then receive only a subset of the leaderboard (re-)calculation requests, based on the leaderboard names. + +When the CPU and/or network load drop under a given threshold for a given period of time, replicas may be removed from the public-facing target group and can then be terminated, once the *draining* status is over. During termination the replica will automatically save its logs. + ### Archiving +When an event is over, a dedicated replication cluster is no longer required, and the scaling requirements change from high-CPU, high ingestion rates to read-only with decreasing, rather sporadic access. The archive server(s) are geared towards this load profile. Furthermore, with our current data mining architecture, archived races are amenable to holistic analysis. + +The archive server, as described in [Archive Servers](#archive-servers), comes as a production and a fail-over instance. Archiving is done using the Master Data Import (MDI) on the production archive server, using the dedicated replication cluster's master as source. An API shall be provided that lets the importing server discover the restore records needed to load the races. The importing archive server shall then restore the tracked races, before a comparison with the exporting source server can be carried out. + +After the comparison was successful, the remote server reference from the archive server to the dedicated replication cluster can be removed, avoiding event duplication on the archive server. An Apache macro for the event imported has to be added to the central web server. Then, the ALB rules for the *-master* and public-facing sub-domain of the dedicated replication cluster can be removed, the instances terminated and the target groups deleted. The default "catch-all" rule will delegate requests for the event to the archive server where the Apache rule re-writes it accordingly. + ### Archive Server Upgrade and Switch +Upon administrator request a release upgrade can be performed for the archive server. Based on the principles discussed in [Archive Servers](#archive-servers), the fail-over server will receive the new release and will have its Java process re-started. Restoring the many races can take several hours. When done, a comparison with the production archive server is carried out. Only when no differences are found and a few spot checks show reasonable results the switch is performed. + +Today, these spot checks are done "manually" by looking at a few sample races and a few leaderboards. These steps will need automation. + +The switch is currently performed by adjusting the rule in *sapsailing.com:/etc/httpd/conf.d/000-macros.conf* that tells the internal IP address of the production archive server, followed by a *service httpd reload* command. + ### Automatic Archive Server Fail-Over +When the production archive server becomes "unhealthy" a fast switch to the fail-over archive server is required. The reasons for an unhealthy production archive server may vary. Recently, for example, we experienced an unexpected AWS-enforced and not announced reboot of the EC2 instance. Other cases may involve regressions in a release to which the archive server was upgraded. + +We may use the ALB architecture and separate web servers for the two archive servers, sharing their configuration rules, to implement such an automatic fail-over. With the ALB rules implementing a precedence order, the default rule could forward to the target group containing the web server for the fail-over archive server, whereas a last-but-one rule would catch **.sapsailing.com* and would forward to the target group containing the production archive server's web server. This way, when the production archive server becomes unhealthy, the default rule will apply and will forward events to the fail-over archive server. + +A severe alert shall be triggered when the production archive server becomes unavailable. + ### Configure Sharding in a Replication Cluster +Sharding works by the GWT RPC requests targeting a specific leaderboard being identified by a specific URL path suffix that mentions the leaderboard to which the request is specific. This way, an ALB rule can be established that matches the specific leaderboard suffix and forwards to a dedicated target group. A replication cluster then will have more than the two typical target groups (*-master* and public-facing). The rule forwarding to the public-facing target group will act as the default after all leaderboard-specific routing rules. + +The decision which and how many target groups to create shall be made based on monitoring the leaderboard re-calculation times. If the times exceed a certain threshold, and the general decision to use sharding is made by the orchestrator, the orchestrator should start by creating a target group for the leaderboard that is most expensive to calculate, considering the re-calculation frequency over some current time range such as a few minutes, as well as the duration required per re-calculation. + +Depending on the number of replicas already available, the orchestrator may choose to partition the existing replica set such that after a target group and ALB rule for a specific leaderboard has been established, the replicas added to that target group will be removed from the public-facing target group. The problem with this set-up could be that then those replicas cannot serve as default target in case other replicas become unhealthy. + +Better would be a complete partitioning based on all the leaderboard requests observed over a recent time range. The public-facing target group then would only serve as a default rule for requests not specific to any leaderboard, and in case target groups for specific leaderboards have no healthy targets anymore. + ### Amazon Machine Image (AMI) Upgrades +The Linux installation that our images are based upon receives regular updates for all sorts of packages. Most package updates can be obtained after an instance was booted, simply by running the command *yum update*. However, kernel updates require the instance to be re-booted and this is not something we would like to have to do each time an instance needs to be started. + +Instead, the AMI used to launch such instances should regularly and automatically be maintained, and there shall be a test procedure in place for the updated AMI before it is made the new default. A few older revisions may be kept as fallback, in case the tests don't catch a problem with an upgrade. + +Part of the upgrade process needs to be an adjustable, parameterizable boot-up script that can understand whether a re-boot is performed as part of an image upgrade. In this case, certain actions need to be skipped, such as launching the Apache server or the Java process or patching any files based on the user details, assuming the instance were to become part of an ALB's target group. + +### Add Disk Space to MongoDB + +When monitoring shows that the disk volumes holding the MongoDB contents crosses a certain threshold (such as 90%) then more disk space needs to be provided automatically. [https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-modify-volume.html](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-modify-volume.html) explains the process with AWS and Linux tools. + +Currently, the instance used to run the MongoDB processes is of type m1.large which is an "old" instance type that does not support in-place volume size changes without detaching the volume. Therefore, as a first step towards this goal the MongoDB/RabbitMQ instance should be migrated to a new instance type with similar resources, such as *m4.large*. Then, growing the file-system "in-flight" should not be a problem according to the documentation... \ No newline at end of file From a7171dfb23d3a04b6979d3bdf947f46632e7477b Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Wed, 22 Aug 2018 15:08:36 +0200 Subject: [PATCH 175/197] bug4718 Unified copyright text in imprint file --- java/com.sap.sailing.gwt.ui/imprint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/imprint.json b/java/com.sap.sailing.gwt.ui/imprint.json index cae3e2c9ada..97ff0810937 100644 --- a/java/com.sap.sailing.gwt.ui/imprint.json +++ b/java/com.sap.sailing.gwt.ui/imprint.json @@ -741,7 +741,7 @@ "owner": "\"Mr.doob\"", "homepage": "https://threejs.org/", "acknowledgements": [ - "Copyright � 2010-2017 three.js authors" + "Copyright (c) 2010-2017 three.js authors" ], "key": "MIT" }, From 50ef15facbc992e20fda7155ca1905c3ba4a6eb0 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Wed, 22 Aug 2018 15:09:03 +0200 Subject: [PATCH 176/197] bug4718 Removed no longer existing directory from build.properties file --- java/com.sap.sailing.server.gateway/build.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/java/com.sap.sailing.server.gateway/build.properties b/java/com.sap.sailing.server.gateway/build.properties index 253cfd2438a..70d6ff37d46 100644 --- a/java/com.sap.sailing.server.gateway/build.properties +++ b/java/com.sap.sailing.server.gateway/build.properties @@ -5,5 +5,4 @@ bin.includes = META-INF/,\ .,\ WEB-INF/,\ webservices/,\ - utils/,\ main.css From 372e46f476e544dd51b4e017c12ef67118cf08f3 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 22 Aug 2018 15:25:53 +0200 Subject: [PATCH 177/197] bug4735: The ExtractionFunctionSuggestionDisplay now shows unsupported statistics grayed out at the bottom of the list --- java/com.sap.sailing.gwt.ui/DataMining.css | 16 ++- .../datamining/ui/client/StringMessages.java | 1 + .../ui/client/StringMessages.properties | 1 + .../ui/client/StringMessages_de.properties | 5 +- .../ExtractionFunctionSuggestBox.java | 125 +++++++++++++----- .../SuggestBoxStatisticProvider.java | 66 ++++----- 6 files changed, 145 insertions(+), 69 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/DataMining.css b/java/com.sap.sailing.gwt.ui/DataMining.css index 9446b099028..9ef6e46c92d 100644 --- a/java/com.sap.sailing.gwt.ui/DataMining.css +++ b/java/com.sap.sailing.gwt.ui/DataMining.css @@ -272,6 +272,7 @@ input.magnifier { .statisticSuggestBoxPopupContent table { border-spacing: 0px; } + .statisticSuggestBoxPopupContent .item { padding: 2px 5px; color: #000; @@ -288,13 +289,26 @@ input.magnifier { .statisticSuggestBoxPopupContent .item-selected { background: #d5e2ff; } +.statisticSuggestBoxPopupContent .item-unsupported { + color: gray; +} -.statisticSuggestBoxPopupContentSeparator { +.statisticSuggestBoxPopupContent .separator { padding: 8px 5px 0px 5px; border-bottom: 2px solid #6f7277; font-weight: 600; font-size: 15px; } +.statisticSuggestBoxPopupContent .separator-message { + padding: 8px 5px 0px 5px; + font-weight: bold; + font-size: 15px; + text-align: center; + white-space: pre-wrap; +} +.statisticSuggestBoxPopupContent .separator-unsupported { + color: gray; +} .dataMiningListBox { min-width: 120px; diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 44d4b9a148d..8d758090476 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -94,5 +94,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { String of(); String the(); String and(); + String followingStatisticsAreNotSupportedByAggregatorWarning(); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 162dd9d9b63..114e6fb3123 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -78,3 +78,4 @@ applyingQuery=Applying Query searchAvailableStatistics=Search the available statistics reloadComponents=Reload Components and=and +followingStatisticsAreNotSupportedByAggregatorWarning=The following statistics aren''t supported by the current aggregator.\nSelecting one of them will reset it. \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index b65021fe95b..6cf5d3f2be5 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -11,7 +11,7 @@ queryDefinitionViewer=Query Definition Anzeiger run=Ausführen any=Beliebig of=von -the=die +the=der queryNotValidBecause=Keine Datenabfrage möglich, denn queryRunner=Abfrageverarbeiter runAQuery=Führe eine Anfrage aus @@ -76,4 +76,5 @@ keepChangesChangeLossStrategyTooltip=Aktuelle Selektion zu behalten, wodurch die applyingQuery=Query wird angezeigt searchAvailableStatistics=Verfügbare Statistiken durchsuchen reloadComponents=Kompnenten neu laden -and=und \ No newline at end of file +and=und +followingStatisticsAreNotSupportedByAggregatorWarning=Die nachfolgenden Statistiken werden von dem aktuellen Aggregator nicht unterstützt.\nDieser wird zurückgesetzt, wenn eine davon ausgewählt wird. \ No newline at end of file diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java index 5b69ec865d9..e122880b8c4 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.function.Predicate; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.Element; @@ -20,6 +21,7 @@ import com.google.gwt.user.client.ui.SuggestBox; import com.google.gwt.user.client.ui.SuggestOracle.Suggestion; import com.sap.sse.common.Util; import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO; +import com.sap.sse.datamining.ui.client.StringMessages; import com.sap.sse.gwt.client.suggestion.AbstractListSuggestOracle; import com.sap.sse.gwt.client.suggestion.CustomSuggestBox; @@ -37,8 +39,8 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox extractionFunctionSupportedPredicate) { + super(new ExtractionFunctionSuggestOracle(extractionFunctionSupportedPredicate), new ExtractionFunctionSuggestionDisplay()); suggestOracle = (AbstractListSuggestOracle) getSuggestOracle(); display = (ExtractionFunctionSuggestionDisplay) getSuggestionDisplay(); addSuggestionSelectionHandler(this::setExtractionFunction); @@ -87,6 +89,12 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox { + private final Predicate extractionFunctionSupportedPredicate; + + public ExtractionFunctionSuggestOracle(Predicate extractionFunctionSupportedPredicate) { + this.extractionFunctionSupportedPredicate = extractionFunctionSupportedPredicate; + } + @Override protected Iterable getKeywordStrings(Iterable queryTokens) { String filterText = Util.first(queryTokens); @@ -113,14 +121,21 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox queryTokens) { - return new ExtractionFunctionSuggestion(match, queryTokens); + return new ExtractionFunctionSuggestion(match, queryTokens, extractionFunctionSupportedPredicate.test(match)); } private class ExtractionFunctionSuggestion extends SimpleSuggestion implements Comparable { + private final boolean supported; + public ExtractionFunctionSuggestion(ExtractionFunctionWithContext suggestObject, - Iterable queryTokens) { + Iterable queryTokens, boolean supported) { super(suggestObject, queryTokens); + this.supported = supported; + } + + public boolean isSupported() { + return supported; } @Override @@ -138,6 +153,8 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox supportedSuggestions = new ArrayList<>(); + Collection unsupportedSuggestions = new ArrayList<>(); + for (Suggestion suggestion : suggestions) { + ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion extractionFunctionSuggestion = + (ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion) suggestion; + if (extractionFunctionSuggestion.isSupported()) { + supportedSuggestions.add(extractionFunctionSuggestion); + } else { + unsupportedSuggestions.add(extractionFunctionSuggestion); + } + } + suggestionMenu.clearItems(); if (groupingSuggestionsByRetrieverChain) { - showSuggestionsGroupedByRetrieverChain(suggestions, isDisplayStringHTML, callback); + showSuggestionsGroupedByRetrieverChain(supportedSuggestions, isDisplayStringHTML, callback); } else { - int count = 0; - for (Suggestion suggestion : suggestions) { - boolean isEven = count % 2 == 0; - SuggestionMenuItem menuItem = createSuggestionMenuItem(suggestion, isDisplayStringHTML, isEven, callback); - suggestionMenu.addItem(menuItem); - count++; + addSuggestionMenuItems(supportedSuggestions, isDisplayStringHTML, callback); + } + if (!unsupportedSuggestions.isEmpty()) { + suggestionMenu.addSeparator(new UnsupportedExtractionFunctionsSeparator(stringMessages.followingStatisticsAreNotSupportedByAggregatorWarning())); + if (groupingSuggestionsByRetrieverChain) { + showSuggestionsGroupedByRetrieverChain(unsupportedSuggestions, isDisplayStringHTML, callback); + } else { + addSuggestionMenuItems(unsupportedSuggestions, isDisplayStringHTML, callback); } } @@ -230,42 +260,62 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox suggestions, boolean isDisplayStringHTML, SuggestionCallback callback) { - Map> groupedSuggestions = new HashMap<>(); + Map> groupedSuggestions = + groupSuggestionsByRetrieverChain(suggestions); + List orderedRetrieverChains = new ArrayList<>(groupedSuggestions.keySet()); + Collections.sort(orderedRetrieverChains); + for (DataRetrieverChainDefinitionDTO retrieverChain : orderedRetrieverChains) { + List suggestionsOfRetrieverChain = groupedSuggestions.get(retrieverChain); + suggestionsOfRetrieverChain.sort(null); + + ExtractionFunctionSeparator separator = new ExtractionFunctionSeparator(retrieverChain); + suggestionMenu.addSeparator(separator); + if (!suggestionsOfRetrieverChain.get(0).isSupported()) { + separator.addStyleName("separator-unsupported"); + } + addSuggestionMenuItems(suggestionsOfRetrieverChain, isDisplayStringHTML, callback); + } + } + + private Map> groupSuggestionsByRetrieverChain( + Collection suggestions) { + Map> groupedSuggestions = new HashMap<>(); for (Suggestion suggestion : suggestions) { - ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion extractionFunctionSuggestion = + ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion extractionFunctionSuggestion = (ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion) suggestion; ExtractionFunctionWithContext extractionFunction = extractionFunctionSuggestion.getSuggestObject(); DataRetrieverChainDefinitionDTO retrieverChain = extractionFunction.getRetrieverChain(); - List suggestionsOfRetrieverChain = groupedSuggestions.get(retrieverChain); + List suggestionsOfRetrieverChain = groupedSuggestions + .get(retrieverChain); if (suggestionsOfRetrieverChain == null) { suggestionsOfRetrieverChain = new ArrayList<>(); groupedSuggestions.put(retrieverChain, suggestionsOfRetrieverChain); } suggestionsOfRetrieverChain.add(extractionFunctionSuggestion); } - - List orderedRetrieverChains = new ArrayList<>(groupedSuggestions.keySet()); - Collections.sort(orderedRetrieverChains); - for (DataRetrieverChainDefinitionDTO retrieverChain : orderedRetrieverChains) { - suggestionMenu.addSeparator(new ExtractionFunctionSeparator(retrieverChain)); - - List suggestionsOfRetrieverChain = groupedSuggestions.get(retrieverChain); - suggestionsOfRetrieverChain.sort(null); - int count = 0; - for (Suggestion suggestion : suggestionsOfRetrieverChain) { - boolean isEven = count % 2 == 0; - SuggestionMenuItem menuItem = createSuggestionMenuItem(suggestion, isDisplayStringHTML, isEven, callback); - suggestionMenu.addItem(menuItem); - count++; - } + return groupedSuggestions; + } + + private void addSuggestionMenuItems( + Collection suggestions, + boolean isDisplayStringHTML, SuggestionCallback callback) { + int count = 0; + for (ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion suggestion : suggestions) { + boolean isEven = count % 2 == 0; + SuggestionMenuItem menuItem = createSuggestionMenuItem(suggestion, isDisplayStringHTML, isEven, callback); + suggestionMenu.addItem(menuItem); + count++; } } - private SuggestionMenuItem createSuggestionMenuItem(Suggestion suggestion, boolean isDisplayStringHTML, - boolean isEven, SuggestionCallback callback) { + private SuggestionMenuItem createSuggestionMenuItem(ExtractionFunctionSuggestOracle.ExtractionFunctionSuggestion suggestion, + boolean isDisplayStringHTML, boolean isEven, SuggestionCallback callback) { SuggestionMenuItem menuItem = new SuggestionMenuItem(suggestion, isDisplayStringHTML, () -> callback.onSuggestionSelected(suggestion)); menuItem.addStyleName("item-" + (isEven ? "even" : "odd")); + if (!suggestion.isSupported()) { + menuItem.addStyleName("item-unsupported"); + } return menuItem; } @@ -325,12 +375,21 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox(); retrieverLevelSettingsComponents = new ArrayList<>(); + collectedAggregators = new HashMap<>(); + availableAggregators = new ArrayList<>(); + aggregatorListBox = new AggregatorListBox("<" + getDataMiningStringMessages().any() + ">"); + aggregatorListBox.addValueChangeHandler(new ValueChangeHandler() { + @Override + public void onValueChange(ValueChangeEvent event) { + aggregatorSelectionChanged(event.getValue()); + } + }); + aggregatorListBox.addStyleName(StatisticProviderElementStyle); + aggregatorListBox.addStyleName("dataMiningListBox"); + aggregatorListBox.setEnabled(false); + availableIdentityFunctions = new ArrayList<>(); availableStatistics = new ArrayList<>(); - extractionFunctionSuggestBox = new ExtractionFunctionSuggestBox(); + extractionFunctionSuggestBox = new ExtractionFunctionSuggestBox(extractionFunction -> { + AggregatorGroup aggregator = aggregatorListBox.getValue(); + return aggregator == null || aggregator.supportsType(extractionFunction.getExtractionFunction().getReturnTypeName()); + }); extractionFunctionSuggestBox.setValueChangeHandler(this::extractionFunctionSelectionChanged); extractionFunctionSuggestBox.getValueBox().addFocusHandler(e -> { extractionFunctionSuggestBox.getValueBox().selectAll(); @@ -131,19 +147,6 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent(); - availableAggregators = new ArrayList<>(); - aggregatorListBox = new AggregatorListBox("<" + getDataMiningStringMessages().any() + ">"); - aggregatorListBox.addValueChangeHandler(new ValueChangeHandler() { - @Override - public void onValueChange(ValueChangeEvent event) { - aggregatorSelectionChanged(event.getValue()); - } - }); - aggregatorListBox.addStyleName(StatisticProviderElementStyle); - aggregatorListBox.addStyleName("dataMiningListBox"); - aggregatorListBox.setEnabled(false); - mainPanel = new FlowPanel(); mainPanel.addStyleName(StatisticProviderStyle); mainPanel.add(aggregatorListBox); @@ -325,39 +328,31 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent selectableExtractionFunctions = new ArrayList<>(); + List selectableExtractionFunctions; String labelBetweenAggregatorAndStatisticText = null; - if (newAggregator == null) { - selectableExtractionFunctions.addAll(availableStatistics); - labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().of(); + if (newAggregatorSupportsIdentityFunction) { + selectableExtractionFunctions = availableIdentityFunctions; + labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().the(); } else { - if (newAggregatorSupportsIdentityFunction) { - selectableExtractionFunctions.addAll(availableIdentityFunctions); - labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().the(); - } else { - for (StatisticWithContext statistic : availableStatistics) { - if (newAggregator.supportsType(statistic.getExtractionFunction().getReturnTypeName())) { - selectableExtractionFunctions.add(statistic); - } - } - labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().of(); - } + selectableExtractionFunctions = availableStatistics; + labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().of(); } ExtractionFunctionWithContext currentExtractionFunction = extractionFunctionSuggestBox.getExtractionFunction(); if (currentExtractionFunction != null && !selectableExtractionFunctions.contains(currentExtractionFunction)) { - ExtractionFunctionWithContext extractionFunctionToSelect = null; + // Current extraction function isn't contained by the new selectable extraction functions if (newAggregatorSupportsIdentityFunction && !currentAggregatorSupportsIdentityFunction) { + // Switch to the corresponding identity function, if the identity functions aren't already the selectable functions for (IdentityFunctionWithContext identityFunction : availableIdentityFunctions) { if (identityFunction.getRetrieverChain().equals(currentExtractionFunction.getRetrieverChain())) { - extractionFunctionToSelect = identityFunction; + extractionFunctionSuggestBox.setExtractionFunction(identityFunction); break; } } + } else { + extractionFunctionSuggestBox.setExtractionFunction(null); } - extractionFunctionSuggestBox.setExtractionFunction(extractionFunctionToSelect); } - Collections.sort(selectableExtractionFunctions); extractionFunctionSuggestBox.setSelectableValues(selectableExtractionFunctions); extractionFunctionSuggestBox.setGroupingSuggestionsByRetrieverChain(!newAggregatorSupportsIdentityFunction); labelBetweenAggregatorAndStatistic.setText(labelBetweenAggregatorAndStatisticText); @@ -373,6 +368,11 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent Date: Wed, 22 Aug 2018 15:46:05 +0200 Subject: [PATCH 178/197] bug4735: Updated the sailing analytics notes --- .../places/whatsnew/resources/SailingAnalyticsNotes.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 19b905d8129..2bd13ca54e1 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 @@ -18,10 +18,11 @@
        • A setting has been added to prevent that changes are lost, when a different query should be displayed. The default setting is to ask, if the changes should be discarded or kept (preventing that the query is displayed).
          • -
        • The available statistics are now filtered by the selected aggregator. Aggregators become - grayed out, if they aren't supported by the selected statistic. You can select <Any> - as aggregator to show all available statistics, select the desired one and select a specific - supported aggregator afterwards.
          • +
        • The suggested statistics are now grouped by their retriever chain
          • +
        • The aggregator and statistic control switched places and are now linked together. This means that + all aggregators/statistics can always be selected, but are grayed out if one component isn't supported + by the other (e.g. an aggreagtor doesn't exist for the currently selected statistic). The other + component will be reset when an unsupported component is selected.
        • Counting aggregators now work directly on the retrieved data elements and don't require the selection of a specific statistic. Changing to a counting aggregator when a statistic is selected automatically changes it to the corresponding data type.
          • From e653e176e0e7c45ec99d21d625db35c8995afce5 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 22 Aug 2018 15:58:32 +0200 Subject: [PATCH 179/197] Fixed the datamining UI tests after I missed to import the project --- .../ui/test/client/presentation/DummyResultsPresenter.java | 3 ++- .../sse/datamining/ui/test/client/TestSSEDataMiningUi.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sse.datamining.ui.test/src/com/sap/sse/datamining/ui/test/client/presentation/DummyResultsPresenter.java b/java/com.sap.sse.datamining.ui.test/src/com/sap/sse/datamining/ui/test/client/presentation/DummyResultsPresenter.java index eeb53fde4c6..8e5c43ee5f7 100644 --- a/java/com.sap.sse.datamining.ui.test/src/com/sap/sse/datamining/ui/test/client/presentation/DummyResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui.test/src/com/sap/sse/datamining/ui/test/client/presentation/DummyResultsPresenter.java @@ -6,6 +6,7 @@ import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.ui.DockLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sse.common.settings.Settings; +import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; import com.sap.sse.datamining.ui.client.presentation.AbstractResultsPresenter; import com.sap.sse.datamining.ui.client.presentation.TabbedResultsPresenter; @@ -35,7 +36,7 @@ public class DummyResultsPresenter extends AbstractResultsPresenter { * Stores this ResultsPresenter for test purposes. */ @Override - public void showResult(QueryResultDTO result) { + public void showResult(StatisticQueryDefinitionDTO queryDefinition, QueryResultDTO result) { executedResultsPresenter.add(this); } diff --git a/java/com.sap.sse.datamining.ui.test/test/com/sap/sse/datamining/ui/test/client/TestSSEDataMiningUi.java b/java/com.sap.sse.datamining.ui.test/test/com/sap/sse/datamining/ui/test/client/TestSSEDataMiningUi.java index 59e4dc4ef87..4d7636244b6 100644 --- a/java/com.sap.sse.datamining.ui.test/test/com/sap/sse/datamining/ui/test/client/TestSSEDataMiningUi.java +++ b/java/com.sap.sse.datamining.ui.test/test/com/sap/sse/datamining/ui/test/client/TestSSEDataMiningUi.java @@ -54,15 +54,15 @@ public class TestSSEDataMiningUi extends GWTTestCase { presenter.registerResultsPresenter(String.class, stringResultsPresenter); presenter.registerResultsPresenter(Double.class, doubleResultsPresenter); - presenter.showResult(new DummyQueryResultDTO<>(String.class)); + presenter.showResult(null, new DummyQueryResultDTO<>(String.class)); assertTrue(executedPresenter.size() == 1); assertEquals(executedPresenter.get(0), stringResultsPresenter); - presenter.showResult(new DummyQueryResultDTO<>(Double.class)); + presenter.showResult(null, new DummyQueryResultDTO<>(Double.class)); assertTrue(executedPresenter.size() == 2); assertEquals(executedPresenter.get(1), doubleResultsPresenter); - presenter.showResult(new DummyQueryResultDTO<>(Number.class)); + presenter.showResult(null, new DummyQueryResultDTO<>(Number.class)); assertTrue(executedPresenter.size() == 2); assertEquals(executedPresenter.get(0), stringResultsPresenter); assertEquals(executedPresenter.get(1), doubleResultsPresenter); From b0acdcd8e11037da95b8223cafbfb4c9f99350fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Wed, 22 Aug 2018 16:28:09 +0200 Subject: [PATCH 180/197] bug4508 reimplemented competitor name and competitor email queryparams for creation of competitors --- .../gateway/jaxrs/api/RegattasResource.java | 46 ++++++++++++++----- 1 file changed, 34 insertions(+), 12 deletions(-) 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 8a9eb6d9ded..6dd091385a9 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 @@ -326,7 +326,8 @@ public class RegattasResource extends AbstractSailingServerResource { @QueryParam("nationalityIOC") String nationalityThreeLetterIOCCode, @QueryParam("timeontimefactor") Double timeOnTimeFactor, @QueryParam("timeondistanceallowancepernauticalmileasmillis") Long timeOnDistanceAllowancePerNauticalMileAsMillis, - @QueryParam("searchtag") String searchTag) { + @QueryParam("searchtag") String searchTag, @QueryParam("competitorName") String competitorName, + @QueryParam("competitorEmail") String competitorEmail) { final Subject subject = SecurityUtils.getSubject(); subject.checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.UPDATE, regattaName)); Response response; @@ -337,18 +338,39 @@ public class RegattasResource extends AbstractSailingServerResource { response = getBadBoatClassResponse(boatClassName); } else { final User user = getService(SecurityService.class).getCurrentUser(); - final Boat boat = new BoatImpl(UUID.randomUUID(), user.getName(), - getService().getBaseDomainFactory().getOrCreateBoatClass(boatClassName, /* typicallyStartsUpwind */ true), - sailId); - final CompetitorWithBoat competitor = getService().getCompetitorAndBoatStore().getOrCreateCompetitorWithBoat(UUID.randomUUID(), - user.getFullName() == null ? user.getName() : user.getFullName(), /* shortName */ null, - /* displayColor */ null, user.getEmail(), /* flagImageURI */ null, - new TeamImpl(user.getName(), Collections.singleton(new PersonImpl(user.getFullName() == null ? user.getName() : user.getFullName(), - getService().getBaseDomainFactory().getOrCreateNationality(nationalityThreeLetterIOCCode), + final String shortName; + final String name; + if (competitorName != null) { + name = competitorName; + shortName = competitorName; + } else { + shortName = user.getName(); + name = user.getFullName() == null ? shortName : user.getFullName(); + } + final String email; + if (competitorEmail != null) { + email = competitorEmail; + } else { + email = user.getEmail(); + } + + final Boat boat = new BoatImpl(UUID.randomUUID(), shortName, getService().getBaseDomainFactory() + .getOrCreateBoatClass(boatClassName, /* typicallyStartsUpwind */ true), sailId); + + final TeamImpl team = new TeamImpl(shortName, + Collections.singleton(new PersonImpl(name, + getService().getBaseDomainFactory() + .getOrCreateNationality(nationalityThreeLetterIOCCode), /* dateOfBirth */ null, /* description */ null)), - /* coach */ null), timeOnTimeFactor, - timeOnDistanceAllowancePerNauticalMileAsMillis == null ? null : new MillisecondsDurationImpl(timeOnDistanceAllowancePerNauticalMileAsMillis), - searchTag, (DynamicBoat) boat); + /* coach */ null); + final CompetitorWithBoat competitor = getService().getCompetitorAndBoatStore() + .getOrCreateCompetitorWithBoat(UUID.randomUUID(), + name, /* shortName */ null, /* displayColor */ null, email, /* flagImageURI */ null, + team, + timeOnTimeFactor, + timeOnDistanceAllowancePerNauticalMileAsMillis == null ? null + : new MillisecondsDurationImpl(timeOnDistanceAllowancePerNauticalMileAsMillis), + searchTag, (DynamicBoat) boat); regatta.registerCompetitor(competitor); response = Response.ok(CompetitorJsonSerializer.create().serialize(competitor).toJSONString()). header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); From a72a58dc260031139d9460c0089ae8b29a1f2fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 23 Aug 2018 16:13:52 +0200 Subject: [PATCH 181/197] bug4508 reverted simplification to Long casting to int --- .../sailing/server/gateway/jaxrs/api/RegattasResource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6dd091385a9..9a739737646 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 @@ -1760,7 +1760,7 @@ public class RegattasResource extends AbstractSailingServerResource { Integer maximumNumberOfDiscards = null; if (requestObject.containsKey("maximumNumberOfDiscards")) { - maximumNumberOfDiscards = (int) requestObject.get("maximumNumberOfDiscards"); + maximumNumberOfDiscards = ((Long) requestObject.get("maximumNumberOfDiscards")).intValue(); } int[] resultDiscardingThresholds = null; @@ -1768,7 +1768,7 @@ public class RegattasResource extends AbstractSailingServerResource { JSONArray resultDiscardingThresholdsRaw = (JSONArray) requestObject.get("resultDiscardingThresholds"); resultDiscardingThresholds = new int[resultDiscardingThresholdsRaw.size()]; for (int i = 0; i < resultDiscardingThresholdsRaw.size(); i++) { - resultDiscardingThresholds[i] = (int) resultDiscardingThresholdsRaw.get(i); + resultDiscardingThresholds[i] = ((Long) resultDiscardingThresholdsRaw.get(i)).intValue(); } } @@ -1777,7 +1777,7 @@ public class RegattasResource extends AbstractSailingServerResource { for (Object fleetRaw : fleetsRaw) { JSONObject fleet = Helpers.toJSONObjectSafe(fleetRaw); String fleetName = (String) fleet.get("fleetName"); - int orderNo = (int) fleet.get("orderNo"); + int orderNo = ((Long) fleet.get("orderNo")).intValue(); String htmlColor = (String) fleet.get("htmlColor"); fleets.add(new FleetDTO(fleetName, orderNo, new RGBColor(htmlColor))); } From 96c48a74bf8967a252af7098801d23b7874d17f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Fri, 24 Aug 2018 09:19:49 +0200 Subject: [PATCH 182/197] bug4508 fix for shiro bearertoken paths --- .../com.sap.sailing.server.gateway/resources/shiro.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.server.gateway/resources/shiro.ini b/java/com.sap.sailing.server.gateway/resources/shiro.ini index c4a1887a9ba..e3804fb7736 100755 --- a/java/com.sap.sailing.server.gateway/resources/shiro.ini +++ b/java/com.sap.sailing.server.gateway/resources/shiro.ini @@ -85,9 +85,9 @@ bearerToken = com.sap.sailing.server.security.BearerTokenOrBasicOrFormAuthentica # Secure access to additional apis used for SailRacer /api/v1/leaderboards/*/enableRaceLogForCompetitorRegistration/** = bearerToken /api/v1/leaderboards/*/denoteForTracking/** = bearerToken -/api/v1/regattas/*/updateOrCreateSeries = bearerToken -/api/v1/mark/*/addMarkToRegatta/** = bearerToken -/api/v1/mark/*/addMarkFix/** = bearerToken -/api/v1/mark/*/addCourseDefinitionToRaceLog/** = bearerToken -/api/v1/wind/*/putWind/** = bearerToken +/api/v1/regattas/updateOrCreateSeries = bearerToken +/api/v1/mark/addMarkToRegatta/** = bearerToken +/api/v1/mark/addMarkFix/** = bearerToken +/api/v1/mark/addCourseDefinitionToRaceLog/** = bearerToken +/api/v1/wind/putWind/** = bearerToken From 60578303e31687cbff4ec056dc5760f249f3142c Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 24 Aug 2018 11:43:45 +0200 Subject: [PATCH 183/197] Fixed the selection of an unsupported aggregator --- .../selection/statistic/AggregatorGroup.java | 9 +++++++++ .../selection/statistic/AggregatorListBox.java | 6 +++--- .../statistic/SuggestBoxStatisticProvider.java | 17 +++++++---------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorGroup.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorGroup.java index c392983a64c..ba35dc25649 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorGroup.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorGroup.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; +import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; class AggregatorGroup implements Comparable { @@ -21,6 +22,14 @@ class AggregatorGroup implements Comparable { return key; } + public boolean supportsFunction(ExtractionFunctionWithContext extractionFunction) { + return extractionFunction != null && supportsFunction(extractionFunction.getExtractionFunction()); + } + + public boolean supportsFunction(FunctionDTO function) { + return function != null && supportsType(function.getReturnTypeName()); + } + public boolean supportsType(String typeName) { return aggregatorsBySupportedTypeName.containsKey(typeName); } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java index 645f6d62f0c..44c2d8e59a3 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java @@ -27,15 +27,15 @@ public class AggregatorListBox extends ValueListBox { aggregatorsByDisplayName = new HashMap<>(); } - public void updateItemStyles(String extractionFunctionReturnTypeName) { + public void updateItemStyles(ExtractionFunctionWithContext extractionFunction) { ListBox listBox = (ListBox) getWidget(); SelectElement selectElement = SelectElement.as(listBox.getElement()); NodeList options = selectElement.getOptions(); for (int i = 0; i < options.getLength(); i++) { OptionElement option = options.getItem(i); AggregatorGroup aggregator = aggregatorsByDisplayName.get(option.getText()); - String className = aggregator == null || extractionFunctionReturnTypeName == null - || aggregator.supportsType(extractionFunctionReturnTypeName) ? "" : UnsupportedItemStyle; + String className = aggregator == null || extractionFunction == null + || aggregator.supportsFunction(extractionFunction) ? "" : UnsupportedItemStyle; option.setClassName(className); } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java index 3a6f9452df2..e73b687f272 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java @@ -124,7 +124,7 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent(); extractionFunctionSuggestBox = new ExtractionFunctionSuggestBox(extractionFunction -> { AggregatorGroup aggregator = aggregatorListBox.getValue(); - return aggregator == null || aggregator.supportsType(extractionFunction.getExtractionFunction().getReturnTypeName()); + return aggregator == null || aggregator.supportsFunction(extractionFunction); }); extractionFunctionSuggestBox.setValueChangeHandler(this::extractionFunctionSelectionChanged); extractionFunctionSuggestBox.getValueBox().addFocusHandler(e -> { @@ -324,9 +324,9 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent selectableExtractionFunctions; String labelBetweenAggregatorAndStatisticText = null; @@ -339,8 +339,8 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent Date: Fri, 24 Aug 2018 14:23:57 +0200 Subject: [PATCH 184/197] Made the QueryDefinitionViewer and QueryDefinitionParser more robust --- .../developer/QueryDefinitionParser.java | 228 +++++++++++------- .../developer/QueryDefinitionViewer.java | 13 +- 2 files changed, 146 insertions(+), 95 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 6f30790c397..f06199e6189 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -23,6 +23,9 @@ import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinition public class QueryDefinitionParser { + private static final String NullComponentText = "None selected"; + private static final String NullComponentCode = "UNDEFINED"; + public SafeHtml parseToDetailsAsSafeHtml(StatisticQueryDefinitionDTO queryDefinition) { String safeHtml = parseToDetails(queryDefinition, new HtmlBuilder()); return new OnlyToBeUsedInGeneratedCodeStringBlessedAsSafeHtml(safeHtml); @@ -33,24 +36,34 @@ public class QueryDefinitionParser { } private String parseToDetails(StatisticQueryDefinitionDTO queryDefinition, Builder builder) { - builder.appendText("Locale: " + queryDefinition.getLocaleInfoName()).appendLineBreak(); + if (queryDefinition == null) { + return ""; + } + + builder.appendText("Locale: " + queryDefinition.getLocaleInfoName()) + .appendLineBreak().appendLineBreak(); DataRetrieverChainDefinitionDTO chainDefinition = queryDefinition.getDataRetrieverChainDefinition(); - builder.appendLineBreak() - .appendText("Retrieval: " + chainDefinition).appendLineBreak() - .appendTab(1).appendText("Levels: ").appendLineBreak(); - for (int levelIndex = 0; levelIndex < chainDefinition.getLevelAmount(); levelIndex++) { - builder.appendTab(2).appendText(levelIndex + ": " + chainDefinition.getRetrieverLevel(levelIndex)).appendLineBreak(); + builder.appendText("Retrieval: "); + if (chainDefinition != null) { + builder.appendText(chainDefinition.toString()).appendLineBreak() + .appendTab(1).appendText("Levels: ").appendLineBreak(); + for (int levelIndex = 0; levelIndex < chainDefinition.getLevelAmount(); levelIndex++) { + builder.appendTab(2).appendText(levelIndex + ": " + chainDefinition.getRetrieverLevel(levelIndex)).appendLineBreak(); + } + } else { + builder.appendText(NullComponentText).appendLineBreak(); } + builder.appendLineBreak(); HashMap retrieverSettings = queryDefinition.getRetrieverSettings(); - if (!retrieverSettings.isEmpty()) { + if (retrieverSettings != null && !retrieverSettings.isEmpty()) { // TODO Display retriever settings } HashMap>> filterSelection = queryDefinition.getFilterSelection(); - if (!filterSelection.isEmpty()) { - builder.appendLineBreak().appendText("Filter Selection:").appendLineBreak(); + if (filterSelection != null && !filterSelection.isEmpty()) { + builder.appendText("Filter Selection:").appendLineBreak(); List retrieverLevels = new ArrayList<>(filterSelection.keySet()); Collections.sort(retrieverLevels); for (DataRetrieverLevelDTO retrieveLevel : retrieverLevels) { @@ -70,18 +83,25 @@ public class QueryDefinitionParser { builder.appendLineBreak(); } } + builder.appendLineBreak(); } - builder.appendLineBreak() - .appendText("Group By:").appendLineBreak(); ArrayList dimensionsToGroupBy = queryDefinition.getDimensionsToGroupBy(); - for (int index = 0; index < dimensionsToGroupBy.size(); index++) { - builder.appendTab(1).appendText(index + ": " + dimensionsToGroupBy.get(index)).appendLineBreak(); + builder.appendText("Group By: "); + if (dimensionsToGroupBy != null && !dimensionsToGroupBy.isEmpty()) { + builder.appendLineBreak(); + for (int index = 0; index < dimensionsToGroupBy.size(); index++) { + builder.appendTab(1).appendText(index + ": " + dimensionsToGroupBy.get(index)).appendLineBreak(); + } + } else { + builder.appendText(NullComponentText).appendLineBreak(); } + builder.appendLineBreak(); - builder.appendLineBreak() - .appendText("Statistic: " + queryDefinition.getStatisticToCalculate()).appendLineBreak(); - builder.appendText("Aggregator: " + queryDefinition.getAggregatorDefinition()); + FunctionDTO statistic = queryDefinition.getStatisticToCalculate(); + builder.appendText("Statistic: " + (statistic == null ? NullComponentText : statistic)).appendLineBreak(); + AggregationProcessorDefinitionDTO aggregator = queryDefinition.getAggregatorDefinition(); + builder.appendText("Aggregator: " + (aggregator == null ? NullComponentText : aggregator)); return builder.toString(); } @@ -96,6 +116,10 @@ public class QueryDefinitionParser { } private String parseToCode(StatisticQueryDefinitionDTO queryDefinition, TypeToCodeStrategy typeStrategy, Builder builder) { + if (queryDefinition == null) { + return ""; + } + String functionClassName = FunctionDTO.class.getSimpleName(); String aggregatorClassName = AggregationProcessorDefinitionDTO.class.getSimpleName(); String retrieverLevelClassName = DataRetrieverLevelDTO.class.getSimpleName(); @@ -106,96 +130,115 @@ public class QueryDefinitionParser { String hashMapClassName = HashMap.class.getSimpleName(); String hashSetClassName = HashSet.class.getSimpleName(); String serializableClassName = Serializable.class.getSimpleName(); - - DataRetrieverChainDefinitionDTO retrieverChain = queryDefinition.getDataRetrieverChainDefinition(); // Extraction Function String statisticVariable = "statistic"; - if (statisticVariable != null && queryDefinition.getStatisticToCalculate() != null) { - builder.appendText(functionToCode(statisticVariable, queryDefinition.getStatisticToCalculate(), typeStrategy)); - } else { - builder.appendText("null"); - } + builder.appendText(functionToCode(statisticVariable, queryDefinition.getStatisticToCalculate(), typeStrategy)); builder.appendLineBreak(); - // Aggregator Definition String aggregatorVariable = "aggregator"; AggregationProcessorDefinitionDTO aggregator = queryDefinition.getAggregatorDefinition(); + builder.appendText(aggregatorClassName + " " + aggregatorVariable + " = "); if (aggregator != null) { - builder.appendText(aggregatorClassName + " " + aggregatorVariable + " = new " + aggregatorClassName + "(" + literal(aggregator.getMessageKey()) + ", " + - typeStrategy.toCode(aggregator.getExtractedTypeName()) + ", " + typeStrategy.toCode(aggregator.getAggregatedTypeName()) + ", \"\");"); + builder.appendText("new " + aggregatorClassName + "(" + literal(aggregator.getMessageKey()) + ", " + + typeStrategy.toCode(aggregator.getExtractedTypeName()) + ", " + + typeStrategy.toCode(aggregator.getAggregatedTypeName()) + ", \"\")"); } else { - builder.appendText("null"); + builder.appendText(NullComponentCode); + } + builder.appendText(";").appendLineBreak().appendLineBreak(); + + // Retriever Levels and Retriever Chain Definition + DataRetrieverChainDefinitionDTO retrieverChain = queryDefinition.getDataRetrieverChainDefinition(); + String retrieverChainVariable = "retrieverChain"; + + if (retrieverChain != null) { + String retrieverLevelsVariable = "retrieverLevels"; + builder.appendText(arrayListClassName + "<" + retrieverLevelClassName + "> " + retrieverLevelsVariable + + " = new " + arrayListClassName + "<>();").appendLineBreak(); + for (DataRetrieverLevelDTO retrieverLevel : retrieverChain.getRetrieverLevels()) { + LocalizedTypeDTO retrievedType = retrieverLevel.getRetrievedDataType(); + String retrievedTypeAsCode = "new " + localizedTypeClassName + "(" + + typeStrategy.toCode(retrievedType.getTypeName()) + ", \"\")"; + String retrieverSettingsAsCode = "null"; + // TODO Handle the retriever level settings + builder.appendText(retrieverLevelsVariable + ".add(new " + retrieverLevelClassName + "(" + + retrieverLevel.getLevel() + ", " + typeStrategy.toCode(retrieverLevel.getRetrieverTypeName()) + + ", " + retrievedTypeAsCode + ", " + retrieverSettingsAsCode + "));").appendLineBreak(); + } + builder.appendText(retrieverChainClassName + " " + retrieverChainVariable + " = new " + + retrieverChainClassName + "(\"\", " + typeStrategy.toCode(retrieverChain.getDataSourceTypeName()) + + ", " + retrieverLevelsVariable + ");"); + } else { + builder.appendText(retrieverChainClassName + " " + retrieverChainVariable + " = " + NullComponentCode + ";"); } builder.appendLineBreak().appendLineBreak(); - // Retriever Levels and Retriever Chain Definition - String retrieverLevelsVariable = "retrieverLevels"; - builder.appendText(arrayListClassName + "<" + retrieverLevelClassName + "> " + retrieverLevelsVariable + " = new " + arrayListClassName + "<>();").appendLineBreak(); - for (DataRetrieverLevelDTO retrieverLevel : retrieverChain.getRetrieverLevels()) { - LocalizedTypeDTO retrievedType = retrieverLevel.getRetrievedDataType(); - String retrievedTypeAsCode = "new " + localizedTypeClassName + "(" + typeStrategy.toCode(retrievedType.getTypeName()) + ", \"\")"; - String retrieverSettingsAsCode = "null"; - // TODO Handle the retriever level settings - builder.appendText(retrieverLevelsVariable + ".add(new " + retrieverLevelClassName + "(" + retrieverLevel.getLevel() + ", " + - typeStrategy.toCode(retrieverLevel.getRetrieverTypeName()) + ", " + retrievedTypeAsCode + ", " + retrieverSettingsAsCode + "));").appendLineBreak(); - } - String retrieverChainVariable = "retrieverChain"; - builder.appendText(retrieverChainClassName + " " + retrieverChainVariable + " = new " + retrieverChainClassName + "(\"\", " + - typeStrategy.toCode(retrieverChain.getDataSourceTypeName()) + ", " + retrieverLevelsVariable + ");").appendLineBreak() - .appendLineBreak(); - // Query Definition instantiation String queryDefinitionVariable = "queryDefinition"; - builder.appendText(queryDefinitionClassName + " " + queryDefinitionVariable + " = new " + queryDefinitionClassName + "(" + literal(queryDefinition.getLocaleInfoName()) + - ", " + statisticVariable + ", " + aggregatorVariable + ", " + retrieverChainVariable + ");").appendLineBreak() - .appendLineBreak(); + builder.appendText(queryDefinitionClassName + " " + queryDefinitionVariable + " = new " + + queryDefinitionClassName + "(" + literal(queryDefinition.getLocaleInfoName()) + ", " + + statisticVariable + ", " + aggregatorVariable + ", " + retrieverChainVariable + ");") + .appendLineBreak().appendLineBreak(); // Filter Selection per Retriever Level separated by two line breaks - for (DataRetrieverLevelDTO retrieverLevel : retrieverChain.getRetrieverLevels()) { - HashMap> levelFilterSelection = queryDefinition.getFilterSelection().get(retrieverLevel); - if (levelFilterSelection != null && !levelFilterSelection.isEmpty()) { - String levelFilterSelectionVariable = "retrieverlevel" + retrieverLevel.getLevel() + "_FilterSelection"; - builder.appendText(hashMapClassName + "<" + functionClassName + ", " + hashSetClassName + "> " + levelFilterSelectionVariable + " = new " + hashMapClassName + "<>();").appendLineBreak(); - - int filterDimensionCounter = 0; - for (FunctionDTO filterDimension : levelFilterSelection.keySet()) { - String filterDimensionVariable = "filterDimension" + filterDimensionCounter; - builder.appendText(functionToCode(filterDimensionVariable, filterDimension, typeStrategy)).appendLineBreak(); - - String dimensionFilterSelectionVariable = filterDimensionVariable + "_Selection"; - builder.appendText(hashSetClassName + "<" + serializableClassName + "> " + dimensionFilterSelectionVariable + - " = new " + hashSetClassName + "<>();").appendLineBreak(); - for (Serializable filterValue : levelFilterSelection.get(filterDimension)) { - builder.appendText(dimensionFilterSelectionVariable + ".add(" + literal(filterValue) + ");").appendLineBreak(); + HashMap>> filterSelection = queryDefinition.getFilterSelection(); + if (filterSelection != null && retrieverChain != null) { + for (DataRetrieverLevelDTO retrieverLevel : retrieverChain.getRetrieverLevels()) { + HashMap> levelFilterSelection = filterSelection.get(retrieverLevel); + if (levelFilterSelection != null && !levelFilterSelection.isEmpty()) { + String levelFilterSelectionVariable = "retrieverlevel" + retrieverLevel.getLevel() + "_FilterSelection"; + builder.appendText(hashMapClassName + "<" + functionClassName + ", " + hashSetClassName + + "> " + levelFilterSelectionVariable + " = new " + + hashMapClassName + "<>();").appendLineBreak(); + + int filterDimensionCounter = 0; + for (FunctionDTO filterDimension : levelFilterSelection.keySet()) { + String filterDimensionVariable = "filterDimension" + filterDimensionCounter; + builder.appendText(functionToCode(filterDimensionVariable, filterDimension, typeStrategy)) + .appendLineBreak(); + + String dimensionFilterSelectionVariable = filterDimensionVariable + "_Selection"; + builder.appendText(hashSetClassName + "<" + serializableClassName + "> " + + dimensionFilterSelectionVariable + " = new " + hashSetClassName + "<>();") + .appendLineBreak(); + for (Serializable filterValue : levelFilterSelection.get(filterDimension)) { + builder.appendText(dimensionFilterSelectionVariable + ".add(" + literal(filterValue) + ");") + .appendLineBreak(); + } + + builder.appendText(levelFilterSelectionVariable + ".put(" + filterDimensionVariable + ", " + + dimensionFilterSelectionVariable + ");").appendLineBreak(); + filterDimensionCounter++; } - - builder.appendText(levelFilterSelectionVariable + ".put(" + filterDimensionVariable + ", " + dimensionFilterSelectionVariable + ");").appendLineBreak(); - filterDimensionCounter++; + + builder.appendText(queryDefinitionVariable + ".setFilterSelectionFor(" + retrieverChainVariable + + ".getRetrieverLevel(" + retrieverLevel.getLevel() + "), " + levelFilterSelectionVariable + + ");").appendLineBreak().appendLineBreak(); } - - builder.appendText(queryDefinitionVariable + ".setFilterSelectionFor(" + retrieverChainVariable + ".getRetrieverLevel(" + - retrieverLevel.getLevel() + "), " + levelFilterSelectionVariable + ");").appendLineBreak() - .appendLineBreak(); - } - - } - // Dimensions to Group By separated by two line breaks - int dimensionToGroupByCounter = 0; - boolean first = true; - for (FunctionDTO dimensionToGroupBy : queryDefinition.getDimensionsToGroupBy()) { - if (!first) { - builder.appendLineBreak().appendLineBreak(); } - - String dimensionToGroupByVariable = "dimensionToGroupBy" + dimensionToGroupByCounter; - builder.appendText(functionToCode(dimensionToGroupByVariable, dimensionToGroupBy, typeStrategy)).appendLineBreak(); - builder.appendText(queryDefinitionVariable + ".appendDimensionToGroupBy(" + dimensionToGroupByVariable + ");"); - - first = false; - dimensionToGroupByCounter++; + } + + // Dimensions to Group By separated by two line breaks + ArrayList dimensionsToGroupBy = queryDefinition.getDimensionsToGroupBy(); + if (dimensionsToGroupBy != null) { + int dimensionToGroupByCounter = 0; + boolean first = true; + for (FunctionDTO dimensionToGroupBy : dimensionsToGroupBy) { + if (!first) { + builder.appendLineBreak().appendLineBreak(); + } + + String dimensionToGroupByVariable = "dimensionToGroupBy" + dimensionToGroupByCounter; + builder.appendText(functionToCode(dimensionToGroupByVariable, dimensionToGroupBy, typeStrategy)) + .appendLineBreak(); + builder.appendText( + queryDefinitionVariable + ".appendDimensionToGroupBy(" + dimensionToGroupByVariable + ");"); + + first = false; + dimensionToGroupByCounter++; + } } return builder.toString(); @@ -203,9 +246,15 @@ public class QueryDefinitionParser { private String functionToCode(String functionVariable, FunctionDTO function, TypeToCodeStrategy typeStrategy) { String functionClassName = FunctionDTO.class.getSimpleName(); - return functionClassName + " " + functionVariable + " = new " + functionClassName + "(" + function.isDimension() + ", " + literal(function.getFunctionName()) + ", " + - typeStrategy.toCode(function.getSourceTypeName()) + ", " + typeStrategy.toCode(function.getReturnTypeName()) + ", " + - functionParametersToCode(function, typeStrategy) + ", \"\", 0);"; + String functionConstruction; + if (function != null) { + functionConstruction = "new " + functionClassName + "(" + function.isDimension() + ", " + literal(function.getFunctionName()) + ", " + + typeStrategy.toCode(function.getSourceTypeName()) + ", " + typeStrategy.toCode(function.getReturnTypeName()) + ", " + + functionParametersToCode(function, typeStrategy) + ", \"\", 0)"; + } else { + functionConstruction = NullComponentCode; + } + return functionClassName + " " + functionVariable + " = " + functionConstruction + ";"; } private String functionParametersToCode(FunctionDTO function, TypeToCodeStrategy typeStrategy) { @@ -214,7 +263,6 @@ public class QueryDefinitionParser { return "new " + ArrayList.class.getSimpleName() + "<" + String.class.getSimpleName() + ">()"; } - Arrays.asList("Test", "test"); StringBuilder builder = new StringBuilder(Arrays.class.getSimpleName() + ".asList("); boolean first = true; for (String parameterTypeName : parameterTypeNames) { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 3b27225bf42..17949fbbffe 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -37,6 +37,7 @@ public class QueryDefinitionViewer extends ComponentWithoutSettings implements Q private final HTML codeHtml; private final RadioButton useClassGetNameRadioButton; private final RadioButton useStringLiteralsRadioButton; + private final Button copyToClipboardButton; private StatisticQueryDefinitionDTO currentDefinition; private boolean active; @@ -74,7 +75,7 @@ public class QueryDefinitionViewer extends ComponentWithoutSettings implements Q codeScrollPanel.getElement().addClassName("queryDefinitionViewerContent"); codeDockPanel.add(codeScrollPanel); - Button copyToClipboardButton = new Button(stringMessages.copyToClipboard(), new ClickHandler() { + copyToClipboardButton = new Button(stringMessages.copyToClipboard(), new ClickHandler() { @Override public void onClick(ClickEvent event) { switch (contentPanel.getSelectedIndex()) { @@ -89,6 +90,7 @@ public class QueryDefinitionViewer extends ComponentWithoutSettings implements Q } } }); + copyToClipboardButton.setEnabled(false); HorizontalPanel controlsPanel = new HorizontalPanel(); controlsPanel.setSpacing(5); @@ -109,6 +111,7 @@ public class QueryDefinitionViewer extends ComponentWithoutSettings implements Q @Override public void queryDefinitionChanged(StatisticQueryDefinitionDTO newQueryDefinition) { currentDefinition = newQueryDefinition; + copyToClipboardButton.setEnabled(currentDefinition != null); if (active) { updateDetails(); updateCode(); @@ -138,11 +141,11 @@ public class QueryDefinitionViewer extends ComponentWithoutSettings implements Q } public void setActive(boolean active) { - if (active && this.active != active) { - updateDetails(); - updateCode(); - } + boolean needsUpdate = !this.active && active; this.active = active; + if (needsUpdate) { + queryDefinitionChanged(currentDefinition); + } } @Override From 9299e90ab4bd38a3645816be8568fa45e5bdbf29 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 24 Aug 2018 16:58:59 +0200 Subject: [PATCH 185/197] Added documentation for persisting a ModifiableStatisticQueryDefinitionDTO --- .../dto/StatisticQueryDefinitionDTO.java | 22 +++++- .../AggregationProcessorDefinitionDTO.java | 18 +++++ .../dto/DataRetrieverChainDefinitionDTO.java | 14 ++++ .../impl/dto/DataRetrieverLevelDTO.java | 22 ++++++ .../shared/impl/dto/FunctionDTO.java | 36 +++++++++- ...ModifiableStatisticQueryDefinitionDTO.java | 70 +++++++++++++------ .../impl/data/LocalizedCluster.java | 5 ++ 7 files changed, 164 insertions(+), 23 deletions(-) diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/dto/StatisticQueryDefinitionDTO.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/dto/StatisticQueryDefinitionDTO.java index 95c529f6204..d711e2b50f3 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/dto/StatisticQueryDefinitionDTO.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/dto/StatisticQueryDefinitionDTO.java @@ -7,19 +7,37 @@ import java.util.HashSet; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO; +import com.sap.sse.datamining.shared.impl.dto.ClusterDTO; 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; public interface StatisticQueryDefinitionDTO extends Serializable { - public String getLocaleInfoName(); - public DataRetrieverChainDefinitionDTO getDataRetrieverChainDefinition(); + /** + * @return The settings to be used for the retriever levels. Can be empty, if no retriever level has settings. + */ public HashMap getRetrieverSettings(); + /** + * The values used to filter the data elements during the retrieval process. Each set of values is mapped by the + * dimension used to extract the value from a data element and the retriever level the dimension belongs to. The + * dimensions are declared by the data type retrieved by the corresponding retriever level and not by the data type + * the query is based on (return type of the retriever chain). + * + * The actual filter values can be anything that is returned by a dimension, which will be mostly simple data like + * Strings or Enums, but can also be more complex data structures like {@link ClusterDTO}. + * + * @return The values used to filter the data elements during the retrieval process. + */ public HashMap>> getFilterSelection(); public ArrayList getDimensionsToGroupBy(); public FunctionDTO getStatisticToCalculate(); public AggregationProcessorDefinitionDTO getAggregatorDefinition(); + + /** + * @return The LocalInfo name that will be used for internationalization. + */ + public String getLocaleInfoName(); } diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/AggregationProcessorDefinitionDTO.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/AggregationProcessorDefinitionDTO.java index 7e75da98312..88c1092f58d 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/AggregationProcessorDefinitionDTO.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/AggregationProcessorDefinitionDTO.java @@ -2,13 +2,31 @@ package com.sap.sse.datamining.shared.impl.dto; import java.io.Serializable; +/** + * A data mining aggregator definition that can be shared between client and server. Instances are usually constructed + * by a DataMiningDTOFactory based on a given backend AggregationProcessorDefinition. The corresponding backend instance + * can be determined using the DataMiningServer. + */ public class AggregationProcessorDefinitionDTO implements Serializable, Comparable { private static final long serialVersionUID = -434497637456305118L; + /** + * Additional identification feature, since the extracted and aggregated type wouldn't suffice. + * Has to be included when persisting a AggregationProcessorDefinitionDTO. + */ private String messageKey; + /** + * The fully qualified name of the aggregators input type. + */ private String extractedTypeName; + /** + * The fully qualified name of the aggregators result type. + */ private String aggregatedTypeName; + /** + * A human readable string representation. Should be omitted when persisting a AggregationProcessorDefinitionDTO. + */ private String displayName; /** diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverChainDefinitionDTO.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverChainDefinitionDTO.java index 898c2cd3c9e..b136faf93dc 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverChainDefinitionDTO.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverChainDefinitionDTO.java @@ -6,12 +6,26 @@ import java.util.HashMap; import com.sap.sse.common.settings.SerializableSettings; +/** + * A data mining retriever chain definition that can be shared between client and server. Instances are usually + * constructed by a DataMiningDTOFactory based on a given backend DataRetrieverChainDefinition. The corresponding + * backend instance can be determined using the DataMiningServer. + */ public class DataRetrieverChainDefinitionDTO implements Serializable, Comparable { private static final long serialVersionUID = 7806173601799997214L; + /** + * The fully qualified name of the initial data source type. + */ private String dataSourceTypeName; + /** + * The ordered list of retriever levels. + */ private ArrayList retrieverLevels; + /** + * A human readable string representation. Should be omitted when persisting a DataRetrieverChainDefinition. + */ private String displayName; /** diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverLevelDTO.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverLevelDTO.java index 3d991d89b58..99b6d832942 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverLevelDTO.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/DataRetrieverLevelDTO.java @@ -4,12 +4,34 @@ import java.io.Serializable; import com.sap.sse.common.settings.SerializableSettings; +/** + * A data mining retriever level that can be shared between client and server. Instances are usually constructed by a + * DataMiningDTOFactory based on a given backend DataRetrieverLevel. + */ public class DataRetrieverLevelDTO implements Serializable, Comparable { private static final long serialVersionUID = 6911713148350359643L; + /** + * The index of this retriever level in the retriever chain. + */ private int retrieverLevel; + /** + * The fully qualified name of the Processor performing the retrieval of this level. + */ private String retrieverTypeName; + /** + * The type of the retrieved data elements in form of a {@link LocalizedTypeDTO}. Its type name is the fully + * qualified name of the retrieved data type and is used for identification purposes. + * + * The display name is used as human readable string representation of this retriever level and should be omitted + * when persisting a DataRetrieverLevelDTO. + */ private LocalizedTypeDTO retrievedDataType; + + /** + * The default settings for this retriever level or null, if the level doesn't have settings. Should be + * omitted when persisting a DataRetrieverLevelDTO. + */ private SerializableSettings defaultSettings; /** diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/FunctionDTO.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/FunctionDTO.java index 37961d14308..2999c19ea33 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/FunctionDTO.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/FunctionDTO.java @@ -4,15 +4,41 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +/** + * A data mining extraction function (Dimension or Statistic) that can be shared between client and server. + * Instances are usually constructed by a DataMiningDTOFactory based on a given backend Function. The + * corresponding backend instance can be determined using the DataMiningServer. + */ public class FunctionDTO implements Serializable, Comparable { private static final long serialVersionUID = 4587389541910498505L; private final boolean isDimension; + /** + * The functions name including its parameters in parenthesis or empty parenthesis, if this function doesn't have + * parameters. Can consist of multiple concatenated function names, if the backend Function encapsulated multiple + * data mining functions. + */ private final String functionName; + /** + * The fully qualified name of the type that declares this function. + */ private final String sourceTypeName; + /** + * The fully qualified name of the type returned by this function. + */ private final String returnTypeName; + /** + * The fully qualified names of the functions parameter types. + */ private final List parameterTypeNames; + + /** + * Meta-data for the natural ordering of FunctionDTOs. Should be omitted when persisting a FunctionDTO. + */ private final int ordinal; + /** + * A human readable string representation. Should be omitted when persisting a FunctionDTO. + */ private String displayName; /** * If the {@link #displayName} is not set and this provider is valid, the {@F @@ -56,7 +82,15 @@ public class FunctionDTO implements Serializable, Comparable { public List getParameterTypeNames() { return parameterTypeNames; } - + + /** + * The functions name including its parameters in parenthesis or empty parenthesis, if this function doesn't have + * parameters. Can consist of multiple concatenated function names, if the backend Function encapsulated multiple + * data mining functions. + * + * @return The functions name including its parameters in parenthesis or empty parenthesis, if this function doesn't + * have parameters. + */ public String getFunctionName() { return functionName; } diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/ModifiableStatisticQueryDefinitionDTO.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/ModifiableStatisticQueryDefinitionDTO.java index 04d800fbf5e..6b153d44180 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/ModifiableStatisticQueryDefinitionDTO.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/ModifiableStatisticQueryDefinitionDTO.java @@ -8,16 +8,50 @@ import java.util.HashSet; import com.sap.sse.common.settings.SerializableSettings; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; +/** + * Definition for a data mining query that can be shared between client and server. Instances are usually created in the + * Data Mining UI, but can also by constructed from a backend instance (StatisticQueryDefinition) using a + * DataMiningDTOFactory. The corresponding backend instance for a DTO can be created using the DataMiningServer. + */ public class ModifiableStatisticQueryDefinitionDTO implements StatisticQueryDefinitionDTO { private static final long serialVersionUID = -6438771277564908352L; - private String localeInfoName; + /** + * The extraction function used to get the statistic from the retrieved data elements. + */ private FunctionDTO statisticToCalculate; + /** + * The aggregator used to aggregate the extracted statistics. + */ private AggregationProcessorDefinitionDTO aggregatorDefinition; + /** + * The list of dimensions to group the results by. + */ private ArrayList dimensionsToGroupBy; + /** + * The retriever chain used to retrieve the data elements. + */ private DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition; + /** + * The settings to be used for the retriever levels. Can be empty, if no retriever level has settings. + */ private HashMap retrieverSettings; + /** + * The values used to filter the data elements during the retrieval process. Each set of values is mapped by the + * dimension used to extract the value from a data element and the retriever level the dimension belongs to. The + * dimensions are declared by the data type retrieved by the corresponding retriever level and not by the data type + * the query is based on (return type of the retriever chain). + * + * The actual filter values can be anything that is returned by a dimension, which will be mostly simple data like + * Strings or Enums, but can also be more complex data structures like {@link ClusterDTO}. + */ private HashMap>> filterSelection; + + /** + * The LocalInfo name that will be used for internationalization. Should be omitted when persisting a + * ModifiableStatisticQueryDefinitionDTO. + */ + private String localeInfoName; /** * Constructor for the GWT-Serialization. Don't use this! @@ -25,7 +59,9 @@ public class ModifiableStatisticQueryDefinitionDTO implements StatisticQueryDefi @Deprecated ModifiableStatisticQueryDefinitionDTO() { } - public ModifiableStatisticQueryDefinitionDTO(String localeInfoName, FunctionDTO statisticToCalculate, AggregationProcessorDefinitionDTO aggregatorDefinition, DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition) { + public ModifiableStatisticQueryDefinitionDTO(String localeInfoName, FunctionDTO statisticToCalculate, + AggregationProcessorDefinitionDTO aggregatorDefinition, + DataRetrieverChainDefinitionDTO dataRetrieverChainDefinition) { this.localeInfoName = localeInfoName; this.statisticToCalculate = statisticToCalculate; this.aggregatorDefinition = aggregatorDefinition; @@ -48,18 +84,6 @@ public class ModifiableStatisticQueryDefinitionDTO implements StatisticQueryDefi filterSelection.put(retrieverLevel, new HashMap<>(filterSelectionToCopy.get(retrieverLevel))); } } - - @Override - public String getLocaleInfoName() { - return localeInfoName; - } - - public void setLocaleInfoName(String localeInfoName) { - if (localeInfoName == null) { - throw new NullPointerException("The locale info name mustn't be null"); - } - this.localeInfoName = localeInfoName; - } @Override public DataRetrieverChainDefinitionDTO getDataRetrieverChainDefinition() { @@ -137,6 +161,18 @@ public class ModifiableStatisticQueryDefinitionDTO implements StatisticQueryDefi this.aggregatorDefinition = aggregatorDefinition; } + @Override + public String getLocaleInfoName() { + return localeInfoName; + } + + public void setLocaleInfoName(String localeInfoName) { + if (localeInfoName == null) { + throw new NullPointerException("The locale info name mustn't be null"); + } + this.localeInfoName = localeInfoName; + } + @Override public int hashCode() { final int prime = 31; @@ -146,7 +182,6 @@ public class ModifiableStatisticQueryDefinitionDTO implements StatisticQueryDefi + ((dataRetrieverChainDefinition == null) ? 0 : dataRetrieverChainDefinition.hashCode()); result = prime * result + ((dimensionsToGroupBy == null) ? 0 : dimensionsToGroupBy.hashCode()); result = prime * result + ((filterSelection == null) ? 0 : filterSelection.hashCode()); - result = prime * result + ((localeInfoName == null) ? 0 : localeInfoName.hashCode()); result = prime * result + ((retrieverSettings == null) ? 0 : retrieverSettings.hashCode()); result = prime * result + ((statisticToCalculate == null) ? 0 : statisticToCalculate.hashCode()); return result; @@ -181,11 +216,6 @@ public class ModifiableStatisticQueryDefinitionDTO implements StatisticQueryDefi return false; } else if (!filterSelection.equals(other.filterSelection)) return false; - if (localeInfoName == null) { - if (other.localeInfoName != null) - return false; - } else if (!localeInfoName.equals(other.localeInfoName)) - return false; if (retrieverSettings == null) { if (other.retrieverSettings != null) return false; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/LocalizedCluster.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/LocalizedCluster.java index eb44417aecf..575843c20cd 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/LocalizedCluster.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/data/LocalizedCluster.java @@ -35,5 +35,10 @@ public class LocalizedCluster implements Clust public Cluster getInnerCluster() { return cluster; } + + @Override + public String toString() { + return messageKey + ": " + cluster.toString(); + } } From dec399a6525662efeff7e60f41b32c47cd8ef6d9 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 24 Aug 2018 19:10:29 +0200 Subject: [PATCH 186/197] bug4615: Clearing the result charts before another result is displayed --- ...erSpeedDetailsChartConfigurationPanel.java | 6 +- .../ManeuverSpeedDetailsResultsPresenter.java | 92 ++++++++----------- .../NumberPairResultsPresenter.java | 3 + .../PolarBackendResultsPresenter.java | 4 + .../ui/polarmining/PolarResultsPresenter.java | 31 ++++--- 5 files changed, 63 insertions(+), 73 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsChartConfigurationPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsChartConfigurationPanel.java index 23bed60acaf..26f651517ad 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsChartConfigurationPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsChartConfigurationPanel.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.ui.datamining.presentation; import com.google.gwt.dom.client.Style.Unit; -import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.DoubleBox; @@ -25,7 +25,7 @@ public class ManeuverSpeedDetailsChartConfigurationPanel extends HorizontalPanel private static final String NUMBER_BOX_WIDTH = "40px"; - public ManeuverSpeedDetailsChartConfigurationPanel(ClickHandler applyButtonClickHandler, + public ManeuverSpeedDetailsChartConfigurationPanel(Runnable applyConfigurationCallback, StringMessages stringMessages) { setHorizontalAlignment(ALIGN_LEFT); setVerticalAlignment(ALIGN_MIDDLE); @@ -48,7 +48,7 @@ public class ManeuverSpeedDetailsChartConfigurationPanel extends HorizontalPanel add(new Label(stringMessages.zeroTo360AxisLabeling() + ":")); add(zeroTo360AxisLabelingCheckBox); - Button applyButton = new Button(stringMessages.apply(), applyButtonClickHandler); + Button applyButton = new Button(stringMessages.apply(), (ClickEvent e) -> applyConfigurationCallback.run()); add(applyButton); } 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 5d0cd95c08c..c212751f58a 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 @@ -40,11 +40,11 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults private final DockLayoutPanel dockLayoutPanel; - private Chart polarChart; + private final Chart polarChart; private final SimpleLayoutPanel polarChartWrapperPanel; - private Chart lineChart; - private Chart dataCountHistogramChart; + private final Chart lineChart; + private final Chart dataCountHistogramChart; private final DockLayoutPanel rightSideChartsWrapperPanel; private final ManeuverSpeedDetailsChartConfigurationPanel chartConfigPanel; @@ -52,39 +52,25 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults private Integer minDataCount; private Double minValue; - private Double maxValue; - - private boolean zeroTo360AxisLabeling = false; + + private int xAxisMin; + private int xAxisMax; private QueryResultDTO result; public ManeuverSpeedDetailsResultsPresenter(Component parent, ComponentContext context, StringMessages stringMessages) { super(parent, context, stringMessages); + xAxisMin = -179; + xAxisMax = 180; - chartConfigPanel = new ManeuverSpeedDetailsChartConfigurationPanel(new ClickHandler() { - - @Override - public void onClick(ClickEvent event) { - minDataCount = chartConfigPanel.getMinDataCount(); - minValue = chartConfigPanel.getMinValue(); - maxValue = chartConfigPanel.getMaxValue(); - zeroTo360AxisLabeling = chartConfigPanel.isZeroTo360AxisLabeling(); - if (result != null) { - redrawAllCharts(); - } - } - - }, stringMessages); - + chartConfigPanel = new ManeuverSpeedDetailsChartConfigurationPanel(this::applyConfiguration, stringMessages); addControl(chartConfigPanel); ChartToCsvExporter chartToCsvExporter = new ChartToCsvExporter(stringMessages.csvCopiedToClipboard()); - Button exportStatisticsCurveToCsvButton = new Button(stringMessages.exportStatisticsCurveToCsv(), new ClickHandler() { - @Override public void onClick(ClickEvent event) { chartToCsvExporter.exportChartAsCsvToClipboard(lineChart); @@ -92,6 +78,8 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults }); addControl(exportStatisticsCurveToCsvButton); + polarChart = ChartFactory.createPolarChart(); + polarChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax); polarChartWrapperPanel = new SimpleLayoutPanel() { @Override public void onResize() { @@ -99,11 +87,13 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults polarChart.redraw(); } }; + polarChartWrapperPanel.add(polarChart); + lineChart = ChartFactory.createLineChartForPolarData(stringMessages); + lineChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax); dataCountHistogramChart = ChartFactory.createDataCountHistogramChart( stringMessages.TWA() + " (" + stringMessages.degreesShort() + ")", stringMessages); - dataCountHistogramChart.getXAxis().setMin(-179); - dataCountHistogramChart.getXAxis().setMax(180); + dataCountHistogramChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax); rightSideChartsWrapperPanel = new DockLayoutPanel(Unit.PCT) { @Override public void onResize() { @@ -113,40 +103,27 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults dataCountHistogramChart.redraw(); } }; + rightSideChartsWrapperPanel.addNorth(lineChart, 50); + rightSideChartsWrapperPanel.addSouth(dataCountHistogramChart, 50); + dockLayoutPanel = new DockLayoutPanel(Unit.PCT); dockLayoutPanel.addWest(polarChartWrapperPanel, 40); dockLayoutPanel.addEast(rightSideChartsWrapperPanel, 60); - - redrawAllCharts(); - } - - private void redrawAllCharts() { - if (polarChart != null) { - polarChartWrapperPanel.remove(polarChart); - } - if (lineChart != null) { - rightSideChartsWrapperPanel.remove(lineChart); - } - if (dataCountHistogramChart != null) { - rightSideChartsWrapperPanel.remove(dataCountHistogramChart); - } - - int xAxisMin = zeroTo360AxisLabeling ? 0 : -179; - int xAxisMax = zeroTo360AxisLabeling ? 359 : 180; - - polarChart = ChartFactory.createPolarChart(); - lineChart = ChartFactory.createLineChartForPolarData(stringMessages); - dataCountHistogramChart = ChartFactory.createDataCountHistogramChart( - stringMessages.TWA() + " (" + stringMessages.degreesShort() + ")", stringMessages); + + private void applyConfiguration() { + minDataCount = chartConfigPanel.getMinDataCount(); + minValue = chartConfigPanel.getMinValue(); + maxValue = chartConfigPanel.getMaxValue(); + + boolean zeroTo360AxisLabeling = chartConfigPanel.isZeroTo360AxisLabeling(); + xAxisMin = zeroTo360AxisLabeling ? 0 : -179; + xAxisMax = zeroTo360AxisLabeling ? 359 : 180; + polarChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax); lineChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax); dataCountHistogramChart.getXAxis().setMin(xAxisMin).setMax(xAxisMax); - - polarChartWrapperPanel.add(polarChart); - rightSideChartsWrapperPanel.addNorth(lineChart, 50); - rightSideChartsWrapperPanel.addSouth(dataCountHistogramChart, 50); - + if (result != null) { internalShowResults(result); } @@ -159,6 +136,10 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults @Override protected void internalShowResults(QueryResultDTO result) { + polarChart.removeAllSeries(false); + lineChart.removeAllSeries(false); + dataCountHistogramChart.removeAllSeries(false); + this.result = result; Map results = result.getResults(); List sortedNaturally = new ArrayList(results.keySet()); @@ -176,8 +157,6 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults Series polarSeries = polarChart.createSeries(); Series histogramSeries = dataCountHistogramChart.createSeries(); Series valueSeries = lineChart.createSeries(); - int xAxisMin = zeroTo360AxisLabeling ? 0 : -179; - int xAxisMax = zeroTo360AxisLabeling ? 359 : 180; for (int convertedTWA = xAxisMin; convertedTWA <= xAxisMax; convertedTWA++) { int i = convertedTWA < 0 ? convertedTWA + 360 : convertedTWA; double value = valuePerTWA[i]; @@ -199,8 +178,11 @@ public class ManeuverSpeedDetailsResultsPresenter extends AbstractSailingResults histogramSeries.setVisible(false, false); valueSeries.setVisible(false, false); lineChart.addSeries(valueSeries, false, false); - dataCountHistogramChart.addSeries(histogramSeries); + dataCountHistogramChart.addSeries(histogramSeries, false, false); } + polarChart.redraw(); + lineChart.redraw(); + dataCountHistogramChart.redraw(); // Initially resize the chart. Otherwise it's too big. FIXME with a better solution Timer timer = new Timer() { 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 ccfe0118e7e..15eddf409ff 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 @@ -84,6 +84,9 @@ public class NumberPairResultsPresenter extends AbstractSailingResultsPresenter< @Override protected void internalShowResults(QueryResultDTO res) { + chart.removeAllSeries(false); + seriesMappedByGroupKey.clear(); + result = res; createAndAddSeriesToChart(); for (Entry resultEntry : result.getResults().entrySet()) { 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 95701d0ab0f..8a455d566ba 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 @@ -108,6 +108,10 @@ public class PolarBackendResultsPresenter extends AbstractSailingResultsPresente @Override protected void internalShowResults(QueryResultDTO result) { + polarChart.removeAllSeries(false); + speedChart.removeAllSeries(false); + angleChart.removeAllSeries(false); + final Set seriesToHideAfterRendering = new HashSet<>(); Map results = result.getResults(); List sortedNaturally = new ArrayList(results.keySet()); 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 648c27acd2a..a251b88d384 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 @@ -113,7 +113,6 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter result) { + polarChart.removeAllSeries(false); + dataCountHistogramChart.removeAllSeries(false); + dataCountPerAngleHistogramChart.removeAllSeries(false); + histogramSeriesForPolarSeries.clear(); + perAngleHistogramSeriesForAngle.clear(); + Map results = result.getResults(); List sortedNaturally = new ArrayList(results.keySet()); Collections.sort(sortedNaturally, new Comparator() { From e6a1abd77e76d3fd7a07683458e8640bf2230b1e Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Fri, 24 Aug 2018 20:48:18 +0200 Subject: [PATCH 187/197] Fixed freezing of the UI when displaying a calculated polar diagram due to massive amounts of highcharts error 15 --- .../ui/polarmining/PolarResultsPresenter.java | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) 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 a251b88d384..73d124c7332 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 @@ -6,7 +6,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.moxieapps.gwt.highcharts.client.Chart; import org.moxieapps.gwt.highcharts.client.Point; @@ -140,7 +139,9 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter> histogramData = aggregation.getCountHistogramPerAngle(); Map seriesPerAngle = new HashMap<>(); perAngleHistogramSeriesForAngle.put(polarSeries, seriesPerAngle); - for (int i = 0; i < 360; i++) { - int convertedAngle = i > 180 ? i - 360 : i; - double speed = speedsPerAngle[i]; + // Ensure that the points are added in ascending x coordinates to prevent Highcharts error 15 + for (int convertedAngle = -179; convertedAngle <= 180; convertedAngle++) { + int index = convertedAngle < 0 ? convertedAngle + 360 : convertedAngle; + double speed = speedsPerAngle[index]; Point point = null; - if (countPerAngle[i] >= settings.getMinimumDataCountPerAngle() && speed != 0) { + if (countPerAngle[index] >= settings.getMinimumDataCountPerAngle() && speed != 0) { point = new Point(convertedAngle, speed); polarSeries.addPoint(point, false, false, false); } else { polarSeries.addPoint(convertedAngle, 0, false, false, false); } - histogramSeries.addPoint(convertedAngle, countPerAngle[i], false, false, false); - Series dataCountPerAngleSeries = dataCountPerAngleHistogramChart.createSeries(); - Map histogramDataForAngle = histogramData.get(i); - for (Entry entry : histogramDataForAngle.entrySet()) { - dataCountPerAngleSeries.addPoint(entry.getKey(), entry.getValue()); - } - dataCountPerAngleHistogramChart.addSeries(dataCountPerAngleSeries, false, false); - dataCountPerAngleSeries.setVisible(false, false); + histogramSeries.addPoint(convertedAngle, countPerAngle[index], false, false, false); + if (point != null) { + Map histogramDataForAngle = histogramData.get(index); + Series dataCountPerAngleSeries = dataCountPerAngleHistogramChart.createSeries(); + // Iterating over the histogram data without sorting the x coordinates ascending leads + // to a massive occurrence of Highcharts error 15, freezing the complete UI + List sortedAngles = new ArrayList<>(histogramDataForAngle.keySet()); + Collections.sort(sortedAngles); + for (Double angle : sortedAngles) { + dataCountPerAngleSeries.addPoint(angle, histogramDataForAngle.get(angle)); + } + dataCountPerAngleHistogramChart.addSeries(dataCountPerAngleSeries, false, false); + dataCountPerAngleSeries.setVisible(false, false); seriesPerAngle.put((long) convertedAngle, dataCountPerAngleSeries); } } polarSeries.setName(key.asString()); histogramSeries.setName(key.asString()); - polarChart.addSeries(polarSeries, false, false); histogramSeries.setVisible(false, false); histogramSeriesForPolarSeries.put(polarSeries, histogramSeries); + polarChart.addSeries(polarSeries, false, false); dataCountHistogramChart.addSeries(histogramSeries); for (Series seriesToHide : seriesPerAngle.values()) { seriesToHide.setVisible(false, false); From 10904b857127a26c0704a1d6dbe3fc16df197ba2 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Sat, 25 Aug 2018 11:25:54 +0200 Subject: [PATCH 188/197] Fixed Highcharts Error 15 for PolarBackendResultsPresenter --- .../gwt/ui/polarmining/PolarBackendResultsPresenter.java | 5 +++-- .../sailing/gwt/ui/polarmining/PolarResultsPresenter.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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 8a455d566ba..5a0b7f5dc83 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 @@ -171,8 +171,9 @@ public class PolarBackendResultsPresenter extends AbstractSailingResultsPresente Series polarSeries = polarChart.createSeries(); polarSeries.setName(key.asString() + "-" + i + "kn"); double[][] data = aggregation.getPolarDataPerWindspeedAndAngle(); - for (int j = 0; j < 360; j++) { - int convertedAngle = j > 180 ? j - 360 : j; + // Ensure that the points are added with ascending x coordinates to prevent Highcharts error 15 + for (int convertedAngle = -179; convertedAngle <= 180; convertedAngle++) { + int j = convertedAngle < 0 ? convertedAngle + 360 : convertedAngle; polarSeries.addPoint(convertedAngle, hasDataForAngle[j] ? data[j][i] : 0, false, false, false); } if (i != 11) { 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 73d124c7332..cca89125646 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 @@ -222,7 +222,7 @@ public class PolarResultsPresenter extends AbstractSailingResultsPresenter> histogramData = aggregation.getCountHistogramPerAngle(); Map seriesPerAngle = new HashMap<>(); perAngleHistogramSeriesForAngle.put(polarSeries, seriesPerAngle); - // Ensure that the points are added in ascending x coordinates to prevent Highcharts error 15 + // Ensure that the points are added with ascending x coordinates to prevent Highcharts error 15 for (int convertedAngle = -179; convertedAngle <= 180; convertedAngle++) { int index = convertedAngle < 0 ? convertedAngle + 360 : convertedAngle; double speed = speedsPerAngle[index]; From 93cf545b7e1e0fbd68c1b0a4e4783d4d06af2762 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Sat, 25 Aug 2018 13:11:52 +0200 Subject: [PATCH 189/197] bug4615: Switched from single instances for special result presenters to presenter factories --- .../TabbedSailingResultsPresenter.java | 17 +-- .../ui/test/client/TestSSEDataMiningUi.java | 41 ++++--- .../presentation/TabbedResultsPresenter.java | 101 +++++++++++------- 3 files changed, 101 insertions(+), 58 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 88b9400075d..05531717f27 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 @@ -19,16 +19,17 @@ public class TabbedSailingResultsPresenter extends TabbedResultsPresenter { DrillDownCallback drillDownCallback, StringMessages stringMessages) { super(parent, context, drillDownCallback); - registerResultsPresenter(PolarAggregation.class, - new PolarResultsPresenter(TabbedSailingResultsPresenter.this, getComponentContext(), stringMessages)); + registerResultsPresenter(PolarAggregation.class, new ResultsPresenterFactory<>(PolarResultsPresenter.class, + () -> new PolarResultsPresenter(this, getComponentContext(), stringMessages))); - registerResultsPresenter(PolarBackendData.class, new PolarBackendResultsPresenter( - TabbedSailingResultsPresenter.this, getComponentContext(), stringMessages)); + registerResultsPresenter(PolarBackendData.class, new ResultsPresenterFactory<>(PolarBackendResultsPresenter.class, + () -> new PolarBackendResultsPresenter(this, getComponentContext(), stringMessages))); - registerResultsPresenter(ManeuverSpeedDetailsAggregation.class, new ManeuverSpeedDetailsResultsPresenter( - TabbedSailingResultsPresenter.this, getComponentContext(), stringMessages)); + registerResultsPresenter(ManeuverSpeedDetailsAggregation.class, + new ResultsPresenterFactory<>(ManeuverSpeedDetailsResultsPresenter.class, + () -> new ManeuverSpeedDetailsResultsPresenter(this, getComponentContext(), stringMessages))); - registerResultsPresenter(PairWithStats.class, new NumberPairResultsPresenter(TabbedSailingResultsPresenter.this, - getComponentContext(), stringMessages)); + registerResultsPresenter(PairWithStats.class, new ResultsPresenterFactory<>(NumberPairResultsPresenter.class, + () -> new NumberPairResultsPresenter(this, getComponentContext(), stringMessages))); } } diff --git a/java/com.sap.sse.datamining.ui.test/test/com/sap/sse/datamining/ui/test/client/TestSSEDataMiningUi.java b/java/com.sap.sse.datamining.ui.test/test/com/sap/sse/datamining/ui/test/client/TestSSEDataMiningUi.java index 4d7636244b6..aee18c998e5 100644 --- a/java/com.sap.sse.datamining.ui.test/test/com/sap/sse/datamining/ui/test/client/TestSSEDataMiningUi.java +++ b/java/com.sap.sse.datamining.ui.test/test/com/sap/sse/datamining/ui/test/client/TestSSEDataMiningUi.java @@ -4,10 +4,13 @@ import java.util.ArrayList; import java.util.List; import com.google.gwt.junit.client.GWTTestCase; +import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO; +import com.sap.sse.datamining.ui.client.ResultsPresenter; import com.sap.sse.datamining.ui.client.presentation.MultiResultsPresenter; import com.sap.sse.datamining.ui.client.presentation.PlainResultsPresenter; import com.sap.sse.datamining.ui.client.presentation.ResultsChart; import com.sap.sse.datamining.ui.client.presentation.TabbedResultsPresenter; +import com.sap.sse.datamining.ui.client.presentation.TabbedResultsPresenter.ResultsPresenterFactory; import com.sap.sse.datamining.ui.test.client.presentation.DummyQueryResultDTO; import com.sap.sse.datamining.ui.test.client.presentation.DummyResultsPresenter; @@ -31,10 +34,13 @@ public class TestSSEDataMiningUi extends GWTTestCase { public void testAvoidDuplicateResultTypeRegistration() { TabbedResultsPresenter presenter = new TabbedResultsPresenter(null, null, null); - presenter.registerResultsPresenter(String.class, new PlainResultsPresenter(null, null)); - presenter.registerResultsPresenter(Double.class, new MultiResultsPresenter(null, null, null)); + presenter.registerResultsPresenter(String.class, new ResultsPresenterFactory<>(PlainResultsPresenter.class, + () -> new PlainResultsPresenter(null, null))); + presenter.registerResultsPresenter(Double.class, new ResultsPresenterFactory<>(MultiResultsPresenter.class, + () -> new MultiResultsPresenter(null, null, null))); try { - presenter.registerResultsPresenter(String.class, new ResultsChart(null, null, true, null)); + presenter.registerResultsPresenter(String.class, + new ResultsPresenterFactory<>(ResultsChart.class, () -> new ResultsChart(null, null, true, null))); fail(); } catch (IllegalStateException e) { assertTrue(true); @@ -48,23 +54,34 @@ public class TestSSEDataMiningUi extends GWTTestCase { TabbedResultsPresenter presenter = new TabbedResultsPresenter(null, null, null); List executedPresenter = new ArrayList<>(); - DummyResultsPresenter stringResultsPresenter = new DummyResultsPresenter(executedPresenter); - DummyResultsPresenter doubleResultsPresenter = new DummyResultsPresenter(executedPresenter); - - presenter.registerResultsPresenter(String.class, stringResultsPresenter); - presenter.registerResultsPresenter(Double.class, doubleResultsPresenter); + presenter.registerResultsPresenter(String.class, new ResultsPresenterFactory<>( + StringDummyResultsPresenter.class, () -> new StringDummyResultsPresenter(executedPresenter))); + presenter.registerResultsPresenter(Double.class, new ResultsPresenterFactory<>( + DoubleDummyResultsPresenter.class, () -> new DoubleDummyResultsPresenter(executedPresenter))); presenter.showResult(null, new DummyQueryResultDTO<>(String.class)); assertTrue(executedPresenter.size() == 1); - assertEquals(executedPresenter.get(0), stringResultsPresenter); + assertTrue(executedPresenter.get(0) instanceof StringDummyResultsPresenter); presenter.showResult(null, new DummyQueryResultDTO<>(Double.class)); assertTrue(executedPresenter.size() == 2); - assertEquals(executedPresenter.get(1), doubleResultsPresenter); + assertTrue(executedPresenter.get(1) instanceof DoubleDummyResultsPresenter); presenter.showResult(null, new DummyQueryResultDTO<>(Number.class)); assertTrue(executedPresenter.size() == 2); - assertEquals(executedPresenter.get(0), stringResultsPresenter); - assertEquals(executedPresenter.get(1), doubleResultsPresenter); + assertTrue(executedPresenter.get(0) instanceof StringDummyResultsPresenter); + assertTrue(executedPresenter.get(1) instanceof DoubleDummyResultsPresenter); + } + + private static class StringDummyResultsPresenter extends DummyResultsPresenter { + public StringDummyResultsPresenter(List executeResultsPresenter) { + super(executeResultsPresenter); + } + } + + private static class DoubleDummyResultsPresenter extends DummyResultsPresenter { + public DoubleDummyResultsPresenter(List executeResultsPresenter) { + super(executeResultsPresenter); + } } } diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java index a09c639531a..1dcb2eabef6 100755 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/TabbedResultsPresenter.java @@ -35,12 +35,13 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent tabsMappedById; - protected final DrillDownCallback drillDownCallback; - protected final Map> registeredResultPresenterMap; + private final ScrolledTabLayoutPanel tabPanel; + private final Map tabsMappedById; + private final DrillDownCallback drillDownCallback; + private final Map> registeredPresenterFactories; + private final ResultsPresenterFactory defaultFactory; private final Set listeners; - + public TabbedResultsPresenter(Component parent, ComponentContext context, DrillDownCallback drillDownCallback) { super(parent, context); idCounter = new AtomicInteger(); @@ -48,7 +49,9 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent(); this.drillDownCallback = drillDownCallback; - registeredResultPresenterMap = new HashMap<>(); + registeredPresenterFactories = new HashMap<>(); + defaultFactory = new ResultsPresenterFactory<>(MultiResultsPresenter.class, + () -> new MultiResultsPresenter(this, getComponentContext(), drillDownCallback)); listeners = new HashSet<>(); addNewTabTab(); @@ -108,27 +111,24 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent result) { - CloseablePresenterTab oldTab = getTab(presenterId); - if (oldTab == null) { + CloseablePresenterTab presenterTab = getTab(presenterId); + if (presenterTab == null) { return; } - try { - if (result != null) { - if (registeredResultPresenterMap.containsKey(result.getResultType())) { - presenterId = addTabAndFocus(registeredResultPresenterMap.get(result.getResultType())); - removeTab(oldTab); - } else { - if (!(oldTab.getPresenter() instanceof MultiResultsPresenter)) { - presenterId = addTabAndFocus(new MultiResultsPresenter(this, getComponentContext(), drillDownCallback)); - removeTab(oldTab); - } - } - getTab(presenterId).setText(result.getResultSignifier()); + if (result != null) { + ResultsPresenter presenter = presenterTab.getPresenter(); + ResultsPresenterFactory factory = registeredPresenterFactories.getOrDefault(result.getResultType(), defaultFactory); + if (presenter.getClass() != factory.getProducedType()) { + CloseablePresenterTab newPresenterTab = addTabAndFocus(factory.createPresenter()); + removeTab(presenterTab); + presenterTab = newPresenterTab; } - } finally { - getTab(presenterId).getPresenter().showResult(queryDefinition, result); + presenterTab.setText(result.getResultSignifier()); + } else { + presenterTab.setText(getDataMiningStringMessages().empty()); } + presenterTab.getPresenter().showResult(queryDefinition, result); } @Override @@ -175,24 +175,24 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent resultType, ResultsPresenter resultPresenter) + public void registerResultsPresenter(Class resultType, ResultsPresenterFactory presenterFactory) throws IllegalStateException { String className = resultType.getName(); - if (!registeredResultPresenterMap.containsKey(className)) { - registeredResultPresenterMap.put(className, resultPresenter); + if (!registeredPresenterFactories.containsKey(className)) { + registeredPresenterFactories.put(className, presenterFactory); } else { throw new IllegalStateException( "Multiple registration for result type key: " + resultType.toString() + "not allowed."); @@ -207,16 +207,16 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent tabPresenter) { + protected CloseablePresenterTab addTabAndFocus(ResultsPresenter presenter) { String tabId = IdPrefix + idCounter.getAndIncrement(); - CloseablePresenterTab tabHeader = new CloseablePresenterTab(tabId, tabPresenter); - tabsMappedById.put(tabId, tabHeader); + CloseablePresenterTab presenterTab = new CloseablePresenterTab(tabId, presenter); + tabsMappedById.put(tabId, presenterTab); - tabPanel.insert(tabPresenter.getEntryWidget(), tabHeader, tabPanel.getWidgetCount() - 1); - int presenterIndex = tabPanel.getWidgetIndex(tabPresenter.getEntryWidget()); + tabPanel.insert(presenter.getEntryWidget(), presenterTab, tabPanel.getWidgetCount() - 1); + int presenterIndex = tabPanel.getWidgetIndex(presenter.getEntryWidget()); tabPanel.selectTab(presenterIndex); tabPanel.scrollToTab(presenterIndex); - return tabId; + return presenterTab; } protected void removeTab(CloseablePresenterTab tab) { @@ -273,6 +273,31 @@ public class TabbedResultsPresenter extends AbstractDataMiningComponent> { + T create(); + } + + public static class ResultsPresenterFactory> { + + private final Class presenterType; + private final ResultsPresenterSupplier presenterSupplier; + + public ResultsPresenterFactory(Class presenterType, ResultsPresenterSupplier presenterSupplier) { + this.presenterType = presenterType; + this.presenterSupplier = presenterSupplier; + } + + public Class getProducedType() { + return presenterType; + } + + public T createPresenter() { + return presenterSupplier.create(); + } + + } private class CloseablePresenterTab extends FlowPanel { From a4a201bcbe9078ea0e2096ebb3d9212c1bdbe747 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Sat, 25 Aug 2018 13:37:24 +0200 Subject: [PATCH 190/197] Cleaned the result charts removing the unnecessary chart title --- .../presentation/NumberPairResultsPresenter.java | 4 +++- .../ui/client/presentation/ResultsChart.java | 10 ++-------- 2 files changed, 5 insertions(+), 9 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 15eddf409ff..d6863de9843 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 @@ -5,6 +5,7 @@ import java.util.Map; import java.util.Map.Entry; import org.moxieapps.gwt.highcharts.client.Chart; +import org.moxieapps.gwt.highcharts.client.ChartSubtitle; import org.moxieapps.gwt.highcharts.client.ChartTitle; import org.moxieapps.gwt.highcharts.client.Color; import org.moxieapps.gwt.highcharts.client.Credits; @@ -61,7 +62,8 @@ public class NumberPairResultsPresenter extends AbstractSailingResultsPresenter< .setBorderColor(new Color("#F0AB00")) .setPlotBorderWidth(0) .setCredits(new Credits().setEnabled(false)) - .setChartTitle(new ChartTitle().setText(getDataMiningStringMessages().dataMiningResult())); + .setChartTitle(new ChartTitle().setText("")) + .setChartSubtitle(new ChartSubtitle().setText("")); chart.setExporting(new Exporting().setEnabled(false)); chart.getXAxis().setAllowDecimals(false); chart.getYAxis().setAxisTitleText(""); diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 8504f67c67a..79200dbd5b3 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -260,7 +260,6 @@ public class ResultsChart extends AbstractNumericResultsPresenter { updateKeyComparatorListBox(); resetChartSeries(); updateChartLabels(); - updateChartSubtitle(); showResultData(); } @@ -297,11 +296,6 @@ public class ResultsChart extends AbstractNumericResultsPresenter { chart.setToolTip(new ToolTip().setValueDecimals(decimalsListBox.getValue())); } - private void updateChartSubtitle() { - chart.setChartSubtitle(new ChartSubtitle().setText(getDataMiningStringMessages().queryResultsChartSubtitle( - getCurrentResult().getRetrievedDataAmount(), getCurrentResult().getCalculationTimeInSeconds()))); - } - private void showResultData() { buildMainKeyMapAndSetXAxisCategories(); createAndAddSeriesToChart(); @@ -439,8 +433,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) - .setCredits(new Credits().setEnabled(false)) - .setChartTitle(new ChartTitle().setText(getDataMiningStringMessages().dataMiningResult())); + .setTitle(new ChartTitle().setText(""), new ChartSubtitle().setText("")) + .setCredits(new Credits().setEnabled(false)); chart.setExporting(new Exporting().setEnabled(false)); chart.getXAxis().setAllowDecimals(false); chart.getYAxis().setAxisTitleText("Result").setLabels(new YAxisLabels().setFormatter(new AxisLabelsFormatter() { From 4f6830bbb8565e9c7becdd00053dd5641c6f2f5d Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Sat, 25 Aug 2018 13:43:25 +0200 Subject: [PATCH 191/197] Hiding the AbstractResultsPresenters controls panel, if it's empty --- .../ui/client/presentation/AbstractResultsPresenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index 8dd4b565332..90a692ca2ee 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -83,7 +83,7 @@ public abstract class AbstractResultsPresenter public void showResult(StatisticQueryDefinitionDTO queryDefinition, QueryResultDTO result) { if (result != null && !result.isEmpty()) { if (state != ResultsPresenterState.RESULT) { - mainPanel.setWidgetHidden(controlsPanel, false); + mainPanel.setWidgetHidden(controlsPanel, controlsPanel.getWidgetCount() == 0); presentationPanel.setWidget(getPresentationWidget()); state = ResultsPresenterState.RESULT; } From 7a87556dab640ff9d93cafea0ab50da511f7d377 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Sat, 25 Aug 2018 17:54:02 +0200 Subject: [PATCH 192/197] null is now first in the AggregatorListBox --- .../selection/statistic/AggregatorListBox.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java index 44c2d8e59a3..3350f4a5af9 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java @@ -1,5 +1,6 @@ package com.sap.sse.datamining.ui.client.selection.statistic; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -42,11 +43,18 @@ public class AggregatorListBox extends ValueListBox { @Override public void setAcceptableValues(Collection newValues) { + Collection newValuesWithNull = new ArrayList<>(); + newValuesWithNull.add(null); + aggregatorsByDisplayName.clear(); for (AggregatorGroup aggregator : newValues) { - aggregatorsByDisplayName.put(aggregator.getDisplayName(), aggregator); + if (aggregator != null) { + aggregatorsByDisplayName.put(aggregator.getDisplayName(), aggregator); + newValuesWithNull.add(aggregator); + } } - super.setAcceptableValues(newValues); + + super.setAcceptableValues(newValuesWithNull); } } \ No newline at end of file From 04118f52b849e63de89e87dddb39ca9287625ad8 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Sat, 25 Aug 2018 18:27:21 +0200 Subject: [PATCH 193/197] Cleaned the aggregator change handling of SuggestBoxStatisticProvider --- .../statistic/AggregatorListBox.java | 23 +++++ .../SuggestBoxStatisticProvider.java | 83 ++++++++----------- 2 files changed, 59 insertions(+), 47 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java index 3350f4a5af9..46c7dc6aaaa 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/AggregatorListBox.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import com.google.gwt.dom.client.NodeList; import com.google.gwt.dom.client.OptionElement; @@ -14,9 +15,16 @@ import com.google.gwt.user.client.ui.ValueListBox; public class AggregatorListBox extends ValueListBox { + @FunctionalInterface + public static interface ValueChangeHandler { + void valueChanged(AggregatorGroup oldValue, AggregatorGroup newValue); + } + private static final String UnsupportedItemStyle = "unsupportedAggregatorListItem"; private final Map aggregatorsByDisplayName; + private AggregatorGroup value; + private ValueChangeHandler valueChangeHandler; public AggregatorListBox(String nullDisplayString) { super(new AbstractRenderer() { @@ -26,6 +34,21 @@ public class AggregatorListBox extends ValueListBox { } }); aggregatorsByDisplayName = new HashMap<>(); + + addValueChangeHandler(event -> { + AggregatorGroup newValue = event.getValue(); + if (!Objects.equals(value, newValue)) { + AggregatorGroup oldValue = value; + value = newValue; + if (valueChangeHandler != null) { + valueChangeHandler.valueChanged(oldValue, value); + } + } + }); + } + + public void setValueChangeHandler(ValueChangeHandler valueChangeHandler) { + this.valueChangeHandler = valueChangeHandler; } public void updateItemStyles(ExtractionFunctionWithContext extractionFunction) { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java index e73b687f272..d23a615cf45 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/SuggestBoxStatisticProvider.java @@ -13,8 +13,6 @@ import java.util.Set; import java.util.function.Consumer; import com.google.gwt.event.dom.client.KeyCodes; -import com.google.gwt.event.logical.shared.ValueChangeEvent; -import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.i18n.client.LocaleInfo; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.FlowPanel; @@ -82,7 +80,6 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent> collectedAggregators; - private AggregatorGroup currentAggregator; private final List availableAggregators; private final AggregatorListBox aggregatorListBox; @@ -110,12 +107,7 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent(); availableAggregators = new ArrayList<>(); aggregatorListBox = new AggregatorListBox("<" + getDataMiningStringMessages().any() + ">"); - aggregatorListBox.addValueChangeHandler(new ValueChangeHandler() { - @Override - public void onValueChange(ValueChangeEvent event) { - aggregatorSelectionChanged(event.getValue()); - } - }); + aggregatorListBox.setValueChangeHandler(this::aggregatorSelectionChanged); aggregatorListBox.addStyleName(StatisticProviderElementStyle); aggregatorListBox.addStyleName("dataMiningListBox"); aggregatorListBox.setEnabled(false); @@ -321,45 +313,42 @@ public class SuggestBoxStatisticProvider extends AbstractDataMiningComponent selectableExtractionFunctions; - String labelBetweenAggregatorAndStatisticText = null; - if (newAggregatorSupportsIdentityFunction) { - selectableExtractionFunctions = availableIdentityFunctions; - labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().the(); - } else { - selectableExtractionFunctions = availableStatistics; - labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().of(); - } - - ExtractionFunctionWithContext currentExtractionFunction = extractionFunctionSuggestBox.getExtractionFunction(); - if (currentExtractionFunction != null && newAggregator != null && !newAggregator.supportsFunction(currentExtractionFunction)) { - // Current extraction function isn't supported by the new aggregator - if (newAggregatorSupportsIdentityFunction && !currentAggregatorSupportsIdentityFunction) { - // Switch to the corresponding identity function, if the identity functions aren't already the selectable functions - for (IdentityFunctionWithContext identityFunction : availableIdentityFunctions) { - if (identityFunction.getRetrieverChain().equals(currentExtractionFunction.getRetrieverChain())) { - extractionFunctionSuggestBox.setExtractionFunction(identityFunction); - break; - } - } - } else { - extractionFunctionSuggestBox.setExtractionFunction(null); - } - } - extractionFunctionSuggestBox.setSelectableValues(selectableExtractionFunctions); - extractionFunctionSuggestBox.setGroupingSuggestionsByRetrieverChain(!newAggregatorSupportsIdentityFunction); - labelBetweenAggregatorAndStatistic.setText(labelBetweenAggregatorAndStatisticText); - currentAggregator = newAggregator; - - notifyAggregatorDefinitionListeners(); + private void aggregatorSelectionChanged(AggregatorGroup oldAggregator, AggregatorGroup newAggregator) { + boolean currentAggregatorSupportsIdentityFunction = oldAggregator != null + && oldAggregator.supportsFunction(identityFunction); + boolean newAggregatorSupportsIdentityFunction = newAggregator != null + && newAggregator.supportsFunction(identityFunction); + + List selectableExtractionFunctions; + String labelBetweenAggregatorAndStatisticText = null; + if (newAggregatorSupportsIdentityFunction) { + selectableExtractionFunctions = availableIdentityFunctions; + labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().the(); + } else { + selectableExtractionFunctions = availableStatistics; + labelBetweenAggregatorAndStatisticText = getDataMiningStringMessages().of(); } + + ExtractionFunctionWithContext currentExtractionFunction = extractionFunctionSuggestBox.getExtractionFunction(); + if (currentExtractionFunction != null && newAggregator != null && !newAggregator.supportsFunction(currentExtractionFunction)) { + // Current extraction function isn't supported by the new aggregator + if (newAggregatorSupportsIdentityFunction && !currentAggregatorSupportsIdentityFunction) { + // Switch to the corresponding identity function, if the identity functions aren't already the selectable functions + for (IdentityFunctionWithContext identityFunction : availableIdentityFunctions) { + if (identityFunction.getRetrieverChain().equals(currentExtractionFunction.getRetrieverChain())) { + extractionFunctionSuggestBox.setExtractionFunction(identityFunction); + break; + } + } + } else { + extractionFunctionSuggestBox.setExtractionFunction(null); + } + } + extractionFunctionSuggestBox.setSelectableValues(selectableExtractionFunctions); + extractionFunctionSuggestBox.setGroupingSuggestionsByRetrieverChain(!newAggregatorSupportsIdentityFunction); + labelBetweenAggregatorAndStatistic.setText(labelBetweenAggregatorAndStatisticText); + + notifyAggregatorDefinitionListeners(); } private void extractionFunctionSelectionChanged(ExtractionFunctionWithContext oldExtractionFunction, From 18cb96dfc6b18265641fe9ae5b6c562d1b34ebb2 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Sat, 25 Aug 2018 18:43:43 +0200 Subject: [PATCH 194/197] The ExtractionFunctionSuggestBox now restores its text if it loses focus --- .../selection/statistic/ExtractionFunctionSuggestBox.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java index e122880b8c4..4be312b285c 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/statistic/ExtractionFunctionSuggestBox.java @@ -11,6 +11,7 @@ import java.util.function.Predicate; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.Element; +import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.user.client.ui.HasAnimation; import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.MenuItem; @@ -44,6 +45,7 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox) getSuggestOracle(); display = (ExtractionFunctionSuggestionDisplay) getSuggestionDisplay(); addSuggestionSelectionHandler(this::setExtractionFunction); + getValueBox().addBlurHandler(this::onBlur); } public void setValueChangeHandler(ValueChangeHandler valueChangeHandler) { @@ -74,6 +76,10 @@ public class ExtractionFunctionSuggestBox extends CustomSuggestBox Date: Sat, 25 Aug 2018 18:52:04 +0200 Subject: [PATCH 195/197] Retaining the filter selection even if the retriever chain has been null in between --- ...chicalDimensionListFilterSelectionProvider.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java index 01606796743..4230f3a4fdc 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java @@ -237,14 +237,16 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractDa } private void updateFilterDimensions() { + // Try to retain the selection even if the retriever chain has been null in between + HashMap>> currentSelection = getSelection(); + if (!currentSelection.isEmpty()) { + selectionToBeApplied = currentSelection; + selectionCallback = EmptyCallback; + } + if (retrieverChain != null) { isUpdatingFilterDimensions = true; clearContent(); - HashMap>> currentSelection = getSelection(); - if (!currentSelection.isEmpty()) { - selectionToBeApplied = currentSelection; - selectionCallback = EmptyCallback; - } dataMiningService.getReducedDimensionsMappedByLevelFor(retrieverChain, LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback() { @Override public void onSuccess(ReducedDimensionsDTO result) { @@ -279,8 +281,6 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractDa } else { clearContent(); updateControls(); - selectionToBeApplied = null; - selectionCallback = null; } } From f724a0e90ed7a00f956935388f4239611456372e Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Sat, 25 Aug 2018 20:14:48 +0200 Subject: [PATCH 196/197] The dimensions to group by are now recovered (using their display name) when the retriever chain is changed --- .../resources/SailingAnalyticsNotes.html | 3 +- .../ui/client/ChartToCsvExporter.java | 5 +- .../client/DataMiningComponentProvider.java | 2 + ...lDimensionListFilterSelectionProvider.java | 4 +- .../MultiDimensionalGroupingProvider.java | 47 +++++++++++++++---- 5 files changed, 46 insertions(+), 15 deletions(-) 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 af094e80f36..adb57cb6d42 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 @@ -9,7 +9,6 @@
        • The windstreamlets are now colored dynamically according to the wind fields maximum and minimum wind speed.
        • Changes of DataMining.html
            -
          • The data type used by a statistic is now displayed by default.
          • The currently selected result tab will be remembered when a query is run. It is now possible to change tabs while a long query is executed, without overwriting the result of another tab when the query finishes. The result will be displayed in the tab that was selected when the execution @@ -27,6 +26,8 @@
          • Counting aggregators now work directly on the retrieved data elements and don't require the selection of a specific statistic. Changing to a counting aggregator when a statistic is selected automatically changes it to the corresponding data type.
            • +
          • The filter selection and dimensions to group by are now retained (where possible), if the statistic + is changed to one that is based on a different data type.
        diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ChartToCsvExporter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ChartToCsvExporter.java index 012e8f0d12f..b79d64885e1 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ChartToCsvExporter.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ChartToCsvExporter.java @@ -5,7 +5,8 @@ import org.moxieapps.gwt.highcharts.client.Point; import org.moxieapps.gwt.highcharts.client.Series; import com.google.gwt.i18n.client.NumberFormat; -import com.google.gwt.user.client.Window; +import com.sap.sse.gwt.client.Notification; +import com.sap.sse.gwt.client.Notification.NotificationType; import com.sap.sse.gwt.shared.TextExporter; /** @@ -32,7 +33,7 @@ public class ChartToCsvExporter { public void exportChartAsCsvToClipboard(Chart chartToExport) { String csvContentExport = createCsvExportContentForStatisticsCurve(chartToExport); TextExporter.exportToClipboard(csvContentExport); - Window.alert(exportedMessage); + Notification.notify(exportedMessage, NotificationType.INFO); } private static String createCsvExportContentForStatisticsCurve(Chart chartToExport) { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index e1d8ad82830..c898331506c 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -7,6 +7,8 @@ import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; import com.sap.sse.gwt.client.shared.components.Component; public interface DataMiningComponentProvider extends Component { + + static final Consumer> EmptyApplyCallback = m -> { }; /** * Tells the provider, that {@link #reloadComponents()} will be called in the future. diff --git a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java index 4230f3a4fdc..21242950caf 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java +++ b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/HierarchicalDimensionListFilterSelectionProvider.java @@ -80,8 +80,6 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractDa private static final double FilterFilterDimensionsHeight = 40; private static final double FilterSelectionTableWidth = 250; - private static final Consumer> EmptyCallback = m -> { }; - private final DataMiningSession session; private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; @@ -241,7 +239,7 @@ public class HierarchicalDimensionListFilterSelectionProvider extends AbstractDa HashMap>> currentSelection = getSelection(); if (!currentSelection.isEmpty()) { selectionToBeApplied = currentSelection; - selectionCallback = EmptyCallback; + selectionCallback = EmptyApplyCallback; } if (retrieverChain != null) { diff --git a/java/com.sap.sse.datamining.ui/src/main/java/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 index fb887b3d473..5b51514bc21 100644 --- a/java/com.sap.sse.datamining.ui/src/main/java/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 @@ -10,6 +10,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.function.BiPredicate; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -55,7 +56,10 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen } return NaturalComparator.compare(d1.getDisplayName(), d2.getDisplayName()); }; - + + @FunctionalInterface + private static interface DimensionMatcher extends BiPredicate { } + private final DataMiningServiceAsync dataMiningService; private final ErrorReporter errorReporter; private final Set listeners; @@ -67,7 +71,9 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen private boolean isUpdating; private DataRetrieverChainDefinitionDTO currentRetrieverChainDefinition; private final List availableDimensions; + private Iterable dimensionsToSelect; + private DimensionMatcher dimensionMatcher; private Consumer> selectionCallback; public MultiDimensionalGroupingProvider(Component parent, ComponentContext context, @@ -122,6 +128,20 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen } private void updateAvailableDimensions() { + // Try to recover the selection even if the retriever chain has been null in between + Collection currentDimensions = getDimensionsToGroupBy(); + if (!currentDimensions.isEmpty()) { + dimensionsToSelect = currentDimensions; + // Match dimensions by display name to retain dimensions of different retriever chains that appear to be equal + dimensionMatcher = (d1, d2) -> { + if (d1 == d2) return true; + if (d1 == null || d2 == null) return false; + + return d1.getDisplayName().equals(d2.getDisplayName()); + }; + selectionCallback = EmptyApplyCallback; + } + if (currentRetrieverChainDefinition != null) { isUpdating = true; dataMiningService.getDimensionsFor(currentRetrieverChainDefinition, @@ -137,7 +157,7 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen if (!availableDimensions.isEmpty()) { Collections.sort(availableDimensions, DimensionComparator); if (dimensionsToSelect != null) { - setSelectedDimensions(dimensionsToSelect, selectionCallback); + setSelectedDimensions(dimensionsToSelect, dimensionMatcher, selectionCallback); } else { Optional dimensionWithLowestOrdinal = availableDimensions.stream().min((d1, d2) -> { int ordinal1 = d1 == null ? Integer.MAX_VALUE : d1.getOrdinal(); @@ -147,6 +167,7 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen dimensionWithLowestOrdinal.ifPresent(d -> firstDimensionToGroupByBox.setValue(d, true)); } dimensionsToSelect = null; + dimensionMatcher = null; selectionCallback = null; } else { notifyListeners(); @@ -157,6 +178,7 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen public void onFailure(Throwable caught) { errorReporter.reportError("Error fetching the dimensions from the server: " + caught.getMessage()); dimensionsToSelect = null; + dimensionMatcher = null; selectionCallback = null; isUpdating = false; } @@ -165,8 +187,6 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen clear(); ValueListBox firstDimensionToGroupByBox = createDimensionToGroupByBox(); addDimensionToGroupByBoxAndUpdateAcceptableValues(firstDimensionToGroupByBox); - dimensionsToSelect = null; - selectionCallback = null; } } @@ -284,25 +304,34 @@ public class MultiDimensionalGroupingProvider extends AbstractDataMiningComponen public void applyQueryDefinition(StatisticQueryDefinitionDTO queryDefinition, Consumer> callback) { DataRetrieverChainDefinitionDTO newRetrieverChain = queryDefinition.getDataRetrieverChainDefinition(); dimensionsToSelect = queryDefinition.getDimensionsToGroupBy(); + dimensionMatcher = Objects::equals; selectionCallback = callback; if (!isAwaitingReload && !isUpdating && currentRetrieverChainDefinition.equals(newRetrieverChain)) { clearDimensionBoxes(); ValueListBox firstDimensionToGroupByBox = createDimensionToGroupByBox(); addDimensionToGroupByBoxAndUpdateAcceptableValues(firstDimensionToGroupByBox); - setSelectedDimensions(dimensionsToSelect, selectionCallback); + setSelectedDimensions(dimensionsToSelect, dimensionMatcher, selectionCallback); dimensionsToSelect = null; + dimensionMatcher = null; selectionCallback = null; } } - private void setSelectedDimensions(Iterable dimensions, Consumer> callback) { + private void setSelectedDimensions(Iterable dimensions, DimensionMatcher matcher, Consumer> callback) { Collection missingDimensions = new ArrayList<>(); int boxIndex = 0; for (FunctionDTO dimension : dimensions) { - int index = availableDimensions.indexOf(dimension); - if (index != -1) { - setDimensionToGroupBy(boxIndex, availableDimensions.get(index)); + FunctionDTO dimensionToSelect = null; + for (int i = 0; i < availableDimensions.size(); i++) { + FunctionDTO availableDimension = availableDimensions.get(i); + if (matcher.test(dimension, availableDimension)) { + dimensionToSelect = availableDimension; + break; + } + } + if (dimensionToSelect != null) { + setDimensionToGroupBy(boxIndex, dimensionToSelect); boxIndex++; } else { missingDimensions.add(dimension); From 42f70057b6bbada149f1f506908aed0912eb2ca8 Mon Sep 17 00:00:00 2001 From: Alessandro Stoltenberg Date: Wed, 29 Aug 2018 10:56:52 +0200 Subject: [PATCH 197/197] bug4134_2: Fixed issue with windspeed spread too small to display correctly --- .../ui/shared/racemap/WindStreamletsRaceboardOverlay.java | 2 +- .../com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.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/shared/racemap/WindStreamletsRaceboardOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java index 89ccb55a5ea..83f28156aa4 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/WindStreamletsRaceboardOverlay.java @@ -157,7 +157,7 @@ public class WindStreamletsRaceboardOverlay extends MovingCanvasOverlay implemen txtmet = context2d.measureText(label); context2d.fillText(label, x + (w * maxIdx - txtmet.getWidth()) / 2.0, y - 5.0); for (int idx = 0; idx <= maxIdx; idx++) { - final double speedSteps = speed_min + idx * (speed_max - speed_min) / maxIdx; + final double speedSteps = speed_min + idx * (speed_spread) / maxIdx; context2d.setFillStyle(swarm.getColorMapper().getColor(speedSteps)); context2d.beginPath(); context2d.fillRect(x + idx * w, y, w, h); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java index fb031139dcd..498765054fd 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java @@ -299,7 +299,10 @@ public class Swarm implements TimeListener { } } } - if (minSpeedInKnots <= maxSpeedInKnots) { + if (Math.abs(maxSpeedInKnots - minSpeedInKnots) <= 0.01 && minSpeedInKnots < maxSpeedInKnots) { + valueRange.setMinMax(minSpeedInKnots - 0.1, maxSpeedInKnots + 0.1); + } + else if (minSpeedInKnots <= maxSpeedInKnots) { valueRange.setMinMax(minSpeedInKnots, maxSpeedInKnots); } drawSwarm();