diff --git a/home.md b/home.md index 50e58978086..3c5e22a1dae 100644 --- a/home.md +++ b/home.md @@ -26,6 +26,7 @@ SAP is at the center of today’s technology revolution, developing innovations * [[Polars|wiki/Polars]] * Production Environment * [[Amazon EC2|wiki/amazon-ec2]] + * [[SSL / HTTPS Support|wiki/ssl-support]] * [[EC2 Backup Strategy|wiki/amazon-ec2-backup-strategy]] * [[TracTrac|wiki/tractrac-lifecycle]] * [[Analytics on a stick|wiki/analytics-on-a-stick]] diff --git a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch index e6230b9950b..aefd1e3ffb6 100755 --- a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch +++ b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch @@ -1,47 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch index 20731950d47..463a6cf721f 100755 --- a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch +++ b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT.launch @@ -1,47 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml b/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml index 9f1d66d19d6..ad6c4ff7907 100644 --- a/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml +++ b/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml @@ -29,12 +29,12 @@ - Dispatch Service - DispatchService - com.sap.sailing.dashboards.gwt.server.DashboardDispatchRPCServletImpl + Dashboard Dispatch Service + dashboardDispatch + com.sap.sailing.dashboards.gwt.server.DashboardDispatchServlet - DispatchService + dashboardDispatch /service/dispatch diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetCompetitorInLeaderboardAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetCompetitorInLeaderboardAction.java index 433536bec7e..a5cfd3fd5d0 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetCompetitorInLeaderboardAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetCompetitorInLeaderboardAction.java @@ -5,8 +5,8 @@ import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardAction; import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext; import com.sap.sailing.dashboards.gwt.shared.dto.LeaderboardCompetitorsDTO; import com.sap.sailing.domain.leaderboard.Leaderboard; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetIDFromRaceThatIsLiveAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetIDFromRaceThatIsLiveAction.java index c26ab8c6d0c..e7b409ad6f0 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetIDFromRaceThatIsLiveAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetIDFromRaceThatIsLiveAction.java @@ -5,7 +5,7 @@ import com.sap.sailing.dashboards.gwt.shared.dispatch.RequiresLiveRaceAction; import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext; import com.sap.sailing.dashboards.gwt.shared.dto.RaceIdDTO; import com.sap.sailing.domain.tracking.TrackedRace; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetIDFromRaceThatTakesWindFixesNowAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetIDFromRaceThatTakesWindFixesNowAction.java index 25491706bb6..d54e8c95aff 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetIDFromRaceThatTakesWindFixesNowAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetIDFromRaceThatTakesWindFixesNowAction.java @@ -8,8 +8,8 @@ import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.tracking.TrackedRace; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartAnalysesAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartAnalysesAction.java index f10004dff49..ada80912458 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartAnalysesAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartAnalysesAction.java @@ -16,7 +16,7 @@ import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.tracking.TrackedRace; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartlineAdvantageByGeometryAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartlineAdvantageByGeometryAction.java index 7b79ef3205d..a3d7de27f48 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartlineAdvantageByGeometryAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartlineAdvantageByGeometryAction.java @@ -7,7 +7,7 @@ import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext; import com.sap.sailing.dashboards.gwt.shared.dispatch.RequiresLiveRaceAndCachesMovingAverageAction; import com.sap.sailing.dashboards.gwt.shared.dto.StartLineAdvantageDTO; import com.sap.sailing.domain.tracking.TrackedRace; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartlineAdvantagesByWindAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartlineAdvantagesByWindAction.java index 4d4d0ee8d67..de3bb83d006 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartlineAdvantagesByWindAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/actions/GetStartlineAdvantagesByWindAction.java @@ -11,8 +11,8 @@ import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext; import com.sap.sailing.dashboards.gwt.shared.dispatch.RequiresLiveRaceAndCachesMovingAverageAction; import com.sap.sailing.dashboards.gwt.shared.dto.StartlineAdvantagesWithMaxAndAverageDTO; import com.sap.sailing.domain.tracking.TrackedRace; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; public class GetStartlineAdvantagesByWindAction extends RequiresLiveRaceAndCachesMovingAverageAction { diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.java index 734750e5663..6d79fe56bc4 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/widgets/windbot/WindBotWidget.java @@ -25,11 +25,11 @@ import com.sap.sailing.dashboards.gwt.shared.MovingAverage; import com.sap.sailing.dashboards.gwt.shared.WindType; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; -import com.sap.sailing.gwt.dispatch.client.batching.SplitScheduler; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.shared.WindDTO; import com.sap.sailing.gwt.ui.shared.WindInfoForRaceDTO; import com.sap.sailing.gwt.ui.shared.WindTrackInfoDTO; +import com.sap.sse.gwt.dispatch.client.system.batching.SplitScheduler; /** * The class is an actual widget on the dashboard and shows the measured data of wind bot in a race. It contains a diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/DashboardDispatchRPCServletImpl.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/DashboardDispatchRPCServletImpl.java deleted file mode 100644 index 7f7533190d9..00000000000 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/DashboardDispatchRPCServletImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.sap.sailing.dashboards.gwt.server; - -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; - -import com.sap.sailing.dashboards.gwt.shared.DashboardLiveRaceProvider; -import com.sap.sailing.dashboards.gwt.shared.MovingAveragesCache; -import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext; -import com.sap.sailing.dashboards.gwt.shared.dispatch.impl.DashboardDispatchContextImpl; -import com.sap.sailing.domain.polars.PolarDataService; -import com.sap.sailing.gwt.dispatch.client.Action; -import com.sap.sailing.gwt.dispatch.client.Result; -import com.sap.sailing.gwt.dispatch.client.ResultWrapper; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; -import com.sap.sailing.gwt.dispatch.client.exceptions.ServerDispatchException; -import com.sap.sailing.gwt.dispatch.client.rpcimpl.DispatchRPC; -import com.sap.sailing.gwt.dispatch.client.rpcimpl.RequestWrapper; -import com.sap.sailing.gwt.ui.server.Activator; -import com.sap.sailing.gwt.ui.server.ProxiedRemoteServiceServlet; -import com.sap.sailing.server.RacingEventService; -import com.sap.sse.util.ServiceTrackerFactory; - -public class DashboardDispatchRPCServletImpl extends ProxiedRemoteServiceServlet implements DispatchRPC { - private static final long serialVersionUID = -245230476512348999L; - private static final Logger logger = Logger.getLogger(DashboardDispatchRPCServletImpl.class.getName()); - - private final ServiceTracker racingEventServiceTracker; - private final PolarDataService polarDataService; - private final DashboardLiveRaceProvider dashboardLiveRaceProvider; - private final MovingAveragesCache movingAveragesCache; - - public DashboardDispatchRPCServletImpl() { - final BundleContext context = Activator.getDefault(); - racingEventServiceTracker = ServiceTrackerFactory.createAndOpen(context, RacingEventService.class); - polarDataService = getPolarDataService(); - dashboardLiveRaceProvider = new DashboardLiveRaceProvider(racingEventServiceTracker.getService()); - movingAveragesCache = new MovingAveragesCache(); - } - - @Override - public > ResultWrapper execute( - RequestWrapper request) throws DispatchException { - A action = request.getAction(); - long start = System.currentTimeMillis(); - try { - R executionResult = action.execute(new DashboardDispatchContextImpl(request.getCurrentClientTime(), - racingEventServiceTracker.getService(), polarDataService, dashboardLiveRaceProvider, - movingAveragesCache, request.getClientLocaleName(), getThreadLocalRequest())); - return new ResultWrapper(executionResult); - } catch (DispatchException d) { - logger.log(Level.WARNING, "Server exception", d); - throw d; - } catch (Throwable t) { - String serverExceptionUUID = UUID.randomUUID().toString(); - logger.log(Level.SEVERE, "Uncaught server exception id: " + serverExceptionUUID, t); - throw new ServerDispatchException(serverExceptionUUID, t); - } finally { - long duration = System.currentTimeMillis() - start; - final Level logLevel; - if (duration < 100) { - logLevel = Level.FINEST; - } else if (duration < 500) { - logLevel = Level.INFO; - } else { - logLevel = Level.WARNING; - } - logger.log(logLevel, "Dispatch took " + duration + "ms for " + action.getClass().getSimpleName()); - } - } - - @Override - protected void doUnexpectedFailure(Throwable e) { - logger.log(Level.WARNING, "GWT RPC Exception: " + e.getMessage(), e); - super.doUnexpectedFailure(e); - } - - private PolarDataService getPolarDataService() { - BundleContext context = Activator.getDefault(); - ServiceReference polarServiceReference = context.getServiceReference(PolarDataService.class); - return context.getService(polarServiceReference); - } -} diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/DashboardDispatchServlet.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/DashboardDispatchServlet.java new file mode 100644 index 00000000000..1ab08768e8e --- /dev/null +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/server/DashboardDispatchServlet.java @@ -0,0 +1,50 @@ +package com.sap.sailing.dashboards.gwt.server; + +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; + +import com.sap.sailing.dashboards.gwt.shared.DashboardLiveRaceProvider; +import com.sap.sailing.dashboards.gwt.shared.MovingAveragesCache; +import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext; +import com.sap.sailing.dashboards.gwt.shared.dispatch.impl.DashboardDispatchContextImpl; +import com.sap.sailing.domain.polars.PolarDataService; +import com.sap.sailing.gwt.ui.server.Activator; +import com.sap.sailing.server.RacingEventService; +import com.sap.sse.gwt.dispatch.client.transport.gwtrpc.RequestWrapper; +import com.sap.sse.gwt.dispatch.servlets.AbstractDispatchServlet; +import com.sap.sse.gwt.dispatch.shared.commands.Action; +import com.sap.sse.gwt.dispatch.shared.commands.Result; +import com.sap.sse.util.ServiceTrackerFactory; + +public class DashboardDispatchServlet extends AbstractDispatchServlet { + private static final long serialVersionUID = -245230476512348999L; + + private final ServiceTracker racingEventServiceTracker; + private final PolarDataService polarDataService; + private final DashboardLiveRaceProvider dashboardLiveRaceProvider; + private final MovingAveragesCache movingAveragesCache; + + public DashboardDispatchServlet() { + final BundleContext context = Activator.getDefault(); + racingEventServiceTracker = ServiceTrackerFactory.createAndOpen(context, RacingEventService.class); + polarDataService = getPolarDataService(); + dashboardLiveRaceProvider = new DashboardLiveRaceProvider(racingEventServiceTracker.getService()); + movingAveragesCache = new MovingAveragesCache(); + } + + @Override + protected > DashboardDispatchContext createDispatchContextFor( + RequestWrapper request) { + return new DashboardDispatchContextImpl(request.getCurrentClientTime(), + racingEventServiceTracker.getService(), + polarDataService, dashboardLiveRaceProvider, movingAveragesCache, request.getClientLocaleName(), + getThreadLocalRequest()); + } + + private PolarDataService getPolarDataService() { + BundleContext context = Activator.getDefault(); + ServiceReference polarServiceReference = context.getServiceReference(PolarDataService.class); + return context.getService(polarServiceReference); + } +} diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardAction.java index b9cc7b6ea50..c3f6a5d272b 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardAction.java @@ -1,9 +1,9 @@ package com.sap.sailing.dashboards.gwt.shared.dispatch; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.Action; -import com.sap.sailing.gwt.dispatch.client.Result; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; +import com.sap.sse.gwt.dispatch.shared.commands.Action; +import com.sap.sse.gwt.dispatch.shared.commands.Result; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardDispatchContext.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardDispatchContext.java index ef159975ee2..3f75a7e2383 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardDispatchContext.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardDispatchContext.java @@ -7,8 +7,8 @@ import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.dashboards.gwt.shared.DashboardLiveRaceProvider; import com.sap.sailing.dashboards.gwt.shared.MovingAveragesCache; import com.sap.sailing.domain.polars.PolarDataService; -import com.sap.sailing.gwt.dispatch.client.DispatchContext; import com.sap.sailing.server.RacingEventService; +import com.sap.sse.gwt.dispatch.client.system.DispatchContext; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardDispatchSystem.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardDispatchSystem.java index 4902a45e242..a61baa2f6a2 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardDispatchSystem.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/DashboardDispatchSystem.java @@ -1,11 +1,12 @@ package com.sap.sailing.dashboards.gwt.shared.dispatch; -import com.sap.sailing.gwt.dispatch.client.impl.DispatchSystem; +import com.sap.sse.gwt.dispatch.client.system.DispatchSystemAsync; +import com.sap.sse.gwt.dispatch.client.system.ProvidesServerTime; /** * @author Alexander Ries (D062114) * */ -public interface DashboardDispatchSystem extends DispatchSystem{ +public interface DashboardDispatchSystem extends DispatchSystemAsync, ProvidesServerTime { } diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAction.java index 1c84c01a309..2ef92b4890a 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAction.java @@ -2,7 +2,7 @@ package com.sap.sailing.dashboards.gwt.shared.dispatch; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.tracking.TrackedRace; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAndCachesMovingAverageAction.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAndCachesMovingAverageAction.java index 2c9907ccf49..38db9e20d6f 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAndCachesMovingAverageAction.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/RequiresLiveRaceAndCachesMovingAverageAction.java @@ -2,7 +2,7 @@ package com.sap.sailing.dashboards.gwt.shared.dispatch; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.dashboards.gwt.shared.MovingAveragesCache; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/impl/DashboardDispatchContextImpl.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/impl/DashboardDispatchContextImpl.java index 706f0133c3a..1b091d9aed7 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/impl/DashboardDispatchContextImpl.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/impl/DashboardDispatchContextImpl.java @@ -10,9 +10,9 @@ import com.sap.sailing.dashboards.gwt.shared.DashboardLiveRaceProvider; import com.sap.sailing.dashboards.gwt.shared.MovingAveragesCache; import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext; import com.sap.sailing.domain.polars.PolarDataService; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.server.HomeServiceUtil; import com.sap.sailing.server.RacingEventService; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/impl/DashboardDispatchSystemImpl.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/impl/DashboardDispatchSystemImpl.java index 67bdb57fdb3..342a46b830f 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/impl/DashboardDispatchSystemImpl.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dispatch/impl/DashboardDispatchSystemImpl.java @@ -3,9 +3,9 @@ package com.sap.sailing.dashboards.gwt.shared.dispatch.impl; import com.sap.sailing.dashboards.gwt.client.RemoteServiceMappingConstants; import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchContext; import com.sap.sailing.dashboards.gwt.shared.dispatch.DashboardDispatchSystem; -import com.sap.sailing.gwt.dispatch.client.impl.DispatchSystemImpl; +import com.sap.sse.gwt.dispatch.client.system.DispatchSystemDefaultImpl; -public class DashboardDispatchSystemImpl extends DispatchSystemImpl implements DashboardDispatchSystem { +public class DashboardDispatchSystemImpl extends DispatchSystemDefaultImpl implements DashboardDispatchSystem { public DashboardDispatchSystemImpl() { super(RemoteServiceMappingConstants.ribdashboardDispatchServiceRemotePath, true); diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/AverageDTO.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/AverageDTO.java index df20cc4a3a5..dfcaf015825 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/AverageDTO.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/AverageDTO.java @@ -1,6 +1,6 @@ package com.sap.sailing.dashboards.gwt.shared.dto; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/LeaderboardCompetitorsDTO.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/LeaderboardCompetitorsDTO.java index 3becb6c12e5..f402d3031eb 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/LeaderboardCompetitorsDTO.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/LeaderboardCompetitorsDTO.java @@ -3,7 +3,7 @@ package com.sap.sailing.dashboards.gwt.shared.dto; import java.util.List; import com.sap.sailing.domain.common.dto.CompetitorDTO; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/RaceIdDTO.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/RaceIdDTO.java index ee100009561..84665369b12 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/RaceIdDTO.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/RaceIdDTO.java @@ -1,7 +1,7 @@ package com.sap.sailing.dashboards.gwt.shared.dto; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartAnalysesDTO.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartAnalysesDTO.java index 467b7463b36..24e18fba55d 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartAnalysesDTO.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartAnalysesDTO.java @@ -2,7 +2,7 @@ package com.sap.sailing.dashboards.gwt.shared.dto; import java.util.List; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartLineAdvantageDTO.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartLineAdvantageDTO.java index c77a1efab80..26538f7a363 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartLineAdvantageDTO.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartLineAdvantageDTO.java @@ -3,7 +3,7 @@ package com.sap.sailing.dashboards.gwt.shared.dto; import java.util.Comparator; import com.sap.sailing.dashboards.gwt.shared.StartlineAdvantageType; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; public class StartLineAdvantageDTO extends AverageDTO implements Result { diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartlineAdvantagesWithMaxAndAverageDTO.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartlineAdvantagesWithMaxAndAverageDTO.java index 52ab09d94ba..b5fa5b5cfae 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartlineAdvantagesWithMaxAndAverageDTO.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/shared/dto/StartlineAdvantagesWithMaxAndAverageDTO.java @@ -1,6 +1,6 @@ package com.sap.sailing.dashboards.gwt.shared.dto; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; /** * @author Alexander Ries (D062114) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/Permission.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/Permission.java index 6069aa5b1bc..cb50d9f297f 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/Permission.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/Permission.java @@ -1,30 +1,32 @@ -package com.sap.sailing.domain.common.security; - -public enum Permission implements com.sap.sse.security.shared.Permission { - MANAGE_EVENTS, - MANAGE_REGATTAS, - MANAGE_TRACKED_RACES, - SHOW_TRACKED_RACES, - MANAGE_RACELOG_TRACKING, - MANAGE_ALL_COMPETITORS, - MANAGE_COURSE_LAYOUT, - MANAGE_WIND, - MANAGE_IGTIMI_ACCOUNTS, - MANAGE_LEADERBOARDS, - MANAGE_LEADERBOARD_GROUPS, - MANAGE_RESULT_IMPORT_URLS, - MANAGE_STRUCTURE_IMPORT_URLS, - MANAGE_MEDIA, - MANAGE_SAILING_SERVER_INSTANCES, - MANAGE_LOCAL_SERVER_INSTANCE, - MANAGE_REPLICATION, - MANAGE_MASTERDATA_IMPORT, - MANAGE_DEVICE_CONFIGURATION, - MANAGE_USERS, - MANAGE_FILE_STORAGE; - - @Override - public String getStringPermission() { - return name()+":"; - } -} +package com.sap.sailing.domain.common.security; + +public enum Permission implements com.sap.sse.security.shared.Permission { + MANAGE_EVENTS, + MANAGE_REGATTAS, + MANAGE_TRACKED_RACES, + SHOW_TRACKED_RACES, + MANAGE_RACELOG_TRACKING, + MANAGE_ALL_COMPETITORS, + MANAGE_COURSE_LAYOUT, + MANAGE_WIND, + MANAGE_IGTIMI_ACCOUNTS, + MANAGE_LEADERBOARDS, + MANAGE_LEADERBOARD_GROUPS, + MANAGE_RESULT_IMPORT_URLS, + MANAGE_STRUCTURE_IMPORT_URLS, + MANAGE_MEDIA, + MANAGE_SAILING_SERVER_INSTANCES, + MANAGE_LOCAL_SERVER_INSTANCE, + MANAGE_REPLICATION, + MANAGE_MASTERDATA_IMPORT, + MANAGE_DEVICE_CONFIGURATION, + MANAGE_USERS, + MANAGE_FILE_STORAGE, + MANAGE_MARK_PASSINGS, + CAN_REPLAY_DURING_LIVE_RACES; + + @Override + public String getStringPermission() { + return name()+":"; + } +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java index 7300e408977..32eab0ebaa2 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SailingPermissionsForRoleProvider.java @@ -1,21 +1,36 @@ -package com.sap.sailing.domain.common.security; - -import java.util.Collections; - -import com.sap.sse.security.shared.DefaultRoles; -import com.sap.sse.security.shared.PermissionsForRoleProvider; - -public class SailingPermissionsForRoleProvider implements PermissionsForRoleProvider { - public static final SailingPermissionsForRoleProvider INSTANCE = new SailingPermissionsForRoleProvider(); - - @Override - public Iterable getPermissions(String role) { - final Iterable result; - if (DefaultRoles.ADMIN.getRolename().equals(role)) { - return Collections.singletonList("*"); - } else { - result = Collections.emptyList(); - } - return result; - } -} +package com.sap.sailing.domain.common.security; + +import java.util.ArrayList; +import java.util.Collections; + +import com.sap.sse.security.shared.DefaultRoles; +import com.sap.sse.security.shared.PermissionsForRoleProvider; + +public class SailingPermissionsForRoleProvider implements PermissionsForRoleProvider { + public static final SailingPermissionsForRoleProvider INSTANCE = new SailingPermissionsForRoleProvider(); + + @Override + public Iterable getPermissions(String role) { + final Iterable result; + if (DefaultRoles.ADMIN.getRolename().equals(role)) { + return Collections.singletonList("*"); + } else if (Roles.eventmanager.getRolename().equals(role)) { + return asList(Permission.MANAGE_MEDIA, Permission.MANAGE_MARK_PASSINGS); + } else if (Roles.mediaeditor.getRolename().equals(role)) { + return asList(Permission.MANAGE_MEDIA); + } else if (Roles.moderator.getRolename().equals(role)) { + return asList(Permission.CAN_REPLAY_DURING_LIVE_RACES); + } else { + result = Collections.emptyList(); + } + return result; + } + + private Iterable asList(Permission... permissions) { + ArrayList list = new ArrayList(permissions.length); + for (Permission permission : permissions) { + list.add(permission.getStringPermission()); + } + return list; + } +} diff --git a/java/com.sap.sailing.gwt.ui.test/pom.xml b/java/com.sap.sailing.gwt.ui.test/pom.xml index 638de9ddd68..d83cacf301b 100644 --- a/java/com.sap.sailing.gwt.ui.test/pom.xml +++ b/java/com.sap.sailing.gwt.ui.test/pom.xml @@ -1,42 +1,42 @@ - - - 4.0.0 - - root - com.sap.sailing - 1.0.0-SNAPSHOT - - com.sap.sailing.gwt.ui.test - eclipse-plugin - - - - - org.codehaus.mojo - gwt-maven-plugin - 2.4.0 - - **/GwtTestCaseColumnToggling.java - - - - - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/GwtTestCaseColumnToggling.java - - - - - - + + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sailing.gwt.ui.test + eclipse-plugin + + + + + org.codehaus.mojo + gwt-maven-plugin + 2.4.0 + + **/GwtTestCaseColumnToggling.java + + + + + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/GwtTestCaseColumnToggling.java + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF index 43c9489242f..8cfb13530f1 100644 --- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF @@ -47,7 +47,6 @@ Require-Bundle: com.sap.sailing.domain, com.sap.sse.security.common, com.sap.sse.filestorage, org.apache.shiro.core;bundle-version="1.2.2", - com.sap.sse.gwt.theme, com.sap.sailing.news, com.sap.sailing.polars.datamining.shared, com.sap.sailing.polars.datamining, @@ -72,12 +71,6 @@ TrackLifecycle: true Export-Package: com.google.gwt.user.client.rpc.core.com.sap.sailing.domain.common.confidence.impl, com.google.gwt.user.client.rpc.core.com.sap.sailing.domain.common.impl, com.google.gwt.user.client.rpc.core.com.sap.sailing.domain.common.tracking.impl, - com.sap.sailing.gwt.dispatch.client, - com.sap.sailing.gwt.dispatch.client.batching, - com.sap.sailing.gwt.dispatch.client.caching, - com.sap.sailing.gwt.dispatch.client.exceptions, - com.sap.sailing.gwt.dispatch.client.impl, - com.sap.sailing.gwt.dispatch.client.rpcimpl, com.sap.sailing.gwt.home.communication, com.sap.sailing.gwt.home.server, com.sap.sailing.gwt.server, diff --git a/java/com.sap.sailing.gwt.ui/RaceBoard.css b/java/com.sap.sailing.gwt.ui/RaceBoard.css index 0175c2a97dd..4896c6d9d76 100644 --- a/java/com.sap.sailing.gwt.ui/RaceBoard.css +++ b/java/com.sap.sailing.gwt.ui/RaceBoard.css @@ -655,7 +655,7 @@ img.openColumn { .RegattaAndRaceTime-Header { position: absolute; - right: 10px; + right: 65px; top: 13px; text-align: right; color: white; @@ -752,4 +752,4 @@ img.openColumn { .Media-Select-Popup .Caption { padding: 4px 10px; -} \ No newline at end of file +} diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index 5356d07a245..3188a77e3f5 100644 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -1,79 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch old mode 100755 new mode 100644 index b677fe5c939..dfad7ad820a --- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch @@ -1,76 +1,75 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml b/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml index fd843218017..2dd07f89431 100755 --- a/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml +++ b/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml @@ -74,12 +74,12 @@ - Dispatch Service - DispatchService - com.sap.sailing.gwt.home.server.servlets.DispatchRPCServletImpl + Sailing Dispatch Service + sailingDispatch + com.sap.sailing.gwt.home.server.servlets.SailingDispatchServlet - DispatchService + sailingDispatch /service/dispatch diff --git a/java/com.sap.sailing.gwt.ui/images/home/edit.svg b/java/com.sap.sailing.gwt.ui/images/home/edit.svg new file mode 100644 index 00000000000..1d86a44eb80 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/home/edit.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/images/home/facebook.svg b/java/com.sap.sailing.gwt.ui/images/home/facebook.svg new file mode 100644 index 00000000000..c12e1f9afed --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/home/facebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/images/home/google.svg b/java/com.sap.sailing.gwt.ui/images/home/google.svg new file mode 100644 index 00000000000..3662a830ae7 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/home/google.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/images/home/loggedin-open.svg b/java/com.sap.sailing.gwt.ui/images/home/loggedin-open.svg new file mode 100644 index 00000000000..45f046d18d7 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/home/loggedin-open.svg @@ -0,0 +1,62 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/images/home/loggedin.svg b/java/com.sap.sailing.gwt.ui/images/home/loggedin.svg new file mode 100644 index 00000000000..ecedd72d6df --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/home/loggedin.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/images/home/loggedout-open.svg b/java/com.sap.sailing.gwt.ui/images/home/loggedout-open.svg new file mode 100644 index 00000000000..1e140a3c858 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/home/loggedout-open.svg @@ -0,0 +1,62 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/images/home/loggedout.svg b/java/com.sap.sailing.gwt.ui/images/home/loggedout.svg new file mode 100644 index 00000000000..dcb76d150b6 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/home/loggedout.svg @@ -0,0 +1,61 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/images/home/userdefault.svg b/java/com.sap.sailing.gwt.ui/images/home/userdefault.svg new file mode 100644 index 00000000000..c942890386f --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/home/userdefault.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon-signedin.svg b/java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon-signedin.svg new file mode 100644 index 00000000000..22a8773c34d --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/images/mobile/navigation-icon-signedin.svg @@ -0,0 +1 @@ +sap_useraccounticons \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/imprint.json b/java/com.sap.sailing.gwt.ui/imprint.json new file mode 100644 index 00000000000..adc22eb8176 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/imprint.json @@ -0,0 +1,751 @@ +{ + "components": [ + { + "name": "Apache Commons BeanUtils", + "version": "1.9.0", + "owner": "The Apache Software Foundation", + "homepage": "http://commons.apache.org/proper/commons-beanutils/", + "acknowledgements": [ + "Apache Commons BeanUtils Copyright 2000-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/)." + ], + "key": "ASL2.0" + }, + { + "name": "Apache Commons Codec", + "version": "1.6", + "owner": "The Apache Software Foundation", + "homepage": "http://jakarta.apache.org/commons/codec/", + "acknowledgements": [ + "Copyright 2002-2011 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/).", + "--------------------------------------------------------------------------------", + "src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains test data from http://aspell.sourceforge.net/test/batch0.tab. Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org). Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. ", + "--------------------------------------------------------------------------------" + ], + "key": "ASL2.0" + }, + { + "name": "Apache Commons Collections", + "version": "3.2.1", + "owner": "The Apache Software Foundation", + "homepage": "http://commons.apache.org/collections/", + "acknowledgements": [ + "Apache Commons Collections Copyright 2001-2008 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/)." + ], + "key": "ASL2.0" + }, + { + "name": "Apache Felix Remote Shell", + "version": "1.1.2", + "owner": "The Apache Software Foundation", + "homepage": "http://felix.apache.org/documentation/subprojects/apache-felix-shell.html", + "acknowledgements": [ + "Apache Felix Remote Shell Copyright 2010 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Licensed under the Apache License 2.0." + ], + "key": "ASL2.0" + }, + { + "name": "Apache Felix Remote Shell Service", + "version": "1.4.3", + "owner": "The Apache Software Foundation", + "homepage": "http://felix.apache.org/site/apache-felix-remote-shell.html", + "acknowledgements": [ + "Apache Felix Shell Service Copyright 2006-2012 The Apache Software Foundation", + "This product includes software developed at The Apache Software Foundation (http://www.apache.org/", + "This product uses software developed at The OSGi Alliance (http://www.osgi.org/). Copyright (c) OSGi Alliance (2000, 2007). Licensed under the Apache License 2.0." + ], + "key": "ASL2.0" + }, + { + "name": "Apache POI - org.apache.poi:poi-ooxml", + "version": "3.7", + "owner": "The Apache Software Foundation", + "homepage": "http://repo1.maven.org/maven2/org/apache/poi/poi-ooxml/", + "acknowledgements": [ + "Copyright 2009 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). ", + "This product contains the DOM4J library (http://www.dom4j.org). Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. ", + "This product contains parts that were originally based on software from BEA. Copyright (c) 2000-2003, BEA Systems, .", + "This product contains W3C XML Schema documents. Copyright 2001-2003 (c) World Wide Web Consortium (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University) ", + "This product contains the Piccolo XML Parser for Java (http://piccolo.sourceforge.net/). Copyright 2002 Yuval Oren.", + "This product contains the chunks_parse_cmds.tbl file from the vsdump program. Copyright (C) 2006-2007 Valek Filippov (frob@df.ru) ", + "APACHE POI SUBCOMPONENTS: Apache POI includes subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the following licenses: Office Open XML schemas (ooxml-schemas-1.0.jar) The Office Open XML schema definitions used by Apache POI are a part of the Office Open XML ECMA Specification (ECMA-376, [1]). As defined in section 9.4 of the ECMA bylaws [2], this specification is available to all interested parties without restriction: ", + "9.4 All documents when approved shall be made available to all interested parties without restriction. Furthermore, both Microsoft and Adobe have granted patent licenses to this work [3,4,5].", + " [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm ", + " [2] http://www.ecma-international.org/memento/Ecmabylaws.htm ", + " [3] http://www.microsoft.com/interop/osp/", + " [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ECMA-376%20Edition%201%20Microsoft%20Patent%20Declaration.pdf ", + " [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ga-2006-191.pdf ", + " DOM4J library (dom4j-1.6.1.jar) Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. Redistribution and use of this software and associated documentation (\"Software\"), with or without modification, are permitted provided that the following conditions are met: ", + "1. Redistributions of source code must retain copyright statements and notices. Redistributions must also contain a copy of this document. ", + "2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ", + "3. The name \"DOM4J\" must not be used to endorse or promote products derived from this Software without prior written permission of MetaStuff, Ltd. For written permission, please contact dom4j-info@metastuff.com. ", + "4. Products derived from this Software may not be called \"DOM4J\" nor may \"DOM4J\" appear in their names without prior written permission of MetaStuff, Ltd. DOM4J is a registered trademark of MetaStuff, Ltd. ", + "5. Due credit should be given to the DOM4J Project - http://www.dom4j.org THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ", + "JUnit test library (junit-3.8.1.jar) Common Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE (\"AGREEMENT\"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. ", + "1. DEFINITIONS \"Contribution\" means: ", + "a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and ", + "b) in the case of each subsequent Contributor: ", + "i) changes to the Program, and ", + "ii) additions to the Program; ", + "where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: ", + "(i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and ", + "(ii) are not derivative works of the Program. ", + "\"Contributor\" means any person or entity that distributes the Program. ", + "\"Licensed Patents\" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.", + "\"Program\" means the Contributions distributed in accordance with this Agreement.", + "\"Recipient\" means anyone who receives the Program under this Agreement, including all Contributors. ", + "2. GRANT OF RIGHTS", + "a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.", + "b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. ", + "c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.", + "d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. ", + "3. REQUIREMENTS ", + "A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: ", + "a) it complies with the terms and conditions of this Agreement; and ", + "b) its license agreement: ", + "i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; ", + "ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; ", + "iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and ", + "iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. ", + "When the Program is made available in source code form: ", + "a) it must be made available under this Agreement; and ", + "b) a copy of this Agreement must be included with each copy of the Program. ", + "Contributors may not remove or alter any copyright notices contained within the Program. Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. ", + "4. COMMERCIAL DISTRIBUTION ", + "Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (\"Commercial Contributor\") hereby agrees to defend and indemnify every other Contributor (\"Indemnified Contributor\") against any losses, damages and costs (collectively \"Losses\") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: ", + "a) promptly notify the Commercial Contributor in writing of such claim, and ", + "b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. ", + "The Indemnified Contributor may participate in any such claim at its own expense. For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. ", + "5. NO WARRANTY ", + "EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. ", + "6. DISCLAIMER OF LIABILITY ", + "EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ", + "7. GENERAL ", + "If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation." + ], + "key": "ASL2.0" + }, + { + "name": "Apache ServiceMix :: Bundles :: aws-java-sdk", + "version": "1.9.8_1", + "owner": "The Apache Software Foundation", + "homepage": "http://repo.maven.apache.org/maven2/org/apache/servicemix/bundles/org.apache.servicemix.bundles.aws-java-sdk/", + "acknowledgements": [ + "Apache ServiceMix :: Bundles :: aws-java-sdk Copyright 2005-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/)." + ], + "key": "ASL2.0" + }, + { + "name": "Apache ServiceMix :: Bundles :: ehcache", + "version": "2.6.9_1", + "owner": "The Apache Software Foundation", + "homepage": "http://repo.maven.apache.org/maven2/org/apache/servicemix/bundles/org.apache.servicemix.bundles.ehcache/", + "acknowledgements": [ + "Apache ServiceMix :: Bundles :: ehcache Copyright 2005-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/)." + ], + "key": "ASL2.0" + }, + { + "name": "Apache ServiceMix :: Bundles :: scribe", + "version": "1.3.3_1", + "owner": "The Apache Software Foundation", + "homepage": "http://servicemix.apache.org/bundles-pom/org.apache.servicemix.bundles.scribe/", + "acknowledgements": [ + "Apache ServiceMix :: Bundles :: scribe Copyright 2005-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/)." + ], + "key": "ASL2.0" + }, + { + "name": "Apache ServiceMix :: Bundles :: zxing", + "version": "3.1.0_1", + "owner": "The Apache Software Foundation", + "homepage": "http://repo.maven.apache.org/maven2//org/apache/servicemix/bundles/org.apache.servicemix.bundles.zxing/", + "acknowledgements": [ + "Apache ServiceMix :: Bundles :: zxing Copyright 2005-2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/)." + ], + "key": "ASL2.0" + }, + { + "name": "Apache Shiro", + "version": "1.2.2", + "owner": "The Apache Software Foundation", + "homepage": "http://shiro.apache.org/", + "acknowledgements": [ + "Copyright 2008-2012 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). The implementation for org.apache.shiro.util.SoftHashMap is based on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, with continued modifications. Certain parts (StringUtils etc.) of the source code for this product was copied for simplicity and to reduce dependencies from the source code developed by the Spring Framework Project (http://www.springframework.org)." + ], + "key": "ASL2.0" + }, + { + "name": "Apache Shiro", + "version": "1.2.3", + "owner": "The Apache Software Foundation", + "homepage": "http://shiro.apache.org/", + "acknowledgements": [ + "Copyright 2008-2012 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).", + "The implementation for org.apache.shiro.util.SoftHashMap is based on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, with continued modifications.", + "Certain parts (StringUtils etc.) of the source code for this product was copied for simplicity and to reduce dependencies from the source code developed by the Spring Framework Project (http://www.springframework.org)." + ], + "key": "ASL2.0" + }, + { + "name": "Apache XMLBeans", + "version": "2.4.0", + "owner": "The Apache Software Foundation", + "homepage": "http://xmlbeans.apache.org/", + "acknowledgements": [ + "NOTICE file corresponding to section 4(d) of the Apache License, == == Version 2.0, in this case for the Apache XmlBeans distribution. == ", + "=========================================================================", + "This product includes software developed by The Apache Software Foundation (http://www.apache.org/). ", + "Portions of this software were originally based on the following: ", + " - software copyright (c) 2000-2003, BEA Systems, . ", + "Aside from contributions to the Apache XMLBeans project, this software also includes: ", + " - one or more source files from the Apache Xerces-J and Apache Axis products, Copyright (c) 1999-2003 Apache Software Foundation ", + " - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web Consortium (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)", + " - resolver.jar from Apache Xml Commons project, Copyright (c) 2001-2003 Apache Software Foundation ", + " - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/, Copyright 2002 Yuval Oren under the terms of the Apache Software License 2.0 ", + " - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpullparser/, Copyright 2005 BEA under the terms of the Apache Software License 2.0" + ], + "key": "ASL2.0" + }, + { + "name": "DOM4J - Flexible XML Framework for Java", + "version": "1.6.1", + "owner": "MetaStuff, Ltd.", + "homepage": "http://dom4j.sourceforge.net/", + "acknowledgements": [ + "BSD 3-clause \"New\" or \"Revised\" License" + ], + "key": "ASL2.0" + }, + { + "name": "google-web-toolkit ", + "version": "2.7.0", + "owner": "Google, Inc.", + "homepage": "http://www.moxiegroup.com/moxieapps/gwt-highcharts/", + "acknowledgements": [ + "Google Web Toolkit 2.7.0 (git revision a6da588) Copyright (c) Google, Inc. 2009. All rights reserved. Visit Google Code (http://code.google.com/webtoolkit/).", + "This product includes software developed by:", + "- The Apache Software Foundation (http://www.apache.org/).", + " - Tomcat (http://tomcat.apache.org/) with modifications", + " - Tapestry (http://tapestry.apache.org/)", + "- The Eclipse Foundation (http://www.eclipse.org/).", + " - Java Development Tools (http://www.eclipse.org/jdt/)", + " - Standard Widget Toolkit (http://www.eclipse.org/swt/) with modifications", + "- Mort Bay Consulting (http://www.mortbay.com/)", + " - Jetty 6.1.11 (http://mortbay.org/jetty/)", + "- The Mozilla Foundation (http://www.mozilla.org/).", + " - Mozilla 1.7.12 (http://www.mozilla.org/releases/mozilla1.7.12/)", + " - Rhino (http://www.mozilla.org/rhino/) with modifications", + "- ObjectWeb (http://www.objectweb.org/)", + "- ASM (http://asm.objectweb.org/) with modifications", + "- The OpenQA Project (http://openqa.org/)", + "- Selenium-RC (http://selenium-rc.openqa.org/)", + "- The Protobuf Project (http://code.google.com/p/protobuf/) with modifications", + "For source availability and license information see COPYING.", + "=====", + "", + "GOOGLE WEB TOOLKIT LICENSE INFORMATION", + "", + "March 3, 2008", + "", + "The Google Web Toolkit software and sample code developed by Google is", + "licensed under the Apache License, v. 2.0. Other software included in this", + "distribution is provided under other licenses, as listed in the Included", + "Software and Licenses section at the bottom of this page. Source code for", + "software included in this distribution is available from the Google Web", + "Toolkit project or as otherwise indicated at the bottom of this page.", + "", + "Please note that the executable version of the Google Web Toolkit", + "distributed by Google will communicate with Google's servers to check for", + "available updates. If updates are available, you will receive the option to", + "install them.", + "", + "===", + "", + "LICENSE INFORMATION REGARDING BUNDLED THIRD-PARTY SOFTWARE", + "", + "The following third party software is distributed with Google Web", + "Toolkit and is provided under other licenses and/or has source", + "available from other locations. Where \"gwt-dev.jar\" is listed,", + "substitute in the name of the jar corresponding to your platform,", + "e.g. \"gwt-dev-linux.jar\".", + "", + "* Apache Tomcat", + "License: Apache License v. 2.0 (above)", + "Source code availability: http://tomcat.apache.org", + "modifications are at org/apache/tomcat/ within gwt-dev.jar", + "", + "* Apache Tapestry", + "License: Apache License v. 2.0 (above)", + "Source code availability: http://tapestry.apache.org", + "", + "* ASM 3.1", + "License: (custom)", + "http://asm.objectweb.org/license.html", + "Source code availability: com/google/gwt/dev/asm/ within gwt-dev.jar", + "", + "* Eclipse Java Development Tools (JDT)", + "License: Eclipse Public License v. 1.0", + "http://www.eclipse.org/legal/epl-v10.html", + "Source code availability:", + "http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/download.php?dropFile=eclipse-JDT-SDK-3.3.1.zip", + "", + "* Eclipse Standard Widget Toolkit (SWT)", + "License: Eclipse Public License v. 1.0", + "http://www.eclipse.org/legal/epl-v10.html", + "Source code availability:", + "Linux: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/download.php?dropFile=swt-3.2.1-gtk-linux-x86.zip", + "Windows: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/download.php?dropFile=swt-3.2.1-win32-win32-x86.zip", + "Mac: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/download.php?dropFile=swt-3.2.1-carbon-macosx.zip", + "modifications are at org/eclipse/swt/ within gwt-dev.jar", + "", + "* Jetty", + "License: Apache License v. 2.0 (above)", + "Source code availability:", + "http://mortbay.org/jetty/", + "", + "* Mozilla Rhino", + "License: Mozilla Public License v. 1.1", + "http://www.mozilla.org/MPL/MPL-1.1.txt", + "Source code availability: com/google/gwt/dev/js/rhino/ within gwt-dev.jar", + "", + "* Mozilla 1.7.12 (Linux only)", + "License: Mozilla Public License v. 1.1", + "http://www.mozilla.org/MPL/MPL-1.1.txt", + "Source code availability:", + "http://developer.mozilla.org/en/docs/Download_Mozilla_Source_Code", + "", + "* Protobuf", + "License: New BSD License", + "http://www.opensource.org/licenses/bsd-license.php", + "Source code availablility:", + "http://code.google.com/p/protobuf/source/checkout", + "Binary modifications consist of package-rebasing. The rebased classes are rooted at com/google/gwt/dev/protobuf/ within gwt-dev.jar" + ], + "key": "ASL2.0" + }, + { + "name": "GWT Highcharts", + "version": "1.6.0", + "owner": "Moxie Group", + "homepage": "http://www.moxiegroup.com/moxieapps/gwt-highcharts/", + "acknowledgements": [ + "Copyright 2011 Moxie Group" + ], + "key": "ASL2.0" + }, + { + "name": "GWT-Bootstrap", + "version": "2.3.2.0", + "owner": "GWT-Bootstrap", + "homepage": "http://gwtbootstrap.github.com/", + "acknowledgements": [ + "Copyright ${year} GWT-Bootstrap" + ], + "key": "ASL2.0" + }, + { + "name": "gwt-google-apis", + "version": "ajaxloader-svn", + "owner": "Google, Inc.", + "homepage": "https://github.com/googlearchive/gwt-google-apis", + "acknowledgements": [ + "AjaxLoader API Library for GWT @GWT_VERSION@ (c) Copyright Google, Inc. 2008. All rights reserved. Visit Google Code (http://code.google.com/p/gwt-google-apis)." + ], + "key": "ASL2.0" + }, + { + "name": "GWT-Maps-V3-Api", + "version": "3.9.0-build-17", + "owner": "GWT Maps API V3", + "homepage": "http://github.com/branflake2267/GWT-Maps-V3-Api/", + "acknowledgements": [ + "Copyright (C) 2011 - 2012 GWT Maps API V3" + ], + "key": "ASL2.0" + }, + { + "name": "gwtoauthlogindemo ", + "version": "1.71-svn", + "owner": "Muhammad Muquit", + "homepage": "http://code.google.com/p/gwtoauthlogindemo/", + "acknowledgements": [ + "Copyright (C) 2013-2014 Muhammad Muquit (http://www.muquit.com/)" + ], + "key": "ASL2.0" + }, + { + "name": "Hyperic SIGAR", + "version": "1.6.4", + "owner": "The Hyperic team", + "homepage": "http://sourceforge.net/projects/sigar/", + "acknowledgements": [ + "Hyperic SIGAR includes some third-party open source components in its distribution. The list below identifies the community or organization and links to their appropriate license terms. The Hyperic team would like to thank all the communities of the projects listed below for their contributions.", + "---------------------------------------------------------------------", + "The following components are included without modification: ", + " - log4j - Information: http://logging.apache.org/ License: http://www.apache.org/licenses/LICENSE-2.0", + "The following components are included with modification:", + " - cpptasks - Information: http://ant-contrib.sourceforge.net/ License: http://ant-contrib.sourceforge.net/LICENSE.txt", + " - (portions of) APR - Information: http://apr.apache.org/ License: http://www.apache.org/licenses/LICENSE-2.0", + " - solaris get_mib2 - Information: ftp://vic.cc.purdue.edu/pub/tools/unix/solaris/get_mib2/ License: within src/os/solaris/get_mib2.[ch] ", + " - getline by Chris Thewalt - Information: http://tinyurl.com/r438r License: within src/sigar_getline.c ", + " - PrintfFormat.java - Information: http://java.sun.com/developer/technicalArticles/Programming/sprintf/PrintfFormat.java License: within bindings/java/src/org/hyperic/sigar/util/PrintfFormat.java" + ], + "key": "ASL2.0" + }, + { + "name": "Jackson JSON Mapper ASL", + "version": "1.9.13", + "owner": "The Apache Software Foundation", + "homepage": "http://wiki.fasterxml.com/JacksonHome", + "acknowledgements": [ + "This product currently only contains code developed by authors of specific components, as identified by the source code files; if such notes are missing files have been created by Tatu Saloranta. For additional credits (generally to people who reported problems) see CREDITS file." + ], + "key": "ASL2.0" + }, + { + "name": "Jackson", + "version": "1.9.13", + "owner": "Tatu Saloranta", + "homepage": "http://wiki.fasterxml.com/JacksonHome", + "acknowledgements": [ + "" + ], + "key": "ASL2.0" + }, + { + "name": "Jackson - High-performance JSON processor (SAP)", + "version": "1.9.13", + "owner": "Tatu Saloranta", + "homepage": "https://github.com/FasterXML/jackson", + "acknowledgements": [ + "This product currently only contains code developed by authors of specific components, as identified by the source code files; if such notes are missing files have been created by Tatu Saloranta.", + "For additional credits (generally to people who reported problems) see CREDITS file." + ], + "key": "ASL2.0" + }, + { + "name": "Jackson JSON Mapper ASL", + "version": "1.9.13", + "owner": "The Apache Software Foundation", + "homepage": "http://wiki.fasterxml.com/JacksonHome", + "acknowledgements": [ + "This product currently only contains code developed by authors of specific components, as identified by the source code files; if such notes are missing files have been created by Tatu Saloranta. For additional credits (generally to people who reported problems) see CREDITS file." + ], + "key": "ASL2.0" + }, + { + "name": "Jackson-annotations", + "version": "2.5.0", + "owner": "FasterXML, LLC", + "homepage": "https://github.com/FasterXML/jackson-annotations", + "acknowledgements": [ + ], + "key": "ASL2.0" + }, + { + "name": "jackson-databind", + "version": "2.5.0", + "owner": "Tatu Saloranta", + "homepage": "http://github.com/FasterXML/jackson-databind/", + "acknowledgements": [ + "Jackson JSON processor Jackson is a high-performance, Free/Open Source JSON processing library. It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has been in development since 2007. It is currently developed by a community of developers, as well as supported commercially by FasterXML.com. ## Licensing Jackson core and extension components may be licensed under different licenses. To find the details that apply to this artifact see the accompanying LICENSE file. For more information, including possible other licensing options, contact FasterXML.com (http://fasterxml.com). ## Credits A list of contributors may be found from CREDITS file, which is included in some artifacts (usually source distributions); but is always available from the source code management (SCM) system " + ], + "key": "ASL2.0" + }, + { + "name": "Jackson-JAXRS-base", + "version": "2.5.0", + "owner": "FasterXML, LLC", + "homepage": "http://repo.maven.apache.org/maven2/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/", + "acknowledgements": [ + + ], + "key": "ASL2.0" + }, + { + "name": "jackson-jaxrs-providers", + "version": "2.5.0", + "owner": "FasterXML, LLC", + "homepage": "http://github.com/FasterXML/jackson-jaxrs-providers/", + "acknowledgements": [ + "# Jackson JSON processor Jackson is a high-performance, Free/Open Source JSON processing library. It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has been in development since 2007. It is currently developed by a community of developers, as well as supported commercially by FasterXML.com. ", + "## Licensing Jackson core and extension components may be licensed under different licenses. To find the details that apply to this artifact see the accompanying LICENSE file. For more information, including possible other licensing options, contact FasterXML.com (http://fasterxml.com).", + "## Credits A list of contributors may be found from CREDITS file, which is included in some artifacts (usually source distributions); but is always available from the source code management (SCM) system project uses." + ], + "key": "ASL2.0" + }, + { + "name": "Java Servlet API", + "version": "2.5.0", + "owner": "Sun Microsystems, Inc.", + "homepage": "http://ebr.springsource.com/repository/app/bundle/version/detail?name=com.springsource.javax.servlet&version=2.5.0", + "acknowledgements": [ + "Copyright 2005 Sun Microsystems, Inc. All rights reserved." + ], + "key": "CDDL1.0" + }, + { + "name": "java-diff-utils", + "version": "1.2.1", + "owner": "Dmitry Naumenko", + "homepage": "http://code.google.com/p/java-diff-utils/", + "acknowledgements": [ + "Copyright 2010 Dmitry Naumenko (dm.naumenko@gmail.com)" + ], + "key": "ASL2.0" + }, + { + "name": "JavaMail", + "version": "1.4.5", + "owner": "Sun Microsystems, Inc.", + "homepage": "http://www.oracle.com/technetwork/java/javamail/index-138643.html", + "acknowledgements": [ + "" + ], + "key": "CDDL1.1" + }, + { + "name": "JDOM ", + "version": "1.1", + "owner": "Jason Hunter & Brett McLaughlin", + "homepage": "http://www.jdom.org", + "acknowledgements": [ + "Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved." + ], + "key": "JDOML" + }, + { + "name": "jersey-1.x", + "version": "1.17", + "owner": "Oracle and/or its affiliates", + "homepage": "http://github.com/jersey/jersey-1.x/", + "acknowledgements": [ + "Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved." + ], + "key": "CDDL1.1" + }, + { + "name": "Jettison", + "version": "1.3.7", + "owner": "Envoi Solutions LLC", + "homepage": "http://jettison.codehaus.org/", + "acknowledgements": [ + "Copyright 2006 Envoi Solutions LLC" + ], + "key": "ASL2.0" + }, + { + "name": "JQuery", + "version": "1.10.1", + "owner": "jQuery Foundation and other contributors", + "homepage": "http://jquery.com/", + "acknowledgements": [ + "Copyright 2014 jQuery Foundation and other contributors" + ], + "key": "MITL" + }, + { + "name": "JQuery", + "version": "1.5.2", + "owner": "John Resig", + "homepage": "http://jquery.com/", + "acknowledgements": [ + "Copyright 2011, John Resig" + ], + "key": "MITL" + }, + { + "name": "JQuery", + "version": "1.7.1", + "owner": "John Resig", + "homepage": "http://code.jquery.com/", + "acknowledgements": [ + "Copyright 2011, John Resig" + ], + "key": "MITL" + }, + { + "name": "JQuery", + "version": "1.5.1", + "owner": "John Resig", + "homepage": "http://github.com/jquery/jquery/", + "acknowledgements": [ + "Copyright 2011, John Resig" + ], + "key": "MITL" + }, + { + "name": "json-simple", + "version": "1.1", + "owner": "Yidong Fang, Chris Nokleberg", + "homepage": "http://code.google.com/p/json-simple/", + "acknowledgements": [ + + ], + "key": "ASL2.0" + }, + { + "name": "JSR-311 - JAX-RS - The Java API for RESTful Web Services (Jersey)", + "version": "1.17", + "owner": "Oracle and/or its affiliates", + "homepage": "http://jersey.java.net/", + "acknowledgements": [ + "Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved." + ], + "key": "CDDL1.1" + }, + { + "name": "lz4-java", + "version": "1.3.0", + "owner": "Yann Collet", + "homepage": "http://github.com/jpountz/lz4-java/", + "acknowledgements": [ + "LZ4 Library Copyright (c) 2011-2014, Yann Collet All rights reserved." + ], + "key": "ASL2.0" + }, + { + "name": "mgwt", + "version": "2.0.0", + "owner": "Daniel Kurka", + "homepage": "http://www.m-gwt.com/", + "acknowledgements": [ + "Copyright 2010 Daniel Kurka" + ], + "key": "ASL2.0" + }, + { + "name": "MongoDB Java Driver - org.mongodb:mongo-java-driver", + "version": "2.13.0", + "owner": "10gen, Inc.", + "homepage": "http://docs.mongodb.org/ecosystem/drivers/java/", + "acknowledgements": [ + "Copyright (C) 2008-2013 10gen, Inc." + ], + "key": "ASL2.0" + }, + { + "name": "MongoDB Java Driver - org.mongodb:mongo-java-driver", + "version": "2.13.2", + "owner": "MongoDB, Inc", + "homepage": "http://repo.maven.apache.org/maven2//org/mongodb/mongo-java-driver/", + "acknowledgements": [ + "Copyright (C) 2008-2013 10gen, Inc." + ], + "key": "ASL2.0" + }, + { + "name": "Pull API for parsing MIME messages - MIMEpull", + "version": "1.9.4", + "owner": "Oracle and/or its affiliates", + "homepage": "http://mimepull.java.net/", + "acknowledgements": [ + "Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved." + ], + "key": "CDDL1.1" + }, + { + "name": "qrcodejs", + "version": "master-04f46c6a07", + "owner": "davidshimjs", + "homepage": "http://github.com/davidshimjs/qrcodejs/", + "acknowledgements": [ + "Copyright 2010 Daniel Kurka" + ], + "key": "MITL" + }, + { + "name": "rabbitmq-java-client", + "version": "2_8_4", + "owner": "VMware, Inc.", + "homepage": "http://github.com/rabbitmq/rabbitmq-java-client/", + "acknowledgements": [ + "Copyright (c) 2007-2012 VMware, Inc. All rights reserved." + ], + "key": "ASL2.0" + }, + { + "name": "routeConverter", + "version": "2.12.2", + "owner": "Christian Pesch", + "homepage": "", + "acknowledgements": [ + "RouteConverter is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.", + "RouteConverter is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." + ], + "key": "ASL2.0" + }, + { + "name": "Simple Logging Facade for Java (SLF4J)", + "version": "1.6.4", + "owner": "QOS.ch", + "homepage": "http://www.slf4j.org/", + "acknowledgements": [ + "Copyright (c) 2004-2013 QOS.ch" + ], + "key": "MITL" + }, + { + "name": "slick-carousel", + "version": "1.5.8", + "owner": "Ken Wheeler", + "homepage": "http://github.com/kenwheeler/slick/", + "acknowledgements": [ + "Copyright (c) 2004-2013 QOS.ch" + ], + "key": "MITL" + }, + { + "name": "video-js", + "version": "4.12.10", + "owner": "Brightcove, Inc.", + "homepage": "https://github.com/videojs/video.js", + "acknowledgements": [ + "Copyright 2013 Brightcove, Inc." + ], + "key": "ASL2.0" + }, + { + "name": "video-js-vimeo", + "version": "master-20140814", + "owner": "Benoit Tremblay", + "homepage": "http://github.com/eXon/videojs-vimeo/", + "acknowledgements": [ + "Copyright (c) 2015 Benoit Tremblay " + ], + "key": "MITL" + }, + { + "name": "video-js-youtube", + "version": "1.2.5", + "owner": "Benoit Tremblay", + "homepage": "http://github.com/eXon/videojs-youtube/", + "acknowledgements": [ + "Copyright (c) 2015 Benoit Tremblay " + ], + "key": "MITL" + } + ], + "licenses": [ + { + "key": "ASL2.0", + "file": "asl2.0.txt" + }, + { + "key": "CDDL1.0", + "file": "cddl1.0.txt" + }, + { + "key": "CDDL1.1", + "file": "cddl1.1.txt" + }, + { + "key": "MITL", + "file": "mitl.txt" + }, + { + "key": "JDOML", + "file": "jdoml.txt" + } + ] +} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/licenses/asl2.0.txt b/java/com.sap.sailing.gwt.ui/licenses/asl2.0.txt new file mode 100644 index 00000000000..29dc2956c2a --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/licenses/asl2.0.txt @@ -0,0 +1,54 @@ +Apache License + +Version 2.0, January 2004 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of this License; and +You must cause any modified files to carry prominent notices stating that You changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + +You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + diff --git a/java/com.sap.sailing.gwt.ui/licenses/cddl1.0.txt b/java/com.sap.sailing.gwt.ui/licenses/cddl1.0.txt new file mode 100644 index 00000000000..31f9d49afa3 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/licenses/cddl1.0.txt @@ -0,0 +1,129 @@ +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0 (CDDL-1.0) + +1. Definitions. + +1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications. + +1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. + +1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. + +1.4. Executable means the Covered Software in any form other than Source Code. + +1.5. Initial Developer means the individual or entity that first makes Original Software available under this License. + +1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. + +1.7. License means this document. + +1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. + +1.9. Modifications means the Source Code and Executable form of any of the following: + +A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; + +B. Any new file that contains any part of the Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made available under the terms of this License. + +1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License. + +1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. + +1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. + +1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License. + +(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. + +6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant. + +6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a commercial item, as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. 252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/licenses/cddl1.1.txt b/java/com.sap.sailing.gwt.ui/licenses/cddl1.1.txt new file mode 100644 index 00000000000..9165594e8b0 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/licenses/cddl1.1.txt @@ -0,0 +1,148 @@ +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1 + +1. Definitions. + +1.1. “Contributor” means each individual or entity that creates or contributes to the creation of Modifications. + +1.2. “Contributor Version” means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. + +1.3. “Covered Software” means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. + +1.4. “Executable” means the Covered Software in any form other than Source Code. + +1.5. “Initial Developer” means the individual or entity that first makes Original Software available under this License. + +1.6. “Larger Work” means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. + +1.7. “License” means this document. + +1.8. “Licensable” means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. + +1.9. “Modifications” means the Source Code and Executable form of any of the following: + + +A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; + +B. Any new file that contains any part of the Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made available under the terms of this License. + +1.10. “Original Software” means the Source Code and Executable form of computer software code that is originally released under this License. + +1.11. “Patent Claims” means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. + +1.12. “Source Code” means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. + +1.13. “You” (or “Your”) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, “You” includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. +2. License Grants. +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: + + +(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License. + +(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license: + + +(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent license is granted: + + +(1) for any code that Contributor has deleted from the Contributor Version; + +(2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or + +(3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor. + + +3. Distribution Obligations. +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients' rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient's rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software. + + +4. Versions of the License. +4.1. New Versions. + +Oracle is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License. + + +5. DISCLAIMER OF WARRANTY. +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + + + +6. TERMINATION. +6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. + +6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as “Participant”) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant. + +6.3. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. + +6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination. + + +7. LIMITATION OF LIABILITY. +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + + + +8. U.S. GOVERNMENT END USERS. +The Covered Software is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial computer software documentation” as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License. + + + +9. MISCELLANEOUS. +This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software. + + + +10. RESPONSIBILITY FOR CLAIMS. +As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. + + +________________________________________ +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) +The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. diff --git a/java/com.sap.sailing.gwt.ui/licenses/jdoml.txt b/java/com.sap.sailing.gwt.ui/licenses/jdoml.txt new file mode 100644 index 00000000000..ab9d564c5c7 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/licenses/jdoml.txt @@ -0,0 +1,17 @@ +Jdom License +Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the disclaimer that follows these conditions in the documentation and/or other materials provided with the distribution. +3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact {request_AT_jdom_DOT_org}. +4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management {request_AT_jdom_DOT_org}. + +In addition, we request (but do not require) that you include in the end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: +      "This product includes software developed by the JDOM Project (http://www.jdom.org/)." + +Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/licenses/mitl.txt b/java/com.sap.sailing.gwt.ui/licenses/mitl.txt new file mode 100644 index 00000000000..e1dd696d3b6 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/licenses/mitl.txt @@ -0,0 +1,9 @@ +The MIT License (MIT) + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/PlayerActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/PlayerActivity.java index bb96e0c663b..beee0dd84ec 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/PlayerActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/player/PlayerActivity.java @@ -79,7 +79,7 @@ public class PlayerActivity extends AbstractActivity { final String defaultMedia = GwtHttpRequestUtils.getStringParameter(RaceBoardViewConfiguration.PARAM_DEFAULT_MEDIA, null /* default */); return new RaceBoardViewConfiguration(activeCompetitorsFilterSetName, showLeaderboard, - showWindChart, showCompetitorsChart, showViewStreamlets, showViewStreamletColors, showViewSimulation, /* canReplayWhileLiveIsPossible */false, autoSelectMedia, defaultMedia); + showWindChart, showCompetitorsChart, showViewStreamlets, showViewStreamletColors, showViewSimulation, autoSelectMedia, defaultMedia); } private void createErrorView(String errorMessage, Throwable errorReason, AcceptsOneWidget panel) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderResources.java index e283365c099..c36d56504b2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/SAPHeaderResources.java @@ -21,6 +21,6 @@ public interface SAPHeaderResources extends ClientBundle { String pagetitle(); } - @Source("com/sap/sailing/gwt/home/images/logo-small@2x.png") + @Source("logo-small@2x.png") ImageResource logo(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/images/logo-small@2x.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/logo-small@2x.png similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/images/logo-small@2x.png rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/shared/header/logo-small@2x.png diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/SourceCommon.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/SourceCommon.gwt.xml index 18dcacc8ba8..2d7a1f057a0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/SourceCommon.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/SourceCommon.gwt.xml @@ -3,9 +3,9 @@ + - - + \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/SharedResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/SharedResources.java index 3430d1a0c71..85a124f04dd 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/SharedResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/SharedResources.java @@ -3,17 +3,18 @@ package com.sap.sailing.gwt.common.client; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; +import com.sap.sse.gwt.common.CommonSharedResources; -public interface SharedResources extends ClientBundle { +public interface SharedResources extends ClientBundle, CommonSharedResources { public static final SharedResources INSTANCE = GWT.create(SharedResources.class); - @Source("com/sap/sailing/gwt/home/main.gss") + @Source("main.gss") MainCss mainCss(); - @Source("com/sap/sailing/gwt/home/media.gss") + @Source("media.gss") MediaCss mediaCss(); - public interface MainCss extends CssResource{ + public interface MainCss extends CssResource, CommonMainCss { String mobile(); String desktop(); String wrapper(); @@ -27,6 +28,7 @@ public interface SharedResources extends ClientBundle { String buttonstrong(); String buttoninactive(); String buttonprimary(); + String buttonprimaryoutlined(); String buttonred(); String buttonrefresh(); String buttonarrowdown(); @@ -40,6 +42,11 @@ public interface SharedResources extends ClientBundle { String mainsection_header(); String mainsection_header_title(); String mainsection_navigation(); + String input(); + String input_label(); + String input_input(); + String input_inputerror(); + String input_errortext(); String lightbox(); String lightbox_overlay(); String lightbox_content(); @@ -70,7 +77,7 @@ public interface SharedResources extends ClientBundle { String fleetcorner(); } - public interface MediaCss extends CssResource{ + public interface MediaCss extends CssResource, CommonMediaCss { String grid(); String stackenblochen(); String column(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/controls/tabbar/TabPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/controls/tabbar/TabPanel.java index be2cd7fb6ed..74d5718e6f9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/controls/tabbar/TabPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/controls/tabbar/TabPanel.java @@ -24,7 +24,6 @@ import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.common.client.controls.tabbar.TabView.State; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; /** * Defines whole layout for site, including the header with the breadcrumbs and tab bar, and the content. @@ -32,11 +31,11 @@ import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; * Created by pgtaboada on 25.11.14. */ -public class TabPanel extends Composite { +public class TabPanel> extends Composite { private static final Logger logger = Logger.getLogger(TabPanel.class.getName()); private static TabPanelUiBinder ourUiBinder = GWT.create(TabPanelUiBinder.class); - private final Map, TabView> knownTabs = new LinkedHashMap<>(); - private final Map, String> knownTabTitles = new HashMap<>(); + private final Map, TABVIEW> knownTabs = new LinkedHashMap<>(); + private final Map, String> knownTabTitles = new HashMap<>(); @UiField SimplePanel additionalHeader; @@ -47,7 +46,7 @@ public class TabPanel extends Composite { @UiField BreadcrumbPane breadcrumbs; @UiField DivElement breadcrumbsContainer; @UiField FlowPanel tabExtension; - private TabView currentTab; + private TABVIEW currentTab; private final PlaceHistoryMapper historyMapper; @@ -58,12 +57,10 @@ public class TabPanel extends Composite { this.historyMapper = historyMapper; initWidget(ourUiBinder.createAndBindUi(this)); - if(ExperimentalFeatures.USE_NAVIGATION_PATH_DISPLAY_ON_DESKTOP) { - breadcrumbsContainer.getStyle().setDisplay(Display.NONE); - } + breadcrumbsContainer.getStyle().setDisplay(Display.NONE); } - public TabView getCurrentTab() { + public TABVIEW getCurrentTab() { return currentTab; } @@ -80,20 +77,20 @@ public class TabPanel extends Composite { * @param title * The label for the tab. */ + @SuppressWarnings("unchecked") @UiChild - public void addTabContent(final TabView tab, String title) { - + public void addTabContent(final TABVIEW tab, String title) { GWT.log("Adding TAB: " + title); // TODO: check if place class already known, reject... tab.setPresenter(presenter); - final Class classForActivation = tab.getPlaceClassForActivation(); + final Class classForActivation = tab.getPlaceClassForActivation(); knownTabs.put(classForActivation, tab); knownTabTitles.put(classForActivation, title); if(tab.getState() == State.VISIBLE) { String link = "#" + historyMapper.getToken(tab.placeToFire()); - tabBar.addTab(title, classForActivation, link); + tabBar.addTab(title, (Class) classForActivation, link); } } @@ -123,13 +120,13 @@ public class TabPanel extends Composite { * @param placeToGo * the given place. */ - public void activatePlace(Place placeToGo) { + public void activatePlace(PLACE placeToGo) { if (knownTabs.containsKey(placeToGo.getClass())) { - final TabView newTab = knownTabs.get(placeToGo.getClass()); + final TABVIEW newTab = knownTabs.get(placeToGo.getClass()); if (newTab.getState() == State.NOT_AVAILABLE_REDIRECT || newTab.getState() == State.NOT_AVAILABLE_SHOW_NEXT_AVAILABLE) { - for(TabView tab : knownTabs.values()) { + for(TabView tab : knownTabs.values()) { if(tab.getState() == State.VISIBLE) { // TODO is this redirect wanted? Just silently select another tab? if (currentTab != null) { @@ -181,7 +178,7 @@ public class TabPanel extends Composite { return addHandler(handler, TabPanelPlaceSelectionEvent.TYPE); } - interface TabPanelUiBinder extends UiBinder> { + interface TabPanelUiBinder extends UiBinder> { } public String getCurrentTabTitle() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.java index 52ebec1c989..620d42b0b8c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.java @@ -229,4 +229,6 @@ public interface TextMessages extends Messages { String strategySimulatorReadMore(); + String impressum(); + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties index deb9bb5855e..1e63b9ef221 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties @@ -221,3 +221,5 @@ strategySimulator=Strategy Simulator contentStrategySimulator=Choosing the right strategy can provide great competitive advantage during a race. The Strategy Simulator simplifies determining the best sailing strategy for various wind conditions and water currents. Since wind and current can be changed in the simulation right away, the robustness of a strategy can be easily evaluated even for uncertain weather conditions. strategySimulatorReadMore=Learn More + +impressum=Imprint diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties index 65b4c391adf..1d7471d30cd 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties @@ -221,3 +221,5 @@ strategySimulator=Strategie-Simulator contentStrategySimulator=Während eines Rennens hängt viel von der Wahl der richtigen Strategie ab. Der Strategie-Simulator vereinfacht die Ermittlung der besten Segelstrategie für diverse Wind- und Strömungsbedingungen. Da Wind und Strömung sofort in der Simulation geändert werden können, lässt sich die Robustheit einer Strategie selbst für unsichere Wetterbedingungen problemlos bewerten. strategySimulatorReadMore=Mehr erfahren + +impressum=Impressum diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/main.gss similarity index 95% rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.gss rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/main.gss index ef74f7a328f..783c6478425 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/main.gss +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/main.gss @@ -167,6 +167,16 @@ figcaption { .buttonprimary:hover { background-color: #0081b8; } +.buttonprimaryoutlined { + background-color: transparent; + padding: .533333333333333em 1.333333333333333em; + border: 1px solid #008fcc; + color: #008fcc; +} +.buttonprimaryoutlined:hover { + background-color: #0081b8; + color: #fff; +} .buttonred { background-color: #e94a1b; } @@ -399,6 +409,35 @@ figcaption { .mainsection_navigation { text-align: center; } +.input { + width: 100%; + padding: 0.333333333333333em 0; + display: inline-block; +} +.input_label { + font-weight: 600; + margin-top: 1.333333333333333em; + line-height: 1.333333333333333em; + margin-bottom: 0.333333333333333em; +} +.input:first-of-type .input_label { + margin-top: 0.666666666666667em; +} +.input_input { + width: 100%; + color: #333; + padding: 0.6em 1.333333333333333em; + border-radius: 0.2em; + border: 1px solid #dedede; +} +.input_inputerror { + border: 1px solid #f00; +} +.input_errortext { + color: #f00; + font-size: 0.8em; + margin: -0.266666666666667em 0 0.333333333333333em; +} .lightbox { font-size: 1rem; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/media.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/media.gss similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/media.gss rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/media.gss diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/celltable/CleanCellTable.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/celltable/CleanCellTable.css similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/celltable/CleanCellTable.css rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/celltable/CleanCellTable.css diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/celltable/CleanCellTableResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/celltable/CleanCellTableResources.java similarity index 89% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/celltable/CleanCellTableResources.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/celltable/CleanCellTableResources.java index 6479d5c9e1d..99e5313c3f1 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/celltable/CleanCellTableResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/celltable/CleanCellTableResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.celltable; +package com.sap.sailing.gwt.common.theme.component.celltable; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/celltable/StyledHeaderOrFooterBuilder.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/celltable/StyledHeaderOrFooterBuilder.java similarity index 99% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/celltable/StyledHeaderOrFooterBuilder.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/celltable/StyledHeaderOrFooterBuilder.java index ddbfb3fb253..9bc2937ad2a 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/celltable/StyledHeaderOrFooterBuilder.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/celltable/StyledHeaderOrFooterBuilder.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.celltable; +package com.sap.sailing.gwt.common.theme.component.celltable; import com.google.gwt.cell.client.Cell.Context; import com.google.gwt.dom.builder.shared.TableCellBuilder; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/Image.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/Image.java similarity index 93% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/Image.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/Image.java index 6c9040b5958..e56f312e13a 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/Image.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/Image.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.imagegallery; +package com.sap.sailing.gwt.common.theme.component.imagegallery; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.DivElement; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/Image.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/Image.ui.xml similarity index 63% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/Image.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/Image.ui.xml index db187784f7e..03c905c2a93 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/Image.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/Image.ui.xml @@ -1,8 +1,8 @@ - - + +
diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageDescriptor.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageDescriptor.java similarity index 97% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageDescriptor.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageDescriptor.java index 9bf7c5058df..fdd0f4c0d83 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageDescriptor.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageDescriptor.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.imagegallery; +package com.sap.sailing.gwt.common.theme.component.imagegallery; import java.util.Date; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGallery.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGallery.gss similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGallery.gss rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGallery.gss diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGallery.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGallery.java similarity index 95% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGallery.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGallery.java index 8e3bf8d43d0..5b33a7d7982 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGallery.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGallery.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.imagegallery; +package com.sap.sailing.gwt.common.theme.component.imagegallery; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.DivElement; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGallery.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGallery.ui.xml similarity index 63% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGallery.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGallery.ui.xml index b62f743827f..41e8f10894f 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGallery.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGallery.ui.xml @@ -1,8 +1,8 @@ - - + +
diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGalleryData.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGalleryData.java similarity index 92% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGalleryData.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGalleryData.java index c0b2618ecf6..6d95f941b78 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGalleryData.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGalleryData.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.imagegallery; +package com.sap.sailing.gwt.common.theme.component.imagegallery; import java.util.ArrayList; import java.util.List; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGalleryResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGalleryResources.java similarity index 87% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGalleryResources.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGalleryResources.java index b51de3ceda3..b4e3a49fc6e 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/imagegallery/ImageGalleryResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/imagegallery/ImageGalleryResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.imagegallery; +package com.sap.sailing.gwt.common.theme.component.imagegallery; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicator.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicator.gss similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicator.gss rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicator.gss diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicator.java similarity index 89% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicator.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicator.java index f385113684f..8ec072a61b5 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicator.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.loadingindicator; +package com.sap.sailing.gwt.common.theme.component.loadingindicator; import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicator.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicator.ui.xml similarity index 58% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicator.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicator.ui.xml index 2e51dbe3527..80a2381694b 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicator.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicator.ui.xml @@ -1,8 +1,8 @@ - - + + Loading... diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicatorResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicatorResources.java similarity index 87% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicatorResources.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicatorResources.java index 4e3672bb46c..974303e64f4 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/loadingindicator/LoadingIndicatorResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/loadingindicator/LoadingIndicatorResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.loadingindicator; +package com.sap.sailing.gwt.common.theme.component.loadingindicator; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooter.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooter.gss similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooter.gss rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooter.gss diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooter.java similarity index 97% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooter.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooter.java index 88fc59bed9c..2eb17b06120 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooter.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.sapfooter; +package com.sap.sailing.gwt.common.theme.component.sapfooter; import java.util.HashMap; import java.util.Map; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooter.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooter.ui.xml new file mode 100644 index 00000000000..b3aadc99bb2 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooter.ui.xml @@ -0,0 +1,47 @@ + + + + + + + + + + \ No newline at end of file diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooterResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooterResources.java similarity index 81% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooterResources.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooterResources.java index 0009fba40a4..68f9a4a0459 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooterResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapfooter/SAPFooterResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.sapfooter; +package com.sap.sailing.gwt.common.theme.component.sapfooter; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; @@ -7,7 +7,7 @@ import com.google.gwt.resources.client.CssResource; public interface SAPFooterResources extends ClientBundle { public static final SAPFooterResources INSTANCE = GWT.create(SAPFooterResources.class); - @Source("com/sap/sse/gwt/theme/client/component/sapfooter/SAPFooter.gss") + @Source("SAPFooter.gss") LocalCss css(); public interface LocalCss extends CssResource { diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeader.gss similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeader.gss rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeader.gss diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeader.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeader.java similarity index 93% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeader.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeader.java index 83e30aaa36f..fec03a28200 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeader.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeader.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.sapheader; +package com.sap.sailing.gwt.common.theme.component.sapheader; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; @@ -12,7 +12,7 @@ import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; -import com.sap.sse.gwt.theme.client.util.FullscreenUtil; +import com.sap.sailing.gwt.common.theme.util.FullscreenUtil; public class SAPHeader extends Composite { private static SAPHeaderUiBinder uiBinder = GWT.create(SAPHeaderUiBinder.class); diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeader.ui.xml similarity index 76% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeader.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeader.ui.xml index 1138ddaf708..8038ddb91ce 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeader.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeader.ui.xml @@ -1,8 +1,12 @@ - - + + +
diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeaderResources.java similarity index 92% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeaderResources.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeaderResources.java index dbc04cc3d51..46a02ba21ba 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/SAPHeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/SAPHeaderResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.sapheader; +package com.sap.sailing.gwt.common.theme.component.sapheader; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/logo-small@2x.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/logo-small@2x.png similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader/logo-small@2x.png rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader/logo-small@2x.png diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeader2.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeader2.gss similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeader2.gss rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeader2.gss diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeader2.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeader2.java similarity index 94% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeader2.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeader2.java index 86ae1450f35..e7eb7073db6 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeader2.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeader2.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.sapheader2; +package com.sap.sailing.gwt.common.theme.component.sapheader2; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.DivElement; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeader2.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeader2.ui.xml similarity index 73% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeader2.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeader2.ui.xml index 4a3f28cb85b..fda78514b90 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeader2.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeader2.ui.xml @@ -1,8 +1,12 @@ - - + + +
diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeaderResources.java similarity index 92% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeaderResources.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeaderResources.java index 2c3ebc3744c..28b6f5945b7 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/SAPHeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/SAPHeaderResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.sapheader2; +package com.sap.sailing.gwt.common.theme.component.sapheader2; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/logo-small@2x.png b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/logo-small@2x.png similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/sapheader2/logo-small@2x.png rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/sapheader2/logo-small@2x.png diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoDescriptor.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoDescriptor.java similarity index 97% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoDescriptor.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoDescriptor.java index 5b7c5c197f0..7fc38369f17 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoDescriptor.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoDescriptor.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.videogallery; +package com.sap.sailing.gwt.common.theme.component.videogallery; import java.util.Date; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGallery.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGallery.gss similarity index 100% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGallery.gss rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGallery.gss diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGallery.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGallery.java similarity index 94% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGallery.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGallery.java index 8aab0398680..aef4331a35e 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGallery.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGallery.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.videogallery; +package com.sap.sailing.gwt.common.theme.component.videogallery; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.DivElement; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGallery.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGallery.ui.xml new file mode 100644 index 00000000000..2e3e7024591 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGallery.ui.xml @@ -0,0 +1,14 @@ + + + + + + + Video gallery... +
+ + diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGalleryData.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGalleryData.java similarity index 92% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGalleryData.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGalleryData.java index 44b67c4a3c3..28e4e8106e3 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGalleryData.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGalleryData.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.videogallery; +package com.sap.sailing.gwt.common.theme.component.videogallery; import java.util.ArrayList; import java.util.List; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGalleryResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGalleryResources.java similarity index 87% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGalleryResources.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGalleryResources.java index 3bc08cc64e2..2bea511ecd9 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/component/videogallery/VideoGalleryResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/component/videogallery/VideoGalleryResources.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.component.videogallery; +package com.sap.sailing.gwt.common.theme.component.videogallery; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; diff --git a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/util/FullscreenUtil.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/util/FullscreenUtil.java similarity index 94% rename from java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/util/FullscreenUtil.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/util/FullscreenUtil.java index 27ff25bebd3..3022cc4d804 100644 --- a/java/com.sap.sse.gwt.theme/src/main/java/com/sap/sse/gwt/theme/client/util/FullscreenUtil.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/theme/util/FullscreenUtil.java @@ -1,4 +1,4 @@ -package com.sap.sse.gwt.theme.client.util; +package com.sap.sailing.gwt.common.theme.util; /** * A utility class to set the browser to fullscreen mode diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/Action.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/Action.java deleted file mode 100644 index 741ad66db19..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/Action.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client; - -import com.google.gwt.core.shared.GwtIncompatible; -import com.google.gwt.user.client.rpc.IsSerializable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; - -public interface Action extends IsSerializable { - - @GwtIncompatible - R execute(CTX ctx) throws DispatchException; - -} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/CollectionResult.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/CollectionResult.java deleted file mode 100644 index 8986fd56edc..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/CollectionResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client; - -import java.util.Collection; - -public interface CollectionResult extends DTO, Result { - Collection getValues(); -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/DispatchAsync.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/DispatchAsync.java deleted file mode 100644 index 0429ec1f339..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/DispatchAsync.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface DispatchAsync { - - > void execute(A action, AsyncCallback callback); - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/DispatchContext.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/DispatchContext.java deleted file mode 100644 index 8af814da120..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/DispatchContext.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client; - -import java.net.URL; - -import javax.servlet.http.HttpServletRequest; - -import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; - - -public interface DispatchContext { - @GwtIncompatible - HttpServletRequest getRequest(); - - @GwtIncompatible - URL getRequestBaseURL() throws DispatchException; -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/Result.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/Result.java deleted file mode 100644 index 3f72b9719ba..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/Result.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client; - -import com.google.gwt.user.client.rpc.IsSerializable; - -public interface Result extends IsSerializable { - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/batching/NonBatchableAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/batching/NonBatchableAction.java deleted file mode 100644 index 41cde73e1b6..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/batching/NonBatchableAction.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client.batching; - -public interface NonBatchableAction { - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/caching/IsClientCacheable.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/caching/IsClientCacheable.java deleted file mode 100644 index 75b2de6eb1e..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/caching/IsClientCacheable.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client.caching; - -/** - * Cache interface used by the caching dispatch to identify which command can be cached on client side. - * - * @author pgtaboada - * - */ -public interface IsClientCacheable { - - /** - * The instance specific key used to identify instance specific results in the cache. - * - * @return - */ - void cacheInstanceKey(StringBuilder key); -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/exceptions/ServerDispatchException.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/exceptions/ServerDispatchException.java deleted file mode 100644 index 0661775bc66..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/exceptions/ServerDispatchException.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client.exceptions; - -import java.util.UUID; - - -public class ServerDispatchException extends DispatchException { - - private static final long serialVersionUID = 8192187255698006941L; - private String uuid; - - protected ServerDispatchException() { - } - - public ServerDispatchException(String uuid, Throwable cause) { - super(cause.getMessage()); - this.uuid = uuid; - } - - public ServerDispatchException(Throwable cause) { - super(cause.getMessage()); - this.uuid = UUID.randomUUID().toString(); - } - - public String getUuid() { - return uuid; - } - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/impl/DispatchSystem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/impl/DispatchSystem.java deleted file mode 100644 index 384158a59da..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/impl/DispatchSystem.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client.impl; - -import java.util.Date; - -import com.sap.sailing.gwt.dispatch.client.DispatchAsync; -import com.sap.sailing.gwt.dispatch.client.DispatchContext; - -public interface DispatchSystem extends DispatchAsync { - Date getCurrentServerTime(); -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/impl/DispatchSystemImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/impl/DispatchSystemImpl.java deleted file mode 100644 index b90d0b900f5..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/impl/DispatchSystemImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client.impl; - -import java.util.Date; - -import com.google.gwt.core.shared.GWT; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.sap.sailing.gwt.dispatch.client.Action; -import com.sap.sailing.gwt.dispatch.client.DispatchAsync; -import com.sap.sailing.gwt.dispatch.client.DispatchContext; -import com.sap.sailing.gwt.dispatch.client.Result; -import com.sap.sailing.gwt.dispatch.client.batching.AutomaticBatchingDispatch; -import com.sap.sailing.gwt.dispatch.client.caching.CachingDispatch; -import com.sap.sailing.gwt.dispatch.client.exceptions.ServerDispatchException; -import com.sap.sailing.gwt.dispatch.client.rpcimpl.SimpleDispatch; - -public class DispatchSystemImpl implements DispatchSystem { - - private final SimpleDispatch simpleDispatch; - private final DispatchAsync dispatch; - - public DispatchSystemImpl(String dispatchRPCPath) { - this(dispatchRPCPath, false); - } - - public DispatchSystemImpl(String dispatchRPCPath, boolean processResultsScheduled) { - simpleDispatch = new SimpleDispatch(dispatchRPCPath); - dispatch = new CachingDispatch(new AutomaticBatchingDispatch( - simpleDispatch, processResultsScheduled)); - } - - @Override - public > void execute(final A action, final AsyncCallback callback) { - // TODO: client side execution time logging - AsyncCallback wrappedCallback = new AsyncCallback() { - @Override - public void onFailure(Throwable caught) { - if (caught instanceof ServerDispatchException) { - ServerDispatchException sde = (ServerDispatchException) caught; - // TODO: browser console log - GWT.log("Server exception with id: " + sde.getUuid()); - } - callback.onFailure(caught); - } - - @Override - public void onSuccess(R result) { - callback.onSuccess(result); - } - }; - dispatch.execute(action, wrappedCallback); - } - - @Override - public Date getCurrentServerTime() { - return new Date(System.currentTimeMillis() + simpleDispatch.getClientServerOffset()); - } -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/rpcimpl/DispatchRPC.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/rpcimpl/DispatchRPC.java deleted file mode 100644 index 600d7fa6c2a..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/dispatch/client/rpcimpl/DispatchRPC.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.sap.sailing.gwt.dispatch.client.rpcimpl; - -import com.google.gwt.user.client.rpc.RemoteService; -import com.sap.sailing.gwt.dispatch.client.Action; -import com.sap.sailing.gwt.dispatch.client.DispatchContext; -import com.sap.sailing.gwt.dispatch.client.Result; -import com.sap.sailing.gwt.dispatch.client.ResultWrapper; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; - -public interface DispatchRPC extends RemoteService { - - > ResultWrapper execute( - RequestWrapper action) throws DispatchException; - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/Home.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/Home.gwt.xml index 4110f0aa78a..838ad027bb7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/Home.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/Home.gwt.xml @@ -3,15 +3,16 @@ - + - + + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingAction.java index 75f5b8cd6db..6916c74c908 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingAction.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.home.communication; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.Action; -import com.sap.sailing.gwt.dispatch.client.Result; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; +import com.sap.sse.gwt.dispatch.shared.commands.Action; +import com.sap.sse.gwt.dispatch.shared.commands.Result; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; public interface SailingAction extends Action { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchContext.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchContext.java index 7baa29b4339..a7233e60d5e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchContext.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchContext.java @@ -4,9 +4,9 @@ import java.util.Date; import java.util.Locale; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.DispatchContext; import com.sap.sailing.news.EventNewsService; import com.sap.sailing.server.RacingEventService; +import com.sap.sse.gwt.dispatch.client.system.DispatchContext; public interface SailingDispatchContext extends DispatchContext { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchSystem.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchSystem.java index 9a5a12125a8..f6b660a490c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchSystem.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchSystem.java @@ -1,8 +1,8 @@ package com.sap.sailing.gwt.home.communication; -import com.sap.sailing.gwt.dispatch.client.impl.DispatchSystem; - -public interface SailingDispatchSystem extends DispatchSystem { +import com.sap.sse.gwt.dispatch.client.system.DispatchSystemAsync; +import com.sap.sse.gwt.dispatch.client.system.ProvidesServerTime; +public interface SailingDispatchSystem extends DispatchSystemAsync, ProvidesServerTime { } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchSystemImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchSystemImpl.java index db62ef9885d..0becb810879 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchSystemImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/SailingDispatchSystemImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.home.communication; -import com.sap.sailing.gwt.dispatch.client.impl.DispatchSystemImpl; import com.sap.sailing.gwt.ui.client.RemoteServiceMappingConstants; +import com.sap.sse.gwt.dispatch.client.system.DispatchSystemDefaultImpl; -public class SailingDispatchSystemImpl extends DispatchSystemImpl implements +public class SailingDispatchSystemImpl extends DispatchSystemDefaultImpl implements SailingDispatchSystem { public SailingDispatchSystemImpl() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/EventReferenceDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/EventReferenceDTO.java index d504d8d50e8..825d5c393e5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/EventReferenceDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/EventReferenceDTO.java @@ -4,7 +4,7 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.EventBase; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class EventReferenceDTO implements DTO { private UUID id; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/EventSeriesReferenceDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/EventSeriesReferenceDTO.java index 1ed04317461..d2a6e9ffefb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/EventSeriesReferenceDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/EventSeriesReferenceDTO.java @@ -2,7 +2,7 @@ package com.sap.sailing.gwt.home.communication.event; import java.util.UUID; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class EventSeriesReferenceDTO implements DTO { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetCompetitionFormatRacesAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetCompetitionFormatRacesAction.java index f43e21ec259..bfc213fe9dd 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetCompetitionFormatRacesAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetCompetitionFormatRacesAction.java @@ -3,15 +3,15 @@ package com.sap.sailing.gwt.home.communication.event; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ListResult; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sailing.gwt.home.server.RaceCompetitionFormatDataCalculator; import com.sap.sse.common.Duration; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ListResult; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; public class GetCompetitionFormatRacesAction implements SailingAction>>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetEventListViewAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetEventListViewAction.java index 541b21d05f3..81741e5ad66 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetEventListViewAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetEventListViewAction.java @@ -1,12 +1,12 @@ package com.sap.sailing.gwt.home.communication.event; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.eventlist.EventListViewDTO; import com.sap.sailing.gwt.server.EventListDataCalculator; import com.sap.sailing.gwt.server.HomeServiceUtil; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; public class GetEventListViewAction implements SailingAction, IsClientCacheable { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetEventViewAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetEventViewAction.java index dcc1bd659a2..e536fd86ad1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetEventViewAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetEventViewAction.java @@ -12,7 +12,6 @@ import java.util.logging.Logger; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.leaderboard.LeaderboardGroup; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.eventview.EventViewDTO; @@ -23,6 +22,7 @@ import com.sap.sailing.gwt.home.server.LeaderboardContext; import com.sap.sailing.gwt.home.server.EventActionUtil.LeaderboardCallback; import com.sap.sailing.gwt.server.HomeServiceUtil; import com.sap.sse.common.media.MediaTagConstants; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; import com.sap.sse.shared.media.ImageDescriptor; public class GetEventViewAction implements SailingAction, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetFinishedRacesAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetFinishedRacesAction.java index 23b6726517a..ee5a8df3853 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetFinishedRacesAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetFinishedRacesAction.java @@ -3,14 +3,14 @@ package com.sap.sailing.gwt.home.communication.event; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.SortedSetResult; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sailing.gwt.home.server.RaceListDataCalculator; import com.sap.sse.common.Duration; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; +import com.sap.sse.gwt.dispatch.shared.commands.SortedSetResult; public class GetFinishedRacesAction implements SailingAction>>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetLiveRacesForEventAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetLiveRacesForEventAction.java index b8a35cfabe1..a8a33ee4bbc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetLiveRacesForEventAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetLiveRacesForEventAction.java @@ -4,14 +4,14 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.SortedSetResult; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sailing.gwt.home.server.LiveRaceCalculator; import com.sap.sailing.gwt.home.server.EventActionUtil.CalculationWithEvent; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; +import com.sap.sse.gwt.dispatch.shared.commands.SortedSetResult; public class GetLiveRacesForEventAction implements SailingAction>>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetLiveRacesForRegattaAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetLiveRacesForRegattaAction.java index 084599b6df9..a112a3ce858 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetLiveRacesForRegattaAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetLiveRacesForRegattaAction.java @@ -4,14 +4,14 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.SortedSetResult; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sailing.gwt.home.server.LiveRaceCalculator; import com.sap.sailing.gwt.home.server.EventActionUtil.CalculationWithEvent; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; +import com.sap.sse.gwt.dispatch.shared.commands.SortedSetResult; public class GetLiveRacesForRegattaAction implements SailingAction>>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaListViewAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaListViewAction.java index 44ac7978b31..9c3d95c921b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaListViewAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaListViewAction.java @@ -5,9 +5,6 @@ import java.util.List; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.SortedSetResult; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.regatta.RegattaWithProgressDTO; @@ -15,6 +12,9 @@ import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sailing.gwt.home.server.LeaderboardContext; import com.sap.sailing.gwt.home.server.EventActionUtil.LeaderboardCallback; import com.sap.sse.common.Duration; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; +import com.sap.sse.gwt.dispatch.shared.commands.SortedSetResult; public class GetRegattaListViewAction implements SailingAction>>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaStatisticsAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaStatisticsAction.java index efbc5ba8af5..a535f468449 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaStatisticsAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaStatisticsAction.java @@ -3,14 +3,14 @@ package com.sap.sailing.gwt.home.communication.event; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.event.statistics.EventStatisticsDTO; import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sailing.gwt.home.server.StatisticsCalculator; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; public class GetRegattaStatisticsAction implements SailingAction>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaWithProgressAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaWithProgressAction.java index 210ff2ed9b2..6b461b9ee75 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaWithProgressAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattaWithProgressAction.java @@ -3,13 +3,13 @@ package com.sap.sailing.gwt.home.communication.event; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.regatta.RegattaWithProgressDTO; import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sse.common.Duration; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; public class GetRegattaWithProgressAction implements SailingAction>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattasAndLiveRacesForEventAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattasAndLiveRacesForEventAction.java index b70f6c18a2c..0cc8e2d8083 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattasAndLiveRacesForEventAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetRegattasAndLiveRacesForEventAction.java @@ -9,8 +9,6 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.eventview.RegattaMetadataDTO; @@ -21,6 +19,8 @@ import com.sap.sailing.gwt.home.server.EventActionUtil.LeaderboardCallback; import com.sap.sailing.gwt.home.server.EventActionUtil.RaceCallback; import com.sap.sailing.gwt.server.HomeServiceUtil; import com.sap.sse.common.Duration; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; public class GetRegattasAndLiveRacesForEventAction implements SailingAction>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetSeriesStatisticsAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetSeriesStatisticsAction.java index 8a8bcbe8ee3..798a0030ff6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetSeriesStatisticsAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/GetSeriesStatisticsAction.java @@ -3,14 +3,14 @@ package com.sap.sailing.gwt.home.communication.event; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.event.statistics.EventStatisticsDTO; import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sailing.gwt.home.server.StatisticsCalculator; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; public class GetSeriesStatisticsAction implements SailingAction>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/RaceCompetitionFormatSeriesDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/RaceCompetitionFormatSeriesDTO.java index 84cf893b08a..07573240129 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/RaceCompetitionFormatSeriesDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/RaceCompetitionFormatSeriesDTO.java @@ -3,7 +3,7 @@ package com.sap.sailing.gwt.home.communication.event; import java.util.ArrayList; import java.util.Collection; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class RaceCompetitionFormatSeriesDTO implements DTO { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/RegattasAndLiveRacesDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/RegattasAndLiveRacesDTO.java index c443a48695f..62b4d35f831 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/RegattasAndLiveRacesDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/RegattasAndLiveRacesDTO.java @@ -5,8 +5,8 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import com.sap.sailing.gwt.dispatch.client.DTO; import com.sap.sailing.gwt.home.communication.eventview.RegattaMetadataDTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class RegattasAndLiveRacesDTO implements DTO { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/eventoverview/EventOverviewStageDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/eventoverview/EventOverviewStageDTO.java index 45f8ae04d36..ad8cad59304 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/eventoverview/EventOverviewStageDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/eventoverview/EventOverviewStageDTO.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.home.communication.event.eventoverview; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class EventOverviewStageDTO implements DTO { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/eventoverview/GetEventOverviewStageAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/eventoverview/GetEventOverviewStageAction.java index 7c0aa231ef6..bb572bf7590 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/eventoverview/GetEventOverviewStageAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/eventoverview/GetEventOverviewStageAction.java @@ -9,8 +9,6 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.event.EventState; @@ -20,6 +18,8 @@ import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.common.media.MediaTagConstants; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; import com.sap.sse.shared.media.VideoDescriptor; public class GetEventOverviewStageAction implements SailingAction>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniLeaderboardDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniLeaderboardDTO.java index 626355a8ac9..89c9af159ba 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniLeaderboardDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniLeaderboardDTO.java @@ -4,13 +4,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashSet; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class GetMiniLeaderboardDTO implements DTO { private ArrayList items = new ArrayList(); private String scoreCorrectionText; private Date lastScoreUpdate; private boolean live; + private int totalCompetitorCount; public GetMiniLeaderboardDTO() { } @@ -46,7 +47,15 @@ public class GetMiniLeaderboardDTO implements DTO { public void setLive(boolean live) { this.live = live; } - + + public int getTotalCompetitorCount() { + return totalCompetitorCount; + } + + public void setTotalCompetitorCount(int totalCompetitorCount) { + this.totalCompetitorCount = totalCompetitorCount; + } + public boolean hasDifferentRaceCounts() { HashSet uniqueRaceCounts = new HashSet<>(); for (MiniLeaderboardItemDTO item : items) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniLeaderbordAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniLeaderbordAction.java index 40cd8687b76..5d52c29be34 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniLeaderbordAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniLeaderbordAction.java @@ -3,11 +3,11 @@ package com.sap.sailing.gwt.home.communication.event.minileaderboard; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.server.EventActionUtil; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; public class GetMiniLeaderbordAction implements SailingAction>, IsClientCacheable { private UUID eventId; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniOverallLeaderbordAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniOverallLeaderbordAction.java index 17a28f9828f..d45f934f47d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniOverallLeaderbordAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/GetMiniOverallLeaderbordAction.java @@ -3,11 +3,11 @@ package com.sap.sailing.gwt.home.communication.event.minileaderboard; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.server.EventActionUtil; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; public class GetMiniOverallLeaderbordAction implements SailingAction>, IsClientCacheable { private UUID seriesId; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/MiniLeaderboardItemDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/MiniLeaderboardItemDTO.java index c0bfbb5664a..33ca8070b9b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/MiniLeaderboardItemDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/minileaderboard/MiniLeaderboardItemDTO.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.home.communication.event.minileaderboard; -import com.sap.sailing.gwt.dispatch.client.DTO; import com.sap.sailing.gwt.home.communication.event.SimpleCompetitorDTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class MiniLeaderboardItemDTO implements DTO { private SimpleCompetitorDTO competitor; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/news/GetEventOverviewNewsAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/news/GetEventOverviewNewsAction.java index be705aa2a57..b521a5780d1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/news/GetEventOverviewNewsAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/news/GetEventOverviewNewsAction.java @@ -6,9 +6,6 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.gwt.dispatch.client.ListResult; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.server.EventActionUtil; @@ -17,6 +14,9 @@ import com.sap.sailing.news.EventNewsItem; import com.sap.sailing.news.impl.InfoEventNewsItem; import com.sap.sailing.news.impl.LeaderboardUpdateNewsItem; import com.sap.sse.common.Duration; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ListResult; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; public class GetEventOverviewNewsAction implements SailingAction>>, IsClientCacheable { private UUID eventId; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/news/NewsEntryDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/news/NewsEntryDTO.java index 38fddbecf79..8f69743d1e7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/news/NewsEntryDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/news/NewsEntryDTO.java @@ -4,7 +4,7 @@ import java.net.URL; import java.util.Date; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public abstract class NewsEntryDTO implements DTO { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/EventStatisticsDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/EventStatisticsDTO.java index 903affd7ec1..586227a3ab5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/EventStatisticsDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/EventStatisticsDTO.java @@ -4,9 +4,9 @@ import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Speed; -import com.sap.sailing.gwt.dispatch.client.DTO; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Triple; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class EventStatisticsDTO implements DTO { private int regattasFoughtCount; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/GetEventStatisticsAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/GetEventStatisticsAction.java index 60572492799..345c5dfe4df 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/GetEventStatisticsAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/event/statistics/GetEventStatisticsAction.java @@ -3,13 +3,13 @@ package com.sap.sailing.gwt.home.communication.event.statistics; import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.server.EventActionUtil; import com.sap.sailing.gwt.home.server.StatisticsCalculator; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; public class GetEventStatisticsAction implements SailingAction>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventlist/EventListViewDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventlist/EventListViewDTO.java index bac40a3d17e..39d10272b0c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventlist/EventListViewDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventlist/EventListViewDTO.java @@ -2,9 +2,9 @@ package com.sap.sailing.gwt.home.communication.eventlist; import java.util.ArrayList; -import com.sap.sailing.gwt.dispatch.client.DTO; -import com.sap.sailing.gwt.dispatch.client.Result; import com.sap.sailing.gwt.home.communication.event.EventState; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.Result; public class EventListViewDTO implements DTO, Result { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/EventViewDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/EventViewDTO.java index 9c87ec409ce..3a29e720bac 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/EventViewDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/EventViewDTO.java @@ -5,11 +5,11 @@ import java.util.Collection; import java.util.List; import java.util.TreeSet; -import com.sap.sailing.gwt.dispatch.client.Result; import com.sap.sailing.gwt.home.communication.event.EventMetadataDTO; import com.sap.sailing.gwt.home.communication.event.EventReferenceDTO; import com.sap.sailing.gwt.home.communication.event.HasLogo; import com.sap.sse.gwt.client.media.ImageDTO; +import com.sap.sse.gwt.dispatch.shared.commands.Result; public class EventViewDTO extends EventMetadataDTO implements Result, HasLogo { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaReferenceDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaReferenceDTO.java index 8a673046e7b..350bdd6da82 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaReferenceDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/eventview/RegattaReferenceDTO.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.home.communication.eventview; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class RegattaReferenceDTO implements DTO, Comparable { private String id; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/fakeseries/EventSeriesViewDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/fakeseries/EventSeriesViewDTO.java index 0e7e1ea4a0e..8bc734a8436 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/fakeseries/EventSeriesViewDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/fakeseries/EventSeriesViewDTO.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import com.sap.sailing.gwt.dispatch.client.Result; import com.sap.sailing.gwt.home.communication.event.EventMetadataDTO; import com.sap.sailing.gwt.home.communication.event.HasLogo; import com.sap.sailing.gwt.home.communication.event.LabelType; import com.sap.sse.gwt.client.media.ImageDTO; +import com.sap.sse.gwt.dispatch.shared.commands.Result; public class EventSeriesViewDTO implements Result, HasLogo { private UUID id; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/fakeseries/GetEventSeriesViewAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/fakeseries/GetEventSeriesViewAction.java index 08d5eb8091b..e0e43dbe0c6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/fakeseries/GetEventSeriesViewAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/fakeseries/GetEventSeriesViewAction.java @@ -9,14 +9,14 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.leaderboard.LeaderboardGroup; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.event.EventMetadataDTO; import com.sap.sailing.gwt.home.communication.fakeseries.EventSeriesViewDTO.EventSeriesState; import com.sap.sailing.gwt.server.HomeServiceUtil; import com.sap.sse.common.media.MediaTagConstants; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; import com.sap.sse.shared.media.ImageDescriptor; public class GetEventSeriesViewAction implements SailingAction, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/media/GetMediaForEventAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/media/GetMediaForEventAction.java index 57eca9404b1..1d8f165e52b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/media/GetMediaForEventAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/media/GetMediaForEventAction.java @@ -4,14 +4,14 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.event.EventReferenceDTO; import com.sap.sailing.gwt.server.HomeServiceUtil; import com.sap.sailing.gwt.ui.shared.media.MediaConstants; import com.sap.sse.common.media.MimeType; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; import com.sap.sse.shared.media.ImageDescriptor; import com.sap.sse.shared.media.VideoDescriptor; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/media/MediaDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/media/MediaDTO.java index f22e9a42e6b..0f96a7241ae 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/media/MediaDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/media/MediaDTO.java @@ -3,7 +3,7 @@ package com.sap.sailing.gwt.home.communication.media; import java.util.Collection; import java.util.TreeSet; -import com.sap.sailing.gwt.dispatch.client.Result; +import com.sap.sse.gwt.dispatch.shared.commands.Result; public class MediaDTO implements Result { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/race/SimpleRaceMetadataDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/race/SimpleRaceMetadataDTO.java index 3ec6a9ee546..2246d905af5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/race/SimpleRaceMetadataDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/race/SimpleRaceMetadataDTO.java @@ -5,11 +5,11 @@ import java.util.Date; import java.util.HashSet; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.gwt.dispatch.client.DTO; import com.sap.sailing.gwt.home.communication.event.SimpleCompetitorDTO; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.common.Util; import com.sap.sse.common.util.NaturalComparator; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class SimpleRaceMetadataDTO implements DTO, Comparable { public enum RaceViewState { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressDTO.java index 3ad98235224..4c6fc46223a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressDTO.java @@ -3,7 +3,7 @@ package com.sap.sailing.gwt.home.communication.regatta; import java.util.ArrayList; import java.util.List; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class RegattaProgressDTO implements DTO { private ArrayList series = new ArrayList<>(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressFleetDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressFleetDTO.java index 41db81e445c..89ebf55d740 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressFleetDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressFleetDTO.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.home.communication.regatta; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class RegattaProgressFleetDTO implements DTO { private int raceCount; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressSeriesDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressSeriesDTO.java index 8fa8155e78c..b751708a5bd 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressSeriesDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/regatta/RegattaProgressSeriesDTO.java @@ -3,8 +3,8 @@ package com.sap.sailing.gwt.home.communication.regatta; import java.util.Map; import java.util.TreeMap; -import com.sap.sailing.gwt.dispatch.client.DTO; import com.sap.sailing.gwt.home.communication.race.FleetMetadataDTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class RegattaProgressSeriesDTO implements DTO { private String name; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/GetSearchResultsAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/GetSearchResultsAction.java index 5b218d6a4e0..c50a8bf2983 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/GetSearchResultsAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/GetSearchResultsAction.java @@ -5,15 +5,15 @@ import java.net.URL; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.LeaderboardSearchResultBase; import com.sap.sailing.domain.base.RemoteSailingServerReference; -import com.sap.sailing.gwt.dispatch.client.ListResult; -import com.sap.sailing.gwt.dispatch.client.batching.NonBatchableAction; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.server.RacingEventService; import com.sap.sse.common.Util; import com.sap.sse.common.search.KeywordQuery; import com.sap.sse.common.search.Result; +import com.sap.sse.gwt.dispatch.client.system.batching.NonBatchableAction; +import com.sap.sse.gwt.dispatch.shared.commands.ListResult; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * Use this action once for each result of {@link GetSearchServerNamesAction} and once for the main server. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/GetSearchServerNamesAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/GetSearchServerNamesAction.java index d2e0ffd1d4b..806cfe05009 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/GetSearchServerNamesAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/GetSearchServerNamesAction.java @@ -2,10 +2,10 @@ package com.sap.sailing.gwt.home.communication.search; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.RemoteSailingServerReference; -import com.sap.sailing.gwt.dispatch.client.StringsResult; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; +import com.sap.sse.gwt.dispatch.shared.commands.StringsResult; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; /** * A client should search a server in a two-step process. First, the client should ask the server which other servers diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/SearchResultDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/SearchResultDTO.java index b1f56acac9c..268a1daa0ea 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/SearchResultDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/SearchResultDTO.java @@ -7,7 +7,7 @@ import java.util.TreeSet; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.EventBase; import com.sap.sailing.domain.base.LeaderboardSearchResultBase; -import com.sap.sailing.gwt.dispatch.client.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class SearchResultDTO implements DTO { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/SearchResultEventInfoDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/SearchResultEventInfoDTO.java index 6e9160e2c64..73409f54911 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/SearchResultEventInfoDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/search/SearchResultEventInfoDTO.java @@ -5,8 +5,8 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.EventBase; -import com.sap.sailing.gwt.dispatch.client.DTO; import com.sap.sse.common.util.NaturalComparator; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class SearchResultEventInfoDTO implements DTO, Comparable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/EventQuickfinderDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/EventQuickfinderDTO.java index 0ed305f0960..cf1e23b875f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/EventQuickfinderDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/EventQuickfinderDTO.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.home.communication.start; -import com.sap.sailing.gwt.dispatch.client.DTO; import com.sap.sailing.gwt.home.communication.event.EventReferenceDTO; import com.sap.sailing.gwt.home.communication.event.EventState; import com.sap.sse.common.TimePoint; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; public class EventQuickfinderDTO extends EventReferenceDTO implements DTO, Comparable { private String baseURL; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetRecentEventsAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetRecentEventsAction.java index 665277ce74b..1084608c5ad 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetRecentEventsAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetRecentEventsAction.java @@ -7,13 +7,13 @@ import java.util.UUID; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.EventBase; -import com.sap.sailing.gwt.dispatch.client.ListResult; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.server.HomeServiceUtil; import com.sap.sailing.gwt.server.HomeServiceUtil.EventVisitor; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ListResult; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; public class GetRecentEventsAction implements SailingAction>, IsClientCacheable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetStagedEventsAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetStagedEventsAction.java index 9ff5850f458..3c2242ab48f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetStagedEventsAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetStagedEventsAction.java @@ -1,15 +1,15 @@ package com.sap.sailing.gwt.home.communication.start; import com.google.gwt.core.shared.GwtIncompatible; -import com.sap.sailing.gwt.dispatch.client.ListResult; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; -import com.sap.sailing.gwt.dispatch.client.exceptions.DispatchException; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.server.EventHolder; import com.sap.sailing.gwt.server.EventStageCandidateCalculator; import com.sap.sailing.gwt.server.HomeServiceUtil; import com.sap.sse.common.Util.Pair; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; +import com.sap.sse.gwt.dispatch.shared.commands.ListResult; +import com.sap.sse.gwt.dispatch.shared.exceptions.DispatchException; public class GetStagedEventsAction implements SailingAction>, IsClientCacheable { private boolean useTeaserImage; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetStartViewAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetStartViewAction.java index 7e0932e201a..79ea7306b5b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetStartViewAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/GetStartViewAction.java @@ -9,7 +9,6 @@ import java.util.Set; import com.google.gwt.core.shared.GwtIncompatible; import com.sap.sailing.domain.base.EventBase; -import com.sap.sailing.gwt.dispatch.client.caching.IsClientCacheable; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.SailingDispatchContext; import com.sap.sailing.gwt.home.communication.event.EventReferenceDTO; @@ -23,6 +22,7 @@ import com.sap.sailing.gwt.ui.shared.media.MediaConstants; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.media.MimeType; +import com.sap.sse.gwt.dispatch.shared.caching.IsClientCacheable; import com.sap.sse.shared.media.ImageDescriptor; import com.sap.sse.shared.media.VideoDescriptor; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/StartViewDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/StartViewDTO.java index 15e51419686..76b7d3a5cf8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/StartViewDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/communication/start/StartViewDTO.java @@ -5,10 +5,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import com.sap.sailing.gwt.dispatch.client.Result; import com.sap.sailing.gwt.home.communication.eventlist.EventListEventDTO; import com.sap.sailing.gwt.home.communication.media.SailingImageDTO; import com.sap.sailing.gwt.home.communication.media.SailingVideoDTO; +import com.sap.sse.gwt.dispatch.shared.commands.Result; public class StartViewDTO implements Result { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/DesktopEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/DesktopEntryPoint.java index 913b1064c91..cee4048cbe4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/DesktopEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/DesktopEntryPoint.java @@ -22,6 +22,8 @@ import com.sap.sse.gwt.resources.CommonControlsCSS; import com.sap.sse.gwt.resources.Highcharts; public class DesktopEntryPoint extends AbstractMvpEntryPoint { + + @Override public void doOnModuleLoad() { Document.get().getBody().addClassName(SharedResources.INSTANCE.mainCss().desktop()); @@ -46,7 +48,7 @@ public class DesktopEntryPoint extends AbstractMvpEntryPoint { + AuthenticationMenuView getAuthenticationMenuView(); +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java index e930d8b8634..5040d64b75d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java @@ -8,13 +8,19 @@ import com.sap.sailing.gwt.home.desktop.places.events.EventsClientFactory; import com.sap.sailing.gwt.home.desktop.places.solutions.SolutionsClientFactory; import com.sap.sailing.gwt.home.desktop.places.sponsoring.SponsoringClientFactory; import com.sap.sailing.gwt.home.desktop.places.start.StartClientFactory; +import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileClientFactory; import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewClientFactory; import com.sap.sailing.gwt.home.shared.places.error.ErrorClientFactory; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultClientFactory; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationClientFactory; +import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetClientFactory; public interface DesktopClientFactory extends AboutUsClientFactory, ContactClientFactory, EventClientFactory, - EventsClientFactory, StartClientFactory, SponsoringClientFactory, SolutionsClientFactory, SearchResultClientFactory, - WhatsNewClientFactory, SeriesClientFactory, ErrorClientFactory { + EventsClientFactory, StartClientFactory, SponsoringClientFactory, SolutionsClientFactory, + SearchResultClientFactory, WhatsNewClientFactory, SeriesClientFactory, UserProfileClientFactory, + ErrorClientFactory, ConfirmationClientFactory, PasswordResetClientFactory { + DesktopPlacesNavigator getHomePlacesNavigator(); + DesktopResettableNavigationPathDisplay getNavigationPathDisplay(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopPlacesNavigator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopPlacesNavigator.java index 1de1efe8804..05ffc53aaa6 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopPlacesNavigator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopPlacesNavigator.java @@ -20,9 +20,15 @@ import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace; import com.sap.sailing.gwt.home.shared.places.event.EventDefaultPlace; import com.sap.sailing.gwt.home.shared.places.events.EventsPlace; import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace; +import com.sap.sailing.gwt.home.shared.places.imprint.ImprintPlace; import com.sap.sailing.gwt.home.shared.places.solutions.SolutionsPlace; import com.sap.sailing.gwt.home.shared.places.solutions.SolutionsPlace.SolutionsNavigationTabs; import com.sap.sailing.gwt.home.shared.places.start.StartPlace; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace.Action; +import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetPlace; +import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDefaultPlace; import com.sap.sailing.gwt.ui.client.EntryPointLinkFactory; public class DesktopPlacesNavigator extends AbstractPlaceNavigator { @@ -64,6 +70,22 @@ public class DesktopPlacesNavigator extends AbstractPlaceNavigator { return createGlobalPlaceNavigation(new ContactPlace()); } + public PlaceNavigation getImprintNavigation() { + return createGlobalPlaceNavigation(new ImprintPlace()); + } + + public PlaceNavigation getMailVerifiedConfirmationNavigation() { + return createGlobalPlaceNavigation(new ConfirmationPlace(Action.MAIL_VERIFIED)); + } + + public PlaceNavigation getPasswordResettedConfirmationNavigation(String username) { + return createGlobalPlaceNavigation(new ConfirmationPlace(Action.RESET_EXECUTED, username)); + } + + public PlaceNavigation getPasswordResetNavigation() { + return createGlobalPlaceNavigation(new PasswordResetPlace()); + } + public PlaceNavigation getEventRegattasNavigation(String eventUuidAsString, String baseUrl, boolean isOnRemoteServer) { MultiregattaRegattasPlace eventPlace = new MultiregattaRegattasPlace(eventUuidAsString); return createPlaceNavigation(baseUrl, isOnRemoteServer, eventPlace); @@ -100,4 +122,7 @@ public class DesktopPlacesNavigator extends AbstractPlaceNavigator { return createPlaceNavigation(baseUrl, isOnRemoteServer, regattaPlace); } + public PlaceNavigation getUserProfileNavigation() { + return createGlobalPlaceNavigation(new UserProfileDefaultPlace()); + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java index 11bc8d0e8f5..56c45cb4dd0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java @@ -3,6 +3,7 @@ package com.sap.sailing.gwt.home.desktop.app; import com.google.gwt.event.shared.SimpleEventBus; import com.google.gwt.place.shared.PlaceController; import com.google.web.bindery.event.shared.EventBus; +import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.home.communication.SailingDispatchSystem; import com.sap.sailing.gwt.home.communication.SailingDispatchSystemImpl; import com.sap.sailing.gwt.home.desktop.places.error.TabletAndDesktopErrorView; @@ -18,14 +19,32 @@ import com.sap.sailing.gwt.home.desktop.places.start.TabletAndDesktopStartView; import com.sap.sailing.gwt.home.desktop.places.whatsnew.TabletAndDesktopWhatsNewView; import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace.WhatsNewNavigationTabs; import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewView; +import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.partials.busy.BusyViewImpl; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultView; import com.sap.sailing.gwt.home.shared.places.solutions.SolutionsPlace.SolutionsNavigationTabs; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationView; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationViewImpl; +import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetView; +import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetViewImpl; +import com.sap.sailing.gwt.home.shared.usermanagement.AuthenticationCallbackImpl; +import com.sap.sailing.gwt.home.shared.usermanagement.view.AuthenticationViewDesktop; import com.sap.sailing.gwt.ui.client.refresh.BusyView; +import com.sap.sse.security.ui.authentication.AuthenticationClientFactoryImpl; +import com.sap.sse.security.ui.authentication.AuthenticationManager; +import com.sap.sse.security.ui.authentication.AuthenticationManagerImpl; +import com.sap.sse.security.ui.authentication.AuthenticationPlaceManagementController; +import com.sap.sse.security.ui.authentication.WrappedPlaceManagementController; +import com.sap.sse.security.ui.authentication.info.LoggedInUserInfoPlace; +import com.sap.sse.security.ui.authentication.view.FlyoutAuthenticationPresenter; +import com.sap.sse.security.ui.client.i18n.StringMessages; -public class TabletAndDesktopApplicationClientFactory extends AbstractApplicationClientFactory> implements DesktopClientFactory { +public class TabletAndDesktopApplicationClientFactory extends AbstractApplicationClientFactory implements DesktopClientFactory { private final SailingDispatchSystem dispatch = new SailingDispatchSystemImpl(); + private final WrappedPlaceManagementController userManagementWizardController; + private final AuthenticationManager authenticationManager; public TabletAndDesktopApplicationClientFactory(boolean isStandaloneServer) { this(new SimpleEventBus(), isStandaloneServer); @@ -41,6 +60,24 @@ public class TabletAndDesktopApplicationClientFactory extends AbstractApplicatio private TabletAndDesktopApplicationClientFactory(EventBus eventBus, PlaceController placeController, DesktopPlacesNavigator placesNavigator) { super(new TabletAndDesktopApplicationView(placesNavigator, eventBus), eventBus, placeController, placesNavigator); + + final AuthenticationViewDesktop userManagementDisplay = new AuthenticationViewDesktop(); + final Runnable signInSuccesfullNavigation = new Runnable() { + @Override + public void run() { + userManagementWizardController.goTo(new LoggedInUserInfoPlace()); + } + }; + this.authenticationManager = new AuthenticationManagerImpl(this, eventBus, getHomePlacesNavigator() + .getMailVerifiedConfirmationNavigation().getFullQualifiedUrl(), getHomePlacesNavigator() + .getPasswordResetNavigation().getFullQualifiedUrl()); + this.userManagementWizardController = new AuthenticationPlaceManagementController( + new AuthenticationClientFactoryImpl(authenticationManager, SharedResources.INSTANCE), + new AuthenticationCallbackImpl(getHomePlacesNavigator().getUserProfileNavigation(), + signInSuccesfullNavigation), userManagementDisplay, getEventBus()); + + new FlyoutAuthenticationPresenter(userManagementDisplay, getTopLevelView().getAuthenticationMenuView(), + userManagementWizardController, eventBus, authenticationManager.getAuthenticationContext()); } @Override @@ -92,4 +129,25 @@ public class TabletAndDesktopApplicationClientFactory extends AbstractApplicatio public BusyView createBusyView() { return new BusyViewImpl(); } + + @Override + public AuthenticationManager getAuthenticationManager() { + return authenticationManager; + } + + @Override + public ConfirmationView createConfirmationView() { + return new ConfirmationViewImpl(SharedResources.INSTANCE, StringMessages.INSTANCE.accountConfirmation()); + } + + @Override + public PasswordResetView createPasswordResetView() { + return new PasswordResetViewImpl(); + } + + @Override + public PlaceNavigation getPasswordResettedConfirmationNavigation(String username) { + return getHomePlacesNavigator().getPasswordResettedConfirmationNavigation(username); + } + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationView.java index fd84b5d43c9..9ca54bdf9c8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationView.java @@ -13,16 +13,16 @@ import com.google.web.bindery.event.shared.EventBus; import com.sap.sailing.gwt.common.client.controls.tabbar.BreadcrumbPane; import com.sap.sailing.gwt.home.desktop.partials.footer.Footer; import com.sap.sailing.gwt.home.desktop.partials.header.Header; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.gwt.client.DefaultErrorReporter; import com.sap.sse.gwt.client.ErrorReporter; +import com.sap.sse.security.ui.authentication.view.AuthenticationMenuView; /** * This is the top-level view of the application. Every time another presenter wants to reveal itself, * {@link TabletAndDesktopApplicationView} will add its content of the target inside the {@code mainContantPanel}. */ -public class TabletAndDesktopApplicationView extends Composite implements ApplicationTopLevelView { +public class TabletAndDesktopApplicationView extends Composite implements DesktopApplicationTopLevelView { interface TabletAndDesktopApplicationViewUiBinder extends UiBinder { } @@ -68,6 +68,11 @@ public class TabletAndDesktopApplicationView extends Composite implements Applic return errorReporter; } + @Override + public AuthenticationMenuView getAuthenticationMenuView() { + return headerPanel.getAuthenticationMenuView(); + } + @Override public DesktopResettableNavigationPathDisplay getNavigationPathDisplay() { return navigationPathDisplay; @@ -86,12 +91,11 @@ public class TabletAndDesktopApplicationView extends Composite implements Applic @Override public void showNavigationPath(NavigationItem... navigationPath) { breadcrumbsUi.clear(); - if(ExperimentalFeatures.USE_NAVIGATION_PATH_DISPLAY_ON_DESKTOP) { - for (NavigationItem navigationPathDisplay : navigationPath) { - breadcrumbsUi.addBreadcrumbItem(navigationPathDisplay.getDisplayName(), navigationPathDisplay.getTargetUrl(), navigationPathDisplay); - } - breadcrumbWrapperUi.getStyle().clearDisplay(); + for (NavigationItem navigationPathDisplay : navigationPath) { + breadcrumbsUi.addBreadcrumbItem(navigationPathDisplay.getDisplayName(), + navigationPathDisplay.getTargetUrl(), navigationPathDisplay); } + breadcrumbWrapperUi.getStyle().clearDisplay(); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaser.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaser.java index bb3941732db..cc6e979d826 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaser.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaser.java @@ -18,6 +18,7 @@ import com.sap.sailing.gwt.home.communication.event.LabelType; import com.sap.sailing.gwt.home.communication.eventlist.EventListEventSeriesDTO; import com.sap.sailing.gwt.home.desktop.utils.LongNamesUtil; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; +import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources; import com.sap.sailing.gwt.home.shared.utils.EventDatesFormatterUtil; import com.sap.sailing.gwt.home.shared.utils.LabelTypeUtil; @@ -74,7 +75,7 @@ public class EventTeaser extends Composite { final StringBuilder thumbnailUrlBuilder = new StringBuilder("url('"); final String thumbnailImageUrl = event.getThumbnailImageURL(); if (thumbnailImageUrl == null || thumbnailImageUrl.isEmpty()) { - thumbnailUrlBuilder.append(EventTeaserResources.INSTANCE.defaultEventPhotoImage().getSafeUri().asString()); + thumbnailUrlBuilder.append(SharedHomeResources.INSTANCE.defaultEventPhotoImage().getSafeUri().asString()); } else { thumbnailUrlBuilder.append(UriUtils.fromString(thumbnailImageUrl).asString()); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaserResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaserResources.java index d3cb03df28f..c9e606cfc67 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaserResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaserResources.java @@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.desktop.partials.event; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.ImageResource; public interface EventTeaserResources extends ClientBundle { public static final EventTeaserResources INSTANCE = GWT.create(EventTeaserResources.class); @@ -27,6 +26,4 @@ public interface EventTeaserResources extends ClientBundle { String eventteaser_location(); } - @Source("com/sap/sailing/gwt/home/images/default_event_photo.jpg") - ImageResource defaultEventPhotoImage(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/EventHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/EventHeaderResources.java index 325ece5637e..3d13cd73daa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/EventHeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventheader/EventHeaderResources.java @@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.desktop.partials.eventheader; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.ImageResource; public interface EventHeaderResources extends ClientBundle { public static final EventHeaderResources INSTANCE = GWT.create(EventHeaderResources.class); @@ -58,7 +57,4 @@ public interface EventHeaderResources extends ClientBundle { String navbar_buttonhidden(); } - @Source("com/sap/sailing/gwt/home/images/default_event_logo.jpg") - ImageResource defaultEventLogoImage(); - } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventstage/EventOverviewStage.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventstage/EventOverviewStage.java index a1466829a0b..58504a745fe 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventstage/EventOverviewStage.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/eventstage/EventOverviewStage.java @@ -12,7 +12,6 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.common.client.SharedResources.MediaCss; -import com.sap.sailing.gwt.dispatch.client.ListResult; import com.sap.sailing.gwt.home.communication.event.EventState; import com.sap.sailing.gwt.home.communication.event.eventoverview.EventOverviewStageContentDTO; import com.sap.sailing.gwt.home.communication.event.eventoverview.EventOverviewStageDTO; @@ -31,6 +30,7 @@ import com.sap.sailing.gwt.home.shared.partials.message.Message; import com.sap.sailing.gwt.home.shared.partials.video.Video; import com.sap.sailing.gwt.home.shared.refresh.RefreshManager; import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget; +import com.sap.sse.gwt.dispatch.shared.commands.ListResult; public class EventOverviewStage extends Composite { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java index e39d72ccab8..06c5f36b61a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.java @@ -40,6 +40,7 @@ public class Footer extends Composite { } @UiField Anchor changeLanguageLink; + @UiField AnchorElement imprintAnchorLink; @UiField DivElement languageSelectionDiv; @UiField(provided = true) ValueListBox> changeLanguageList = new ValueListBox>(new Renderer>() { @Override @@ -72,6 +73,7 @@ public class Footer extends Composite { releaseNotesNavigation = navigator.getWhatsNewNavigation(WhatsNewNavigationTabs.SailingAnalytics); initWidget(uiBinder.createAndBindUi(this)); + navigator.getImprintNavigation().configureAnchorElement(imprintAnchorLink); updateUI(); DOM.sinkEvents(mobileUi, Event.ONCLICK); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml index dae6bb3968e..0c9ed27ee32 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/footer/Footer.ui.xml @@ -40,7 +40,7 @@
- + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.gss index ba9d697ac18..42758085648 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.gss +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.gss @@ -104,3 +104,24 @@ .submit { font-size: inherit; } + +.user_menu_button { + width: 3rem; + height: 3rem; + vertical-align: middle; + background-repeat: no-repeat; + background-position: center center; + background-size: contain; + background-image: url('images/home/loggedout.svg'); + margin-left: 1rem; + cursor: pointer; +} +.user_menu_button.open { + background-image: url('images/home/loggedout-open.svg'); +} +.user_menu_button.loggedin { + background-image: url('images/home/loggedin.svg'); +} +.user_menu_button.loggedin.open { + background-image: url('images/home/loggedin-open.svg'); +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java index 64f75954d2a..ac8cc095a24 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.java @@ -24,6 +24,7 @@ import com.sap.sailing.gwt.common.client.i18n.TextMessages; import com.sap.sailing.gwt.home.client.place.event.legacy.EventPlace; import com.sap.sailing.gwt.home.client.place.event.legacy.RegattaPlace; import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator; +import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace; import com.sap.sailing.gwt.home.shared.places.events.EventsPlace; @@ -32,6 +33,8 @@ import com.sap.sailing.gwt.home.shared.places.solutions.SolutionsPlace; import com.sap.sailing.gwt.home.shared.places.solutions.SolutionsPlace.SolutionsNavigationTabs; import com.sap.sailing.gwt.home.shared.places.start.StartPlace; import com.sap.sse.gwt.client.mvp.PlaceChangedEvent; +import com.sap.sse.security.ui.authentication.view.AuthenticationMenuView; +import com.sap.sse.security.ui.authentication.view.AuthenticationMenuViewImpl; public class Header extends Composite { @UiField Anchor startPageLink; @@ -41,6 +44,8 @@ public class Header extends Composite { @UiField TextBox searchText; @UiField Button searchButton; + + @UiField Anchor usermenu; private static final HyperlinkImpl HYPERLINK_IMPL = GWT.create(HyperlinkImpl.class); @@ -51,35 +56,25 @@ public class Header extends Composite { private final PlaceNavigation eventsNavigation; private final PlaceNavigation solutionsNavigation; + private final AuthenticationMenuView authenticationMenuView; + interface HeaderUiBinder extends UiBinder { } private static HeaderUiBinder uiBinder = GWT.create(HeaderUiBinder.class); public Header(final DesktopPlacesNavigator navigator, EventBus eventBus) { - this(navigator); - - eventBus.addHandler(PlaceChangedEvent.TYPE, new PlaceChangedEvent.Handler() { - - @Override - public void onPlaceChanged(PlaceChangedEvent event) { - updateActiveLink(event.getNewPlace()); - } - }); - } - - public Header(final DesktopPlacesNavigator navigator) { this.navigator = navigator; HeaderResources.INSTANCE.css().ensureInjected(); - + initWidget(uiBinder.createAndBindUi(this)); links = Arrays.asList(new Anchor[] { startPageLink, eventsPageLink, solutionsPageLink }); - + homeNavigation = navigator.getHomeNavigation(); eventsNavigation = navigator.getEventsNavigation(); solutionsNavigation = navigator.getSolutionsNavigation(SolutionsNavigationTabs.SapInSailing); - + startPageLink.setHref(homeNavigation.getTargetUrl()); eventsPageLink.setHref(eventsNavigation.getTargetUrl()); solutionsPageLink.setHref(solutionsNavigation.getTargetUrl()); @@ -93,6 +88,18 @@ public class Header extends Composite { } } }); + + eventBus.addHandler(PlaceChangedEvent.TYPE, new PlaceChangedEvent.Handler() { + @Override + public void onPlaceChanged(PlaceChangedEvent event) { + updateActiveLink(event.getNewPlace()); + } + }); + + authenticationMenuView = new AuthenticationMenuViewImpl(usermenu, HeaderResources.INSTANCE.css().loggedin(), HeaderResources.INSTANCE.css().open()); + if (!ExperimentalFeatures.SHOW_USER_MANAGEMENT_ON_DESKTOP) { + usermenu.removeFromParent(); + } } @UiHandler("startPageLink") @@ -156,4 +163,8 @@ public class Header extends Composite { setActiveLink(activeLink); } } + + public AuthenticationMenuView getAuthenticationMenuView() { + return authenticationMenuView; + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml index 6159afa5045..307e1bb0bf2 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/Header.ui.xml @@ -36,6 +36,8 @@ + +
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/HeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/HeaderResources.java index fa16ccd2a95..d432431aaf4 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/HeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/header/HeaderResources.java @@ -23,5 +23,8 @@ public interface HeaderResources extends ClientBundle { String search_textfield(); String search_button(); String submit(); + String user_menu_button(); + String loggedin(); + String open(); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/liveraces/LiveRacesList.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/liveraces/LiveRacesList.java index e0315fc2a92..2f8faef3559 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/liveraces/LiveRacesList.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/liveraces/LiveRacesList.java @@ -4,7 +4,6 @@ import java.util.Collection; import com.google.gwt.dom.client.Style.Display; import com.google.gwt.user.client.ui.Composite; -import com.sap.sailing.gwt.dispatch.client.CollectionResult; import com.sap.sailing.gwt.home.communication.event.LiveRaceDTO; import com.sap.sailing.gwt.home.desktop.partials.racelist.AbstractRaceList; import com.sap.sailing.gwt.home.desktop.partials.racelist.RaceListColumnFactory; @@ -15,6 +14,7 @@ import com.sap.sailing.gwt.home.desktop.partials.racelist.SortableRaceListColumn import com.sap.sailing.gwt.home.desktop.places.event.EventView; import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.gwt.dispatch.shared.commands.CollectionResult; public class LiveRacesList extends Composite { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java index 3d0e52ed75d..158540ea0b2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java @@ -6,7 +6,6 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Image; import com.sap.sailing.gwt.home.communication.media.SailingImageDTO; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.partials.fullscreen.FullscreenContainer; import com.sap.sse.gwt.client.controls.carousel.ImageCarousel.FullscreenViewer; @@ -26,9 +25,7 @@ public class SailingFullscreenViewer extends FullscreenContainer images) { @@ -37,11 +34,9 @@ public class SailingFullscreenViewer extends FullscreenContainer> { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/AbstractRaceList.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/AbstractRaceList.java index 5f410c7aaa7..4663fa1ecb7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/AbstractRaceList.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/AbstractRaceList.java @@ -15,6 +15,8 @@ import com.google.gwt.user.cellview.client.RowStyles; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.SimplePanel; import com.sap.sailing.domain.common.InvertibleComparator; +import com.sap.sailing.gwt.common.theme.component.celltable.CleanCellTableResources; +import com.sap.sailing.gwt.common.theme.component.celltable.StyledHeaderOrFooterBuilder; import com.sap.sailing.gwt.home.communication.event.SimpleCompetitorDTO; import com.sap.sailing.gwt.home.communication.race.RaceMetadataDTO; import com.sap.sailing.gwt.home.communication.race.SimpleRaceMetadataDTO; @@ -25,8 +27,6 @@ import com.sap.sailing.gwt.home.desktop.places.event.EventView; import com.sap.sailing.gwt.home.shared.partials.filter.FilterValueChangeHandler; import com.sap.sailing.gwt.ui.leaderboard.SortedCellTable; import com.sap.sse.common.filter.Filter; -import com.sap.sse.gwt.theme.client.component.celltable.CleanCellTableResources; -import com.sap.sse.gwt.theme.client.component.celltable.StyledHeaderOrFooterBuilder; public abstract class AbstractRaceList> extends Composite implements FilterValueChangeHandler { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListContainer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListContainer.java index 37b58bed7ed..d0edce20b87 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListContainer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListContainer.java @@ -11,9 +11,9 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.dispatch.client.CollectionResult; import com.sap.sailing.gwt.home.communication.race.RaceMetadataDTO; import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget; +import com.sap.sse.gwt.dispatch.shared.commands.CollectionResult; public class RaceListContainer> extends Composite implements RefreshableWidget> { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/ListNavigationPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/ListNavigationPanel.java index 99d7183f90d..ad31433ac14 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/ListNavigationPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattanavigation/ListNavigationPanel.java @@ -1,7 +1,6 @@ package com.sap.sailing.gwt.home.desktop.partials.regattanavigation; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Style.Display; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.uibinder.client.UiBinder; @@ -52,17 +51,14 @@ public class ListNavigationPanel extends Composi public interface ListNavigationAction { String getDisplayName(); - boolean isShowAdditionalWidget(); } private class ActionWidget extends Label { private final T action; - private final Display displayStyle; private ActionWidget(T action) { super(action.getDisplayName()); this.action = action; - this.displayStyle = action.isShowAdditionalWidget() ? Display.BLOCK : Display.NONE; this.addStyleName(CSS.regattanavigation_button()); this.addClickHandler(new ClickHandler() { @Override @@ -73,7 +69,6 @@ public class ListNavigationPanel extends Composi } private void select() { - additionalWidgetContainerUi.getElement().getStyle().setDisplay(displayStyle); for (int i=0; i < actionContainerUi.getWidgetCount(); i++) { actionContainerUi.getWidget(i).removeStyleName(CSS.regattanavigation_buttonactive()); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.java index 5bc96ce0841..87e26f33e75 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeader.java @@ -23,6 +23,7 @@ import com.sap.sailing.gwt.home.desktop.places.fakeseries.SeriesView; import com.sap.sailing.gwt.home.desktop.places.fakeseries.SeriesView.Presenter; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.event.EventDefaultPlace; +import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources; import com.sap.sailing.gwt.home.shared.utils.LabelTypeUtil; import com.sap.sailing.gwt.ui.client.StringMessages; @@ -70,7 +71,8 @@ public class SeriesHeader extends Composite { } private void initFields() { - String logoUrl = series.getLogoImage() != null ? series.getLogoImage().getSourceRef() : SeriesHeaderResources.INSTANCE.defaultEventLogoImage().getSafeUri().asString(); + String logoUrl = series.getLogoImage() != null ? series.getLogoImage().getSourceRef() : + SharedHomeResources.INSTANCE.defaultEventLogoImage().getSafeUri().asString(); eventLogo.getStyle().setBackgroundImage("url(" + logoUrl + ")"); eventLogo.setTitle(series.getDisplayName()); eventName.setInnerText(series.getDisplayName()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java index 3d9bc36905d..58e791e8773 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/seriesheader/SeriesHeaderResources.java @@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.desktop.partials.seriesheader; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.ImageResource; public interface SeriesHeaderResources extends ClientBundle { public static final SeriesHeaderResources INSTANCE = GWT.create(SeriesHeaderResources.class); @@ -33,7 +32,4 @@ public interface SeriesHeaderResources extends ClientBundle { String navbar_button(); } - @Source("com/sap/sailing/gwt/home/images/default_event_logo.jpg") - ImageResource defaultEventLogoImage(); - } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java index 9f546ad4e6b..280afd2fbec 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/sharing/SharingButtonsResources.java @@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.desktop.partials.sharing; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.ImageResource; public interface SharingButtonsResources extends ClientBundle { public static final SharingButtonsResources INSTANCE = GWT.create(SharingButtonsResources.class); @@ -19,7 +18,4 @@ public interface SharingButtonsResources extends ClientBundle { String eventheader_sharing_itemfacebook(); } - @Source("com/sap/sailing/gwt/home/images/default_event_logo.jpg") - ImageResource defaultEventLogoImage(); - } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.gss index 295b5ab6974..da5870cbef9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.gss +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/solutions/Solutions.gss @@ -45,7 +45,6 @@ } .solutions_content { position: relative; - z-index: 2; } .solutions_content:nth-child(even) { background-color: #f8f8f8; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/stage/StageResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/stage/StageResources.java index c26b2cb0477..17e17c8126b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/stage/StageResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/stage/StageResources.java @@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.desktop.partials.stage; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.ImageResource; public interface StageResources extends ClientBundle { public static final StageResources INSTANCE = GWT.create(StageResources.class); @@ -40,6 +39,4 @@ public interface StageResources extends ClientBundle { String stage_progress_bar(); } - @Source("com/sap/sailing/gwt/home/images/default_stage_event_teaser.jpg") - ImageResource defaultStageEventTeaserImage(); } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/stage/StageTeaser.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/stage/StageTeaser.java index cf93a4c1b02..da26028a8c7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/stage/StageTeaser.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/stage/StageTeaser.java @@ -14,6 +14,7 @@ import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.home.communication.start.EventStageDTO; import com.sap.sailing.gwt.home.shared.partials.countdowntimer.CountdownTimer; +import com.sap.sailing.gwt.home.shared.resources.SharedHomeResources; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.gwt.client.controls.carousel.LazyLoadable; @@ -35,8 +36,8 @@ public abstract class StageTeaser extends Composite implements LazyLoadable { @Override public void doInitializeLazyComponents() { - String stageImageUrl = event.getStageImageURL() != null ? event.getStageImageURL() : StageResources.INSTANCE - .defaultStageEventTeaserImage().getSafeUri().asString(); + String stageImageUrl = event.getStageImageURL() != null ? event.getStageImageURL() : + SharedHomeResources.INSTANCE.defaultStageEventTeaserImage().getSafeUri().asString(); String backgroundImage = "url(" + stageImageUrl + ")"; teaserImage.getStyle().setBackgroundImage(backgroundImage); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/standings/StandingsList.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/standings/StandingsList.java index 280d0970f5e..3c200ad6302 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/standings/StandingsList.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/standings/StandingsList.java @@ -33,12 +33,14 @@ public class StandingsList extends Widget implements RefreshableWidget headerNavigation) { + this.finished = finished; StandingsResources.INSTANCE.css().ensureInjected(); setElement(uiBinder.createAndBindUi(this)); setVisible(false); - headerTitleUi.setInnerText(finished ? i18n.results() : i18n.latestRegattaStandings()); if(headerNavigation == null) { headerArrowUi.removeFromParent(); } else { @@ -48,6 +50,12 @@ public class StandingsList extends Widget implements RefreshableWidget 0 && data.getTotalCompetitorCount() > itemCount) { + headerText += " (" + i18n.topN(itemCount) + ")"; + } + headerTitleUi.setInnerText(headerText); itemContainerUi.removeAllChildren(); scoreInformationUi.removeAllChildren(); getElement().getStyle().clearDisplay(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.gss new file mode 100644 index 00000000000..340f617645a --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.gss @@ -0,0 +1,44 @@ +/** + * The header of the pages to an event + */ +.userheader { + position: relative; + font-size: 1rem; + color: #666; + background: #f2f2f2; +} +.userheader_intro { + padding-left: 5.8em; + margin: 0.666666666666667em 0 1.333333333333333em; + min-height: 4.8em; + position: relative; +} +.userheader_intro_logo { + position: absolute; + top: 0; + left: 0; + width: 4.8em; + height: 4.8em; + border: 0.333333333333333em solid #fff; + box-shadow: 0 0 5px rgba(235,235,235,0.5); +} +.userheader_intro_logo_image { + height: 100%; + background-size: cover; + background-position: center; + background-repeat: no-repeat; +} +.userheader_intro_title { + font-weight: 600; +} +.userheader_intro_title_realname { + margin: 0 0.178571428571429em 0 0; + font-size: 1.866666666666667em; + color: #333; +} +.userheader_intro_title_username { + color: #666; + margin-left: 0; + padding-left: 0; + border: none; +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.java new file mode 100644 index 00000000000..dba7591a3f5 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.java @@ -0,0 +1,32 @@ +package com.sap.sailing.gwt.home.desktop.partials.userHeader; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.DivElement; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Widget; +import com.sap.sse.security.ui.authentication.app.AuthenticationContext; + +public class UserHeader extends Composite { + private static MyUiBinder uiBinder = GWT.create(MyUiBinder.class); + + interface MyUiBinder extends UiBinder { + } + + @UiField DivElement imageUi; + @UiField DivElement nameUi; + @UiField DivElement usernameUi; + + public UserHeader() { + initWidget(uiBinder.createAndBindUi(this)); + } + + public void setUserManagementContext(AuthenticationContext userManagementContext) { + UserHeaderResources.INSTANCE.css().ensureInjected(); + imageUi.getStyle().setBackgroundImage("url(images/home/userdefault.svg)"); + + nameUi.setInnerText(userManagementContext.getUserTitle()); + usernameUi.setInnerText(userManagementContext.getUserSubtitle()); + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.ui.xml new file mode 100644 index 00000000000..3856265634b --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.ui.xml @@ -0,0 +1,23 @@ + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeaderResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeaderResources.java new file mode 100644 index 00000000000..8b8937cb06f --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeaderResources.java @@ -0,0 +1,22 @@ +package com.sap.sailing.gwt.home.desktop.partials.userHeader; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; + +public interface UserHeaderResources extends ClientBundle { + public static final UserHeaderResources INSTANCE = GWT.create(UserHeaderResources.class); + + @Source("UserHeader.gss") + LocalCss css(); + + public interface LocalCss extends CssResource { + String userheader(); + String userheader_intro(); + String userheader_intro_logo(); + String userheader_intro_logo_image(); + String userheader_intro_title(); + String userheader_intro_title_realname(); + String userheader_intro_title_username(); + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java new file mode 100644 index 00000000000..a7d6ec50c86 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java @@ -0,0 +1,86 @@ +package com.sap.sailing.gwt.home.desktop.partials.useraccountDetails; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.DivElement; +import com.google.gwt.dom.client.InputElement; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.PasswordTextBox; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.user.client.ui.Widget; +import com.sap.sse.security.ui.authentication.app.AuthenticationContext; +import com.sap.sse.security.ui.client.i18n.StringMessages; +import com.sap.sse.security.ui.shared.UserDTO; + +public class UserAccountDetails extends Composite { + private static MyUiBinder uiBinder = GWT.create(MyUiBinder.class); + + interface MyUiBinder extends UiBinder { + } + + public interface Presenter { + void handleSaveChangesRequest(String fullName, String company); + void handleEmailChangeRequest(String email); + void handlePasswordChangeRequest(String oldPassword, String newPassword, String newPasswordConfirmation); + } + + @UiField DivElement editImageLinkUi; + @UiField InputElement usernameUi; + @UiField TextBox nameUi; + @UiField TextBox companyUi; + @UiField TextBox emailUi; + @UiField PasswordTextBox oldPasswordUi; + @UiField PasswordTextBox newPasswordUi; + @UiField PasswordTextBox newPasswordConfirmationUi; + + private final Presenter presenter; + + public UserAccountDetails(Presenter presenter) { + this.presenter = presenter; + UseraccountDetailsResources.INSTANCE.css().ensureInjected(); + initWidget(uiBinder.createAndBindUi(this)); + StringMessages i18n = StringMessages.INSTANCE; + setPlaceholder(oldPasswordUi, i18n.oldPasswordPlaceholder()); + setPlaceholder(newPasswordUi, i18n.newPasswordPlaceholder()); + setPlaceholder(newPasswordConfirmationUi, i18n.passwordRepeatPlaceholder()); + } + + public void setUserManagementContext(AuthenticationContext userManagementContext) { + UserDTO currentUser = userManagementContext.getCurrentUser(); + // TODO correct message + editImageLinkUi.setTitle("TODO picture of: " + currentUser.getName()); + // TODO use image from user when field is available + editImageLinkUi.getStyle().setBackgroundImage("url(images/home/userdefault.svg)"); + + nameUi.setValue(currentUser.getFullName()); + companyUi.setValue(currentUser.getCompany()); + usernameUi.setValue(currentUser.getName()); + emailUi.setValue(currentUser.getEmail()); + oldPasswordUi.setValue(""); + newPasswordUi.setValue(""); + newPasswordConfirmationUi.setValue(""); + } + + private void setPlaceholder(Widget widget, String placeholderText) { + widget.getElement().setAttribute("placeholder", placeholderText); + } + + @UiHandler("saveChangesUi") + void onSaveChangesClicked(ClickEvent event) { + presenter.handleSaveChangesRequest(nameUi.getValue(), companyUi.getValue()); + } + + @UiHandler("changeEmailUi") + void onChangeEmailClicked(ClickEvent event) { + presenter.handleEmailChangeRequest(emailUi.getValue()); + } + + @UiHandler("changePasswordUi") + void onChangePasswordClicked(ClickEvent event) { + presenter.handlePasswordChangeRequest(oldPasswordUi.getValue(), newPasswordUi.getValue(), + newPasswordConfirmationUi.getValue()); + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.ui.xml new file mode 100644 index 00000000000..14896529d3f --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.ui.xml @@ -0,0 +1,83 @@ + + + + + + + + +
+
+
+
+ +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+
+ + +
+
+ + + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UseraccountDetails.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UseraccountDetails.gss new file mode 100644 index 00000000000..b716f5109bf --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UseraccountDetails.gss @@ -0,0 +1,71 @@ +.useraccountdetails { + overflow: hidden; +} +.useraccountdetails_image { + float: left; + width: 8em; + height: 8em; + z-index: 1; + position: relative; + background-repeat: no-repeat; + background-size: cover; + background-position: center center; +} +.useraccountdetails_image_editbutton { + display: none; + position: absolute; + bottom: 0; + right: 0; + width: 2em; + height: 2em; + background-image: url("images/home/edit.svg"); + background-color: #efaa00; + background-repeat: no-repeat; + background-size: contain; + background-position: center center; +} +.useraccountdetails_image:hover .useraccountdetails_image_editbutton { + /* remove comment after specifying design for image upload */ + /* display: block; */ +} +.useraccountdetails_content { + float: left; + width: 100%; + max-width: 53.333333333333336em; + padding-left: 12em; + margin-left: -10em; +} +.useraccountdetails_content > div { + font-size: 0; +} +.useraccountdetails_content_detail { + padding-left: 1.333333333333333em; + margin-bottom: 1.333333333333333em; + overflow: hidden; + font-size: 1rem; + display: inline-block; +} +.useraccountdetails_content_detail_label { + display: block; + width: 100%; + font-weight: 600; + margin-bottom: 0.4em; +} +.useraccountdetails_content_detail_input { + display: block; + width: 100%; + padding: 0.666666666666667em; + border-radius: 3px; + border: 1px solid #ccc; +} +.useraccountdetails_content_submit { + text-align: right; +} +.useraccountdetails_content_submit > button { + text-transform: uppercase; + margin-left: 1.333333333333333em; +} +.useraccountdetails_content_spacer { + height: 2rem; + display: inline-block; +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UseraccountDetailsResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UseraccountDetailsResources.java new file mode 100644 index 00000000000..b6beee48cc3 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UseraccountDetailsResources.java @@ -0,0 +1,24 @@ +package com.sap.sailing.gwt.home.desktop.partials.useraccountDetails; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; + +public interface UseraccountDetailsResources extends ClientBundle { + public static final UseraccountDetailsResources INSTANCE = GWT.create(UseraccountDetailsResources.class); + + @Source("UseraccountDetails.gss") + LocalCss css(); + + public interface LocalCss extends CssResource { + String useraccountdetails(); + String useraccountdetails_image(); + String useraccountdetails_image_editbutton(); + String useraccountdetails_content(); + String useraccountdetails_content_detail(); + String useraccountdetails_content_detail_label(); + String useraccountdetails_content_detail_input(); + String useraccountdetails_content_submit(); + String useraccountdetails_content_spacer(); + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/TabletAndDesktopMultiRegattaEventView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/TabletAndDesktopMultiRegattaEventView.java index 8e4da936316..4aded731a87 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/TabletAndDesktopMultiRegattaEventView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/TabletAndDesktopMultiRegattaEventView.java @@ -29,7 +29,7 @@ public class TabletAndDesktopMultiRegattaEventView extends Composite implements @UiField StringMessages i18n; - @UiField(provided = true) TabPanel tabPanelUi; + @UiField(provided = true) TabPanel> tabPanelUi; @UiField(provided = true) EventHeader eventHeader; private Presenter currentPresenter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/mediatab/MultiregattaMediaPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/mediatab/MultiregattaMediaPlace.java index 34b8cbee29c..d017f174be3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/mediatab/MultiregattaMediaPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/mediatab/MultiregattaMediaPlace.java @@ -2,7 +2,6 @@ package com.sap.sailing.gwt.home.desktop.places.event.multiregatta.mediatab; import com.google.gwt.place.shared.Prefix; import com.sap.sailing.gwt.home.desktop.places.event.multiregatta.AbstractMultiregattaEventPlace; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.app.MobileSupport; import com.sap.sailing.gwt.home.shared.places.PlaceTokenPrefixes; import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace; @@ -27,6 +26,6 @@ public class MultiregattaMediaPlace extends AbstractMultiregattaEventPlace imple @Override public boolean hasMobileVersion() { - return ExperimentalFeatures.SHOW_MEDIA_PAGE_ON_MOBILE; + return true; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/overviewtab/MultiregattaOverviewTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/overviewtab/MultiregattaOverviewTabView.java index 81174530b44..c94a5118240 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/overviewtab/MultiregattaOverviewTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/overviewtab/MultiregattaOverviewTabView.java @@ -9,7 +9,6 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTMLPanel; import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; -import com.sap.sailing.gwt.dispatch.client.SortedSetResult; import com.sap.sailing.gwt.home.communication.event.GetLiveRacesForEventAction; import com.sap.sailing.gwt.home.communication.event.GetRegattaListViewAction; import com.sap.sailing.gwt.home.communication.event.statistics.GetEventStatisticsAction; @@ -28,6 +27,7 @@ import com.sap.sailing.gwt.home.shared.refresh.RefreshManager; import com.sap.sailing.gwt.home.shared.refresh.RefreshManagerWithErrorAndBusy; import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.gwt.dispatch.shared.commands.SortedSetResult; /** * Created by pgtaboada on 25.11.14. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/regattastab/MultiregattaRegattasTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/regattastab/MultiregattaRegattasTabView.java index fdabe3ff3e3..f456aaa8a80 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/regattastab/MultiregattaRegattasTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/regattastab/MultiregattaRegattasTabView.java @@ -9,7 +9,6 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTMLPanel; import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; -import com.sap.sailing.gwt.dispatch.client.SortedSetResult; import com.sap.sailing.gwt.home.communication.event.GetLiveRacesForEventAction; import com.sap.sailing.gwt.home.communication.event.GetRegattaListViewAction; import com.sap.sailing.gwt.home.communication.regatta.RegattaWithProgressDTO; @@ -25,6 +24,7 @@ import com.sap.sailing.gwt.home.shared.refresh.RefreshManager; import com.sap.sailing.gwt.home.shared.refresh.RefreshManagerWithErrorAndBusy; import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.gwt.dispatch.shared.commands.SortedSetResult; /** * Created by pgtaboada on 25.11.14. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java index c5f62288409..0d218a79a69 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/TabletAndDesktopRegattaEventView.java @@ -39,7 +39,7 @@ public class TabletAndDesktopRegattaEventView extends Composite implements Event @UiField StringMessages i18n; - @UiField(provided = true) TabPanel tabPanelUi; + @UiField(provided = true) TabPanel> tabPanelUi; @UiField(provided = true) EventHeader eventHeader; private Presenter currentPresenter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/mediatab/RegattaMediaPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/mediatab/RegattaMediaPlace.java index 90986daa6e1..7c08099a4af 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/mediatab/RegattaMediaPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/mediatab/RegattaMediaPlace.java @@ -2,7 +2,6 @@ package com.sap.sailing.gwt.home.desktop.places.event.regatta.mediatab; import com.google.gwt.place.shared.Prefix; import com.sap.sailing.gwt.home.desktop.places.event.regatta.AbstractEventRegattaPlace; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.app.MobileSupport; import com.sap.sailing.gwt.home.shared.places.PlaceTokenPrefixes; import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace; @@ -33,6 +32,6 @@ public class RegattaMediaPlace extends AbstractEventRegattaPlace implements Mobi @Override public boolean hasMobileVersion() { - return ExperimentalFeatures.SHOW_MEDIA_PAGE_ON_MOBILE; + return true; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/overviewtab/RegattaOverviewTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/overviewtab/RegattaOverviewTabView.java index 22efb5a4088..3f37337fb3f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/overviewtab/RegattaOverviewTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/overviewtab/RegattaOverviewTabView.java @@ -23,7 +23,6 @@ import com.sap.sailing.gwt.home.desktop.partials.statistics.StatisticsBox; import com.sap.sailing.gwt.home.desktop.places.event.regatta.EventRegattaView; import com.sap.sailing.gwt.home.desktop.places.event.regatta.EventRegattaView.Presenter; import com.sap.sailing.gwt.home.desktop.places.event.regatta.RegattaTabView; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.refresh.RefreshManager; import com.sap.sailing.gwt.home.shared.refresh.RefreshManagerWithErrorAndBusy; import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget; @@ -56,9 +55,9 @@ public class RegattaOverviewTabView extends Composite implements RegattaTabView< @Override public TabView.State getState() { if (currentPresenter.getEventDTO().getType() == EventType.MULTI_REGATTA) { - return ExperimentalFeatures.SHOW_MULTIREGATTAEVENT_REGATTA_OVERVIEW ? State.VISIBLE : State.NOT_AVAILABLE_SHOW_NEXT_AVAILABLE; + return State.VISIBLE; } else { - return ExperimentalFeatures.SHOW_SINGLE_REGATTA_OVERVIEW ? State.VISIBLE : State.NOT_AVAILABLE_SHOW_NEXT_AVAILABLE; + return State.VISIBLE; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/racestab/RegattaRacesPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/racestab/RegattaRacesPlace.java index 84b56f1334f..05c2be9c32f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/racestab/RegattaRacesPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/racestab/RegattaRacesPlace.java @@ -2,7 +2,6 @@ package com.sap.sailing.gwt.home.desktop.places.event.regatta.racestab; import com.google.gwt.place.shared.Prefix; import com.sap.sailing.gwt.home.desktop.places.event.regatta.AbstractEventRegattaPlace; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.app.MobileSupport; import com.sap.sailing.gwt.home.shared.places.PlaceTokenPrefixes; import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace; @@ -32,6 +31,6 @@ public class RegattaRacesPlace extends AbstractEventRegattaPlace implements Mobi @Override public boolean hasMobileVersion() { - return ExperimentalFeatures.SHOW_REGATTA_OVERVIEW_AND_RACES_ON_MOBILE; + return true; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/racestab/RegattaRacesTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/racestab/RegattaRacesTabView.java index 2794088c87a..8be2b2befd0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/racestab/RegattaRacesTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/racestab/RegattaRacesTabView.java @@ -17,8 +17,6 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; -import com.sap.sailing.gwt.dispatch.client.DTO; -import com.sap.sailing.gwt.dispatch.client.ResultWithTTL; import com.sap.sailing.gwt.home.communication.SailingAction; import com.sap.sailing.gwt.home.communication.event.GetCompetitionFormatRacesAction; import com.sap.sailing.gwt.home.communication.event.GetFinishedRacesAction; @@ -44,7 +42,6 @@ import com.sap.sailing.gwt.home.desktop.partials.regattanavigation.ListNavigatio import com.sap.sailing.gwt.home.desktop.places.event.EventView; import com.sap.sailing.gwt.home.desktop.places.event.regatta.EventRegattaView.Presenter; import com.sap.sailing.gwt.home.desktop.places.event.regatta.RegattaTabView; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.partials.filter.FilterPresenter; import com.sap.sailing.gwt.home.shared.partials.filter.FilterValueChangeHandler; import com.sap.sailing.gwt.home.shared.partials.filter.FilterWidget; @@ -55,35 +52,26 @@ import com.sap.sailing.gwt.home.shared.refresh.RefreshManager; import com.sap.sailing.gwt.home.shared.refresh.RefreshManagerWithErrorAndBusy; import com.sap.sailing.gwt.home.shared.refresh.RefreshableWidget; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.gwt.dispatch.shared.commands.DTO; +import com.sap.sse.gwt.dispatch.shared.commands.ResultWithTTL; -/** - * Created by pgtaboada on 25.11.14. - */ public class RegattaRacesTabView extends Composite implements RegattaTabView { private static final StringMessages I18N = StringMessages.INSTANCE; private enum Navigation implements ListNavigationAction { - SORT_LIST_FORMAT(I18N.listFormatLabel(), ExperimentalFeatures.SHOW_RACES_BY_COMPETITOR_FILTER), - COMPETITION_FORMAT(I18N.competitionFormatLabel(), ExperimentalFeatures.SHOW_RACES_BY_COMPETITOR_FILTER); + SORT_LIST_FORMAT(I18N.listFormatLabel()), COMPETITION_FORMAT(I18N.competitionFormatLabel()); private final String displayName; - private final boolean showAdditionalWidget; - private Navigation(String displayName, boolean showAdditionalWidget) { + private Navigation(String displayName) { this.displayName = displayName; - this.showAdditionalWidget = showAdditionalWidget; } @Override public String getDisplayName() { return displayName; } - - @Override - public boolean isShowAdditionalWidget() { - return showAdditionalWidget; - } } interface MyBinder extends UiBinder { @@ -140,16 +128,12 @@ public class RegattaRacesTabView extends Composite implements RegattaTabView>> void addRacesAction( diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/TabletAndDesktopEventsView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/TabletAndDesktopEventsView.java index 1030e585fc2..95da95fecbc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/TabletAndDesktopEventsView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/TabletAndDesktopEventsView.java @@ -9,7 +9,6 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.BreadcrumbPane; import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator; import com.sap.sailing.gwt.home.desktop.partials.eventsrecent.EventsOverviewRecent; import com.sap.sailing.gwt.home.desktop.partials.eventsupcoming.EventsOverviewUpcoming; -import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.events.EventsPlace; import com.sap.sailing.gwt.home.shared.places.start.StartPlace; @@ -40,9 +39,7 @@ public class TabletAndDesktopEventsView extends AbstractEventsView { } private void initBreadCrumbs() { - if(ExperimentalFeatures.USE_NAVIGATION_PATH_DISPLAY_ON_DESKTOP) { - breadcrumbs.getElement().getStyle().setDisplay(Display.NONE); - } + breadcrumbs.getElement().getStyle().setDisplay(Display.NONE); final PlaceNavigation homeNavigation = navigator.getHomeNavigation(); breadcrumbs.addBreadcrumbItem(i18n.home(), homeNavigation.getTargetUrl(), new Runnable() { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/TabletAndDesktopSeriesView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/TabletAndDesktopSeriesView.java index 112489d4584..b11dccfc82e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/TabletAndDesktopSeriesView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/TabletAndDesktopSeriesView.java @@ -30,7 +30,7 @@ public class TabletAndDesktopSeriesView extends Composite implements SeriesView< @UiField StringMessages i18n; @UiField(provided = true) - TabPanel tabPanelUi; + TabPanel> tabPanelUi; @UiField(provided = true) SeriesHeader seriesHeader; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java new file mode 100644 index 00000000000..9dc3da6ac38 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java @@ -0,0 +1,82 @@ +package com.sap.sailing.gwt.home.desktop.places.user.profile; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanel; +import com.sap.sailing.gwt.common.client.controls.tabbar.TabPanelPlaceSelectionEvent; +import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; +import com.sap.sailing.gwt.common.client.i18n.TextMessages; +import com.sap.sailing.gwt.home.desktop.partials.userHeader.UserHeader; +import com.sap.sailing.gwt.home.shared.app.ApplicationHistoryMapper; +import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.security.ui.authentication.app.AuthenticationContext; + +public class TabletAndDesktopUserProfileView extends Composite implements UserProfileView { + private static final ApplicationHistoryMapper historyMapper = GWT. create(ApplicationHistoryMapper.class); + + private static MyBinder uiBinder = GWT.create(MyBinder.class); + + private UserProfileView.Presenter currentPresenter; + + interface MyBinder extends UiBinder { + } + + @UiField StringMessages i18n; + + @UiField(provided = true) + TabPanel> tabPanelUi; + + @UiField(provided = true) + UserHeader headerUi; + + public TabletAndDesktopUserProfileView() { + } + + @Override + public void registerPresenter(final UserProfileView.Presenter currentPresenter) { + this.currentPresenter = currentPresenter; + tabPanelUi = new TabPanel<>(currentPresenter, historyMapper); + + headerUi = new UserHeader(); + + initWidget(uiBinder.createAndBindUi(this)); + } + + @Override + public void navigateTabsTo(AbstractUserProfilePlace place) { + tabPanelUi.activatePlace(place); + StringBuilder titleBuilder = new StringBuilder(TextMessages.INSTANCE.sapSailing()).append(" - "); + + titleBuilder.append(place.getLocationTitle()); + + String currentTabTitle = tabPanelUi.getCurrentTabTitle(); + if (currentTabTitle != null && !currentTabTitle.isEmpty()) { + titleBuilder.append(" - ").append(currentTabTitle); + } + Window.setTitle(titleBuilder.toString()); + } + + @Override + public void setUserManagementContext(AuthenticationContext userManagementContext) { + headerUi.setUserManagementContext(userManagementContext); + tabPanelUi.getCurrentTab().setUserManagementContext(userManagementContext); + } + + @SuppressWarnings("unchecked") + @UiHandler("tabPanelUi") + public void onTabSelection(TabPanelPlaceSelectionEvent e) { + currentPresenter.handleTabPlaceSelection((TabView) e.getSelectedActivity()); + } + + @Override + public void showErrorInCurrentTab(IsWidget errorView) { + tabPanelUi.overrideCurrentContentInTab(errorView); + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.ui.xml new file mode 100644 index 00000000000..0d245f6412d --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.ui.xml @@ -0,0 +1,50 @@ + + + + + + .header { + position: relative; + width: 100%; + margin: 0; + padding: 0; + } + .mainHeader { + width: 66.6666666666667%; + } + .sharingHeader { + width: 33.3333333333333%; + float: right; + padding: 0 1rem; + position: relative; + padding: 1.333333333333333em 0; + text-align: right; + background-color: maroon; + height: 2rem; + } + .breadcrumb, .intro { + box-sizing: border-box; + -moz-box-sizing: border-box; + } + .breadcrumb { + font-size: 0.866666666666667em; + font-weight: 600; + } + .intro { + height: 5em; + } + + + + + + + + + + + + \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java new file mode 100644 index 00000000000..a5bf1a7e052 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java @@ -0,0 +1,171 @@ +package com.sap.sailing.gwt.home.desktop.places.user.profile; + +import com.google.gwt.activity.shared.AbstractActivity; +import com.google.gwt.core.shared.GWT; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.place.shared.Place; +import com.google.gwt.safehtml.shared.SafeUri; +import com.google.gwt.safehtml.shared.UriUtils; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; +import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator; +import com.sap.sailing.gwt.home.shared.app.ApplicationHistoryMapper; +import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay; +import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay.NavigationItem; +import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; +import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace; +import com.sap.sailing.gwt.home.shared.places.start.StartPlace; +import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sse.security.shared.UserManagementException; +import com.sap.sse.security.ui.authentication.AuthenticationContextEvent; +import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; +import com.sap.sse.security.ui.client.component.NewAccountValidator; +import com.sap.sse.security.ui.client.i18n.StringMessages; + +public class UserProfileActivity extends AbstractActivity implements UserProfileView.Presenter { + + private static final ApplicationHistoryMapper historyMapper = GWT.create(ApplicationHistoryMapper.class); + + protected final AbstractUserProfilePlace currentPlace; + protected final UserProfileClientFactory clientFactory; + protected final DesktopPlacesNavigator homePlacesNavigator; + + private final StringMessages i18n_sec = StringMessages.INSTANCE; + private final NewAccountValidator validator = new NewAccountValidator(i18n_sec); + + private UserProfileView currentView = new TabletAndDesktopUserProfileView(); + + public UserProfileActivity(AbstractUserProfilePlace place, UserProfileClientFactory clientFactory, + DesktopPlacesNavigator homePlacesNavigator, NavigationPathDisplay navigationPathDisplay) { + this.currentPlace = place; + this.clientFactory = clientFactory; + this.homePlacesNavigator = homePlacesNavigator; + + initNavigationPath(navigationPathDisplay); + } + + private void initNavigationPath(NavigationPathDisplay navigationPathDisplay) { + com.sap.sailing.gwt.ui.client.StringMessages i18n = com.sap.sailing.gwt.ui.client.StringMessages.INSTANCE; + navigationPathDisplay.showNavigationPath(new NavigationItem(i18n.home(), getHomeNavigation()), + new NavigationItem(i18n_sec.userDetails(), getUserProfileNavigation())); + } + + @Override + public void start(final AcceptsOneWidget panel, final EventBus eventBus) { + currentView.registerPresenter(this); + panel.setWidget(currentView); + currentView.navigateTabsTo(currentPlace); + currentView.setUserManagementContext(clientFactory.getAuthenticationManager().getAuthenticationContext()); + eventBus.addHandler(AuthenticationContextEvent.TYPE, new AuthenticationContextEvent.Handler() { + @Override + public void onUserChangeEvent(AuthenticationContextEvent event) { + currentView.setUserManagementContext(event.getCtx()); + } + }); + } + + @Override + public void handleSaveChangesRequest(String fullName, String company) { + final String username = clientFactory.getAuthenticationManager().getAuthenticationContext().getCurrentUser().getName(); + clientFactory.getUserManagementService().updateUserProperties(username, fullName, company, + new AsyncCallback() { + @Override + public void onSuccess(Void result) { + clientFactory.getAuthenticationManager().refreshUserInfo(); + Window.alert(i18n_sec.successfullyUpdatedUserProperties(username)); + } + + @Override + public void onFailure(Throwable caught) { + Window.alert(i18n_sec.errorUpdatingUserProperties(caught.getMessage())); + } + }); + } + + @Override + public void handleEmailChangeRequest(final String email) { + final String username = clientFactory.getAuthenticationManager().getAuthenticationContext().getCurrentUser().getName(); + final String url = Window.Location.createUrlBuilder() + .setHash(homePlacesNavigator.getMailVerifiedConfirmationNavigation().getTargetUrl()).buildString(); + clientFactory.getUserManagementService().updateSimpleUserEmail(username, email, url, + new AsyncCallback() { + @Override + public void onSuccess(Void result) { + Window.alert(i18n_sec.successfullyUpdatedEmail(username, email)); + } + + @Override + public void onFailure(Throwable caught) { + Window.alert(i18n_sec.errorUpdatingEmail(caught.getMessage())); + } + }); + } + + @Override + public void handlePasswordChangeRequest(String oldPassword, String newPassword, String newPasswordConfirmation) { + final String username = clientFactory.getAuthenticationManager().getAuthenticationContext().getCurrentUser().getName(); + String errorMessage = validator.validateUsernameAndPassword(username, newPassword, newPasswordConfirmation); + if (errorMessage != null && !errorMessage.isEmpty()) { + Window.alert(errorMessage); + return; + } + clientFactory.getUserManagementService().updateSimpleUserPassword(username, oldPassword, null, newPassword, + new AsyncCallback() { + @Override + public void onFailure(Throwable caught) { + if (caught instanceof UserManagementException) { + String message = ((UserManagementException) caught).getMessage(); + if (UserManagementException.PASSWORD_DOES_NOT_MEET_REQUIREMENTS.equals(message)) { + Window.alert(i18n_sec.passwordDoesNotMeetRequirements()); + } else if (UserManagementException.INVALID_CREDENTIALS.equals(message)) { + Window.alert(i18n_sec.invalidCredentials()); + } else { + Window.alert(i18n_sec.errorChangingPassword(caught.getMessage())); + } + } else { + Window.alert(i18n_sec.errorChangingPassword(caught.getMessage())); + } + } + + @Override + public void onSuccess(Void result) { + Window.alert(i18n_sec.passwordSuccessfullyChanged()); + currentView.setUserManagementContext(clientFactory.getAuthenticationManager().getAuthenticationContext()); + } + }); + } + + @Override + public void handleTabPlaceSelection(TabView selectedActivity) { + Place tabPlaceToGo = selectedActivity.placeToFire(); + clientFactory.getPlaceController().goTo(tabPlaceToGo); + } + + public void navigateTo(Place place) { + clientFactory.getPlaceController().goTo(place); + } + + @Override + public SafeUri getUrl(AbstractSeriesPlace place) { + String token = historyMapper.getToken(place); + return UriUtils.fromString("#" + token); + } + + @Override + public PlaceNavigation getHomeNavigation() { + return homePlacesNavigator.getHomeNavigation(); + } + + @Override + public PlaceNavigation getUserProfileNavigation() { + return homePlacesNavigator.getUserProfileNavigation(); + + } + + @Override + public void doTriggerLoginForm() { + clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent()); + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java new file mode 100644 index 00000000000..6fba8a17d4f --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivityProxy.java @@ -0,0 +1,45 @@ +package com.sap.sailing.gwt.home.desktop.places.user.profile; + +import com.google.gwt.core.client.GWT; +import com.sap.sailing.gwt.home.desktop.app.DesktopPlacesNavigator; +import com.sap.sailing.gwt.home.desktop.app.WithHeader; +import com.sap.sailing.gwt.home.shared.app.NavigationPathDisplay; +import com.sap.sailing.gwt.home.shared.app.ProvidesNavigationPath; +import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDefaultPlace; +import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDetailsPlace; +import com.sap.sse.gwt.client.mvp.AbstractActivityProxy; + +public class UserProfileActivityProxy extends AbstractActivityProxy implements ProvidesNavigationPath, WithHeader { + + private AbstractUserProfilePlace place; + private UserProfileClientFactory clientFactory; + private final DesktopPlacesNavigator homePlacesNavigator; + private NavigationPathDisplay navigationPathDisplay; + + public UserProfileActivityProxy(AbstractUserProfilePlace place, UserProfileClientFactory clientFactory, + DesktopPlacesNavigator homePlacesNavigator) { + this.place = place; + this.clientFactory = clientFactory; + this.homePlacesNavigator = homePlacesNavigator; + } + + @Override + public void setNavigationPathDisplay(NavigationPathDisplay navigationPathDisplay) { + this.navigationPathDisplay = navigationPathDisplay; + } + + @Override + protected void startAsync() { + GWT.runAsync(new AbstractRunAsyncCallback() { + @Override + public void onSuccess() { + if(place instanceof UserProfileDefaultPlace) { + place = new UserProfileDetailsPlace(); + } + super.onSuccess(new UserProfileActivity(place, clientFactory, + homePlacesNavigator, navigationPathDisplay)); + } + }); + } +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileClientFactory.java new file mode 100644 index 00000000000..bedc9c5a2bf --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileClientFactory.java @@ -0,0 +1,8 @@ +package com.sap.sailing.gwt.home.desktop.places.user.profile; + +import com.sap.sailing.gwt.ui.client.SailingClientFactory; +import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory; +import com.sap.sse.security.ui.authentication.WithAuthenticationManager; + +public interface UserProfileClientFactory extends SailingClientFactory, ErrorAndBusyClientFactory, WithAuthenticationManager { +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileTabView.java new file mode 100644 index 00000000000..3f4b40a37b9 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileTabView.java @@ -0,0 +1,11 @@ +package com.sap.sailing.gwt.home.desktop.places.user.profile; + +import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; +import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sse.security.ui.authentication.app.AuthenticationContext; + +public interface UserProfileTabView extends TabView { + + void setUserManagementContext(AuthenticationContext userManagementContext); + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileView.java new file mode 100644 index 00000000000..73637b01952 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileView.java @@ -0,0 +1,45 @@ +package com.sap.sailing.gwt.home.desktop.places.user.profile; + +import com.google.gwt.place.shared.Place; +import com.google.gwt.safehtml.shared.SafeUri; +import com.google.gwt.user.client.ui.IsWidget; +import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; +import com.sap.sailing.gwt.home.desktop.partials.useraccountDetails.UserAccountDetails; +import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; +import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace; +import com.sap.sailing.gwt.home.shared.places.start.StartPlace; +import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.home.shared.usermanagement.decorator.NotLoggedInPresenter; +import com.sap.sse.security.ui.authentication.app.AuthenticationContext; + +public interface UserProfileView extends IsWidget { + + public interface Presenter extends UserAccountDetails.Presenter, NotLoggedInPresenter { + void handleTabPlaceSelection(TabView selectedActivity); + + SafeUri getUrl(AbstractSeriesPlace place); + void navigateTo(Place place); + + PlaceNavigation getHomeNavigation(); + PlaceNavigation getUserProfileNavigation(); + } + + /** + * This is the presenter the view can talk to. + * + * @param currentPresenter + */ + void registerPresenter(PRES currentPresenter); + + /** + * Tell the view to process tabbar place navigation + * + * @param place + */ + void navigateTabsTo(PLACE place); + + void showErrorInCurrentTab(IsWidget errorView); + + void setUserManagementContext(AuthenticationContext userManagementContext); + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.java new file mode 100644 index 00000000000..80913bd7ac5 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.java @@ -0,0 +1,76 @@ +package com.sap.sailing.gwt.home.desktop.places.user.profile.detailstab; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; +import com.sap.sailing.gwt.home.desktop.partials.useraccountDetails.UserAccountDetails; +import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileTabView; +import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileView; +import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDetailsPlace; +import com.sap.sailing.gwt.home.shared.usermanagement.decorator.AuthorizedContentDecoratorDesktop; +import com.sap.sse.security.ui.authentication.app.AuthenticationContext; + +/** + * Created by pgtaboada on 25.11.14. + */ +public class UserProfileDetailsTabView extends Composite implements UserProfileTabView { + + interface MyBinder extends UiBinder { + } + + private static MyBinder ourUiBinder = GWT.create(MyBinder.class); + + @UiField(provided = true) + AuthorizedContentDecoratorDesktop decoratorUi; + + @UiField(provided = true) + UserAccountDetails accountDetailsUi; + + private UserProfileView.Presenter currentPresenter; + + public UserProfileDetailsTabView() { + } + + @Override + public Class getPlaceClassForActivation() { + return UserProfileDetailsPlace.class; + } + + @Override + public TabView.State getState() { + return TabView.State.VISIBLE; + } + + @Override + public void start(UserProfileDetailsPlace myPlace, AcceptsOneWidget contentArea) { + decoratorUi = new AuthorizedContentDecoratorDesktop(currentPresenter); + accountDetailsUi = new UserAccountDetails(currentPresenter); + initWidget(ourUiBinder.createAndBindUi(this)); + contentArea.setWidget(this); + } + + @Override + public void setUserManagementContext(AuthenticationContext userManagementContext) { + decoratorUi.setUserManagementContext(userManagementContext); + accountDetailsUi.setUserManagementContext(userManagementContext); + } + + @Override + public void stop() { + + } + + @Override + public UserProfileDetailsPlace placeToFire() { + return new UserProfileDetailsPlace(); + } + + @Override + public void setPresenter(UserProfileView.Presenter currentPresenter) { + this.currentPresenter = currentPresenter; + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.ui.xml new file mode 100644 index 00000000000..03cd95884a3 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.ui.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/MobileEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/MobileEntryPoint.java index 8d6007644ee..164aa0175e4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/MobileEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/MobileEntryPoint.java @@ -22,6 +22,7 @@ import com.sap.sse.gwt.resources.CommonControlsCSS; public class MobileEntryPoint extends AbstractMvpEntryPoint { + @Override public void doOnModuleLoad() { Document.get().getBody().addClassName(SharedResources.INSTANCE.mainCss().mobile()); @@ -45,7 +46,7 @@ public class MobileEntryPoint extends AbstractMvpEntryPoint> implements ErrorAndBusyClientFactory, SearchResultClientFactory { +public class MobileApplicationClientFactory extends + SecureClientFactoryImpl> implements + ErrorAndBusyClientFactory, SearchResultClientFactory, ConfirmationClientFactory, PasswordResetClientFactory, + WithAuthenticationManager { private final MobilePlacesNavigator navigator; private final SailingDispatchSystem dispatch = new SailingDispatchSystemImpl(); + private final AuthenticationManager authenticationManager; public MobileApplicationClientFactory(boolean isStandaloneServer) { this(new SimpleEventBus(), isStandaloneServer); @@ -48,6 +65,9 @@ public class MobileApplicationClientFactory extends SecureClientFactoryImpl getPasswordResettedConfirmationNavigation(String username) { + return getNavigator().getPasswordResettedConfirmationNavigation(username); + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.java index 66bc213a76d..5a4840c3b1b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationView.java @@ -41,7 +41,7 @@ public class MobileApplicationView extends Composite implements ApplicationTopLe SimplePanel mainContentPanel; public MobileApplicationView(MobilePlacesNavigator placeNavigator, EventBus eventBus) { - headerPanel = new Header(placeNavigator); + headerPanel = new Header(placeNavigator, eventBus); footerPanel = new Footer(placeNavigator); initWidget(uiBinder.createAndBindUi(this)); eventBus.addHandler(PlaceChangeEvent.TYPE, new PlaceChangeEvent.Handler() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java index ffa27130262..11e9021630e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java @@ -10,6 +10,7 @@ import com.sap.sailing.gwt.home.desktop.places.event.regatta.overviewtab.Regatta import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace; import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace.WhatsNewNavigationTabs; import com.sap.sailing.gwt.home.mobile.places.event.latestnews.LatestNewsPlace; +import com.sap.sailing.gwt.home.mobile.places.user.authentication.AuthenticationPlace; import com.sap.sailing.gwt.home.shared.app.AbstractPlaceNavigator; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.event.AbstractEventPlace; @@ -18,9 +19,15 @@ import com.sap.sailing.gwt.home.shared.places.event.EventDefaultPlace; import com.sap.sailing.gwt.home.shared.places.events.EventsPlace; import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace; import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace; +import com.sap.sailing.gwt.home.shared.places.imprint.ImprintPlace; import com.sap.sailing.gwt.home.shared.places.solutions.SolutionsPlace; import com.sap.sailing.gwt.home.shared.places.solutions.SolutionsPlace.SolutionsNavigationTabs; import com.sap.sailing.gwt.home.shared.places.start.StartPlace; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace.Action; +import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetPlace; +import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDefaultPlace; public class MobilePlacesNavigator extends AbstractPlaceNavigator { @@ -78,6 +85,10 @@ public class MobilePlacesNavigator extends AbstractPlaceNavigator { return createGlobalPlaceNavigation(new AboutUsPlace()); } + public PlaceNavigation getImprintNavigation() { + return createGlobalPlaceNavigation(new ImprintPlace()); + } + public PlaceNavigation getContactNavigation() { return createGlobalPlaceNavigation(new ContactPlace()); } @@ -86,4 +97,24 @@ public class MobilePlacesNavigator extends AbstractPlaceNavigator { boolean isOnRemoteServer) { return createPlaceNavigation(baseUrl, isOnRemoteServer, new RegattaOverviewPlace(eventId, leaderboardName)); } + + public PlaceNavigation getSignInNavigation() { + return createGlobalPlaceNavigation(new AuthenticationPlace()); + } + + public PlaceNavigation getUserProfileNavigation() { + return createGlobalPlaceNavigation(new UserProfileDefaultPlace()); + } + + public PlaceNavigation getMailVerifiedConfirmationNavigation() { + return createGlobalPlaceNavigation(new ConfirmationPlace(Action.MAIL_VERIFIED)); + } + + public PlaceNavigation getPasswordResettedConfirmationNavigation(String username) { + return createGlobalPlaceNavigation(new ConfirmationPlace(Action.RESET_EXECUTED, username)); + } + + public PlaceNavigation getPasswordResetNavigation() { + return createGlobalPlaceNavigation(new PasswordResetPlace()); + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java index 61e175b7d6c..0f950aeedaf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.java @@ -41,6 +41,7 @@ public class Footer extends Composite { private MobilePlacesNavigator placeNavigator; @UiField Anchor changeLanguageLink; + @UiField AnchorElement imprintAnchorLink; @UiField DivElement languageSelectionDiv; @UiField AnchorElement desktopUi; @@ -67,6 +68,7 @@ public class Footer extends Composite { FooterResources.INSTANCE.css().ensureInjected(); initWidget(uiBinder.createAndBindUi(this)); + placeNavigator.getImprintNavigation().configureAnchorElement(imprintAnchorLink); updateUI(); DOM.sinkEvents(desktopUi, Event.ONCLICK); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml index f0927400f74..715bf277573 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/footer/Footer.ui.xml @@ -1,94 +1,92 @@ - - - + xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared"> + + + - - .languageSelect::-ms-expand { - display: none; - } - - .languageSelect { - -webkit-appearance: none; - -moz-appearance: none; - -ms-appearance: none; - appearance: none; - margin-top: 25px; - color: #efaa00; - line-height: 1.5em; - height: 1.5em; - display: inline-block; - border: transparent; - cursor: pointer; - padding-right: 1.2em; - background: #333; - cursor: pointer; - background-image: - url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHZlcnNpb249JzEuMScgaGVpZ2h0PScxOHB4JyB3aWR0aD0nMTZweCc+PHRleHQgeD0nMCcgeT0nMTUnIGZpbGw9JyNlZmFhMDAnIGZvbnQtc2l6ZT0nMTYnPiYjOTY2MDs8L3RleHQ+PC9zdmc+"); - background-position: right center; - background-repeat: no-repeat; - font-size: 110%; - } - - - -
-
-
+ + .languageSelect::-ms-expand { + display: none; + } - - - : - - - + .languageSelect { + -webkit-appearance: none; + -moz-appearance: none; + -ms-appearance: none; + appearance: none; + margin-top: 25px; + color: #efaa00; + line-height: 1.5em; + height: 1.5em; + display: inline-block; + border: transparent; + cursor: pointer; + padding-right: 1.2em; + background: #333; + cursor: pointer; + background-image: + url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHZlcnNpb249JzEuMScgaGVpZ2h0PScxOHB4JyB3aWR0aD0nMTZweCc+PHRleHQgeD0nMCcgeT0nMTUnIGZpbGw9JyNlZmFhMDAnIGZvbnQtc2l6ZT0nMTYnPiYjOTY2MDs8L3RleHQ+PC9zdmc+"); + background-position: right center; + background-repeat: no-repeat; + font-size: 110%; + } + + + + - +
+
+ + + + + + + + | + + + +

+ + + + | + + Desktop + + | + + + +
+
+ +
+
+
+ \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss index 8be8070ff78..c253f8427ea 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.gss @@ -146,7 +146,7 @@ img.header_logo_image { right: 0; } .header_navigation_icon { - position: absolute; + position: relative; top: 50%; left: 50%; -webkit-transform: translate(-50%, -50%); @@ -154,4 +154,13 @@ img.header_logo_image { -ms-transform: translate(-50%, -50%); transform: translate(-50%, -50%); width: 1em; + height: 1.333333333333333em; + background-image: url("images/mobile/navigation-icon.svg"); + background-repeat: no-repeat; + background-size: contain; + background-position: center center; +} +.header_navigation_iconsignedin { + width: 1.666666666666667em; + background-image: url("images/mobile/navigation-icon-signedin.svg"); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java index 7821f05354f..d9b2060e04c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java @@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.mobile.partials.header; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Element; -import com.google.gwt.dom.client.ImageElement; import com.google.gwt.dom.client.Style.Display; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -13,7 +12,9 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.EventListener; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; +import com.google.web.bindery.event.shared.EventBus; import com.sap.sailing.gwt.common.client.LinkUtil; import com.sap.sailing.gwt.common.client.i18n.TextMessages; import com.sap.sailing.gwt.home.mobile.app.MobilePlacesNavigator; @@ -22,6 +23,8 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.app.ResettableNavigationPathDisplay; import com.sap.sailing.gwt.home.shared.utils.DropdownHandler; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.security.ui.authentication.AuthenticationContextEvent; +import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; public class Header extends Composite { @@ -29,7 +32,7 @@ public class Header extends Composite { // @UiField Button searchButton; @UiField HeaderResources local_res; - @UiField ImageElement dropdownTriggerUi; + @UiField DivElement dropdownTriggerUi; @UiField Element dropdownContainerUi; @UiField FlowPanel dropdownListUi; @UiField FlowPanel dropdownListExtUi; @@ -44,9 +47,12 @@ public class Header extends Composite { } private static HeaderUiBinder uiBinder = GWT.create(HeaderUiBinder.class); - private DropdownHandler dropdownHandler; + private final DropdownHandler dropdownHandler; + private final HeaderNavigationItem signInNavigationItem; + private final HeaderNavigationItem userDetailsNavigationItem; + private final HeaderNavigationItem signOutNavigationItem; - public Header(final MobilePlacesNavigator placeNavigator) { + public Header(final MobilePlacesNavigator placeNavigator, final EventBus eventBus) { initWidget(uiBinder.createAndBindUi(this)); local_res.css().ensureInjected(); @@ -57,6 +63,20 @@ public class Header extends Composite { addNavigation(placeNavigator.getEventsNavigation(), StringMessages.INSTANCE.events()); addNavigation(placeNavigator.getSolutionsNavigation(), TextMessages.INSTANCE.solutions()); addUrl("http://blog.sapsailing.com", TextMessages.INSTANCE.blog()); + signInNavigationItem = addNavigation(com.sap.sse.security.ui.client.i18n.StringMessages.INSTANCE.signIn(), new Runnable() { + @Override + public void run() { + placeNavigator.getSignInNavigation().goToPlace(); + } + }); + userDetailsNavigationItem = addNavigation(placeNavigator.getUserProfileNavigation(), com.sap.sse.security.ui.client.i18n.StringMessages.INSTANCE.userDetails()); + signOutNavigationItem = addNavigation(com.sap.sse.security.ui.client.i18n.StringMessages.INSTANCE.signOut(), new Runnable() { + @Override + public void run() { + eventBus.fireEvent(new AuthenticationRequestEvent(false)); + } + }); + dropdownHandler = new DropdownHandler(dropdownTriggerUi, dropdownContainerUi); Event.sinkEvents(searchUi, Event.ONCLICK); @@ -70,25 +90,57 @@ public class Header extends Composite { } }); + + if (ExperimentalFeatures.SHOW_USER_MANAGEMENT_ON_MOBILE) { + eventBus.addHandler(AuthenticationContextEvent.TYPE, new AuthenticationContextEvent.Handler() { + @Override + public void onUserChangeEvent(AuthenticationContextEvent event) { + String loggedInStyle = HeaderResources.INSTANCE.css().header_navigation_iconsignedin(); + UIObject.setStyleName(dropdownTriggerUi, loggedInStyle, event.getCtx().isLoggedIn()); + signInNavigationItem.setVisible(!event.getCtx().isLoggedIn()); + userDetailsNavigationItem.setVisible(event.getCtx().isLoggedIn()); + signOutNavigationItem.setVisible(event.getCtx().isLoggedIn()); + } + }); + } else { + signInNavigationItem.removeFromParent(); + userDetailsNavigationItem.removeFromParent(); + signOutNavigationItem.removeFromParent(); + } } public ResettableNavigationPathDisplay getNavigationPathDisplay() { return navigationPathDisplay; } - private void addNavigation(final PlaceNavigation placeNavigation, String name) { - HeaderNavigationItem navigationItem = new HeaderNavigationItem(name, placeNavigation.getTargetUrl()); + private HeaderNavigationItem addNavigation(final PlaceNavigation placeNavigation, String name) { + return addNavigation(placeNavigation.getTargetUrl(), name, new Runnable() { + @Override + public void run() { + placeNavigation.goToPlace(); + } + + }); + } + + private HeaderNavigationItem addNavigation(String name, final Runnable action) { + return addNavigation(null, name, action); + } + + private HeaderNavigationItem addNavigation(String url, String name, final Runnable action) { + HeaderNavigationItem navigationItem = new HeaderNavigationItem(name, url); navigationItem.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { if(LinkUtil.handleLinkClick(event.getNativeEvent().cast())) { event.preventDefault(); - placeNavigation.goToPlace(); + action.run(); dropdownHandler.setVisible(false); } } }); dropdownListUi.add(navigationItem); + return navigationItem; } private void addUrl(String url, String name) { @@ -104,25 +156,23 @@ public class Header extends Composite { @Override public void showNavigationPath(NavigationItem... navigationPath) { dropdownListExtUi.clear(); - if(ExperimentalFeatures.USE_NAVIGATION_PATH_DISPLAY_ON_MOBILE) { - for (final NavigationItem navigationItem : navigationPath) { - HeaderNavigationItem headerNavItem = new HeaderNavigationItem(navigationItem.getDisplayName(), navigationItem.getTargetUrl()); - headerNavItem.addStyleName(local_res.css().header_navigation_nav_sublist_item()); - headerNavItem.addClickHandler(new ClickHandler() { - - @Override - public void onClick(ClickEvent event) { - if(LinkUtil.handleLinkClick(event.getNativeEvent().cast())) { - event.preventDefault(); - navigationItem.run(); - dropdownHandler.setVisible(false); - } + for (final NavigationItem navigationItem : navigationPath) { + HeaderNavigationItem headerNavItem = new HeaderNavigationItem(navigationItem.getDisplayName(), + navigationItem.getTargetUrl()); + headerNavItem.addStyleName(local_res.css().header_navigation_nav_sublist_item()); + headerNavItem.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + if (LinkUtil.handleLinkClick(event.getNativeEvent(). cast())) { + event.preventDefault(); + navigationItem.run(); + dropdownHandler.setVisible(false); } - }); - dropdownListExtUi.add(headerNavItem); - } - dropdownListExtUi.getElement().getStyle().clearDisplay(); + } + }); + dropdownListExtUi.add(headerNavItem); } + dropdownListExtUi.getElement().getStyle().clearDisplay(); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml index c6738b9daf6..827fddb8d25 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.ui.xml @@ -23,7 +23,7 @@
- +