From f8e3c32baeecfef0c0b40e1d224b76bdabdc117d Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 25 Jan 2016 11:11:03 +0100 Subject: [PATCH] integrated loading indicator in abstract entry point hierarchy and included in AdminConsole and EmbeddedMapAndWindChart entry points Change-Id: Ia22bed6fd44a2cf2035a313d73dacfa5236de63a --- java/com.sap.sailing.gwt.ui/AdminConsole.html | 72 ++++++++++++++++++ .../EmbeddedMapAndWindChart.html | 74 ++++++++++++++++++- java/com.sap.sailing.gwt.ui/Home.html | 4 +- .../ui/client/AbstractSecureEntryPoint.java | 10 +++ 4 files changed, 157 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/AdminConsole.html b/java/com.sap.sailing.gwt.ui/AdminConsole.html index 182b6efdd40..d170f37244a 100644 --- a/java/com.sap.sailing.gwt.ui/AdminConsole.html +++ b/java/com.sap.sailing.gwt.ui/AdminConsole.html @@ -41,6 +41,73 @@ + + + @@ -61,5 +128,10 @@ +
+

SAP Sailing Analytics

+

Loading, please wait...

+
+
diff --git a/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html b/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html index 440a01f45c2..7d41e6e92cc 100644 --- a/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html +++ b/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html @@ -24,6 +24,73 @@ + + + @@ -36,6 +103,11 @@ in order for this application to display correctly. - + +
+

SAP Sailing Analytics

+

Loading, please wait...

+
+
diff --git a/java/com.sap.sailing.gwt.ui/Home.html b/java/com.sap.sailing.gwt.ui/Home.html index e4172f8e8a0..549a7c2e720 100644 --- a/java/com.sap.sailing.gwt.ui/Home.html +++ b/java/com.sap.sailing.gwt.ui/Home.html @@ -15,8 +15,8 @@ - - + + diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/AbstractSecureEntryPoint.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/AbstractSecureEntryPoint.java index 235981885d6..658a86f04ad 100755 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/AbstractSecureEntryPoint.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/AbstractSecureEntryPoint.java @@ -1,6 +1,8 @@ package com.sap.sse.security.ui.client; import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.dom.client.Document; +import com.google.gwt.dom.client.Element; import com.sap.sse.gwt.client.StringMessages; /** @@ -15,8 +17,16 @@ import com.sap.sse.gwt.client.StringMessages; public abstract class AbstractSecureEntryPoint extends com.sap.sse.gwt.client.AbstractEntryPoint implements WithSecurity { private WithSecurity securityProvider; + /** + * Initializes the {@link UserManagementService} and removes the optional loading indicator from the DOM which is + * identified by the "loading" ID. + */ protected void doOnModuleLoad() { securityProvider = new DefaultWithSecurityImpl(); + final Element optionalLoadingIndicator = Document.get().getElementById("loading"); + if (optionalLoadingIndicator != null) { + optionalLoadingIndicator.removeFromParent(); + } } @Override