eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-25 05:23:51 +00:00
Code Activity

Merge branch 'bug-3113' into bug3027

Browse Source
This commit is contained in:
Axel Uhl committed 2015-07-16 13:15:13 +02:00
2 parents c327260fec b362a7c23c
commit 789e13298f
10 files changed
+27 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/RibDashboardEntryPoint.java
+1
View File
@@ -29,6 +29,7 @@ public class RibDashboardEntryPoint extends AbstractEntryPoint<StringMessages> {
@Override
public void doOnModuleLoad() {
SailingServiceAsync sailingService = GWT.create(SailingService.class);
EntryPointHelper.registerASyncService((ServiceDefTarget) sailingService, RemoteServiceMappingConstants.WEB_CONTEXT_PATH, RemoteServiceMappingConstants.sailingServiceRemotePath);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<inherits name='com.google.gwt.debug.Debug'/>
<!-- Highcharts API -->
<inherits name='com.sap.sse.gwt.Highcharts_Autoinject' />
<inherits name='com.sap.sse.gwt.Highcharts' />
<!-- Google Maps API -->
<inherits name='com.google.gwt.ajaxloader.AjaxLoader' />
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
+2
View File
@@ -33,6 +33,7 @@ import com.sap.sse.gwt.client.EntryPointHelper;
import com.sap.sse.gwt.client.async.AsyncActionsExecutor;
import com.sap.sse.gwt.client.async.MarkedAsyncCallback;
import com.sap.sse.gwt.client.controls.filestorage.FileStoragePanel;
import com.sap.sse.gwt.resources.Highcharts;
import com.sap.sse.security.ui.client.component.UserManagementPanel;
import com.sap.sse.security.ui.client.i18n.StringMessages;
@@ -45,6 +46,7 @@ public class AdminConsoleEntryPoint extends AbstractSailingEntryPoint implements
@Override
protected void doOnModuleLoad() {
Highcharts.ensureInjectedWithMore();
super.doOnModuleLoad();
EntryPointHelper.registerASyncService((ServiceDefTarget) mediaService, RemoteServiceMappingConstants.mediaServiceRemotePath);
createUI();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java
+2
View File
@@ -27,6 +27,7 @@ import com.sap.sse.datamining.shared.impl.UUIDDataMiningSession;
import com.sap.sse.gwt.client.EntryPointHelper;
import com.sap.sse.gwt.client.shared.components.ComponentResources;
import com.sap.sse.gwt.client.shared.components.SettingsDialog;
import com.sap.sse.gwt.resources.Highcharts;
import com.sap.sse.gwt.shared.GwtHttpRequestUtils;
public class DataMiningEntryPoint extends AbstractSailingEntryPoint {
@@ -38,6 +39,7 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint {
@Override
protected void doOnModuleLoad() {
Highcharts.ensureInjectedWithMore();
super.doOnModuleLoad();
session = new UUIDDataMiningSession(UUID.randomUUID());
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/polarsheets/PolarSheetsEntryPoint.java
+2
View File
@@ -10,6 +10,7 @@ import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint;
import com.sap.sailing.gwt.ui.client.RegattaRefresher;
import com.sap.sailing.gwt.ui.client.RegattasDisplayer;
import com.sap.sailing.gwt.ui.shared.RegattaDTO;
import com.sap.sse.gwt.resources.Highcharts;
public class PolarSheetsEntryPoint extends AbstractSailingEntryPoint implements RegattaRefresher {
@@ -17,6 +18,7 @@ public class PolarSheetsEntryPoint extends AbstractSailingEntryPoint implements
@Override
protected void doOnModuleLoad() {
Highcharts.ensureInjectedWithMore();
super.doOnModuleLoad();
regattaDisplayers = new HashSet<RegattasDisplayer>();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorEntryPoint.java
+2
View File
@@ -16,6 +16,7 @@ import com.sap.sailing.gwt.ui.client.SimulatorService;
import com.sap.sailing.gwt.ui.client.SimulatorServiceAsync;
import com.sap.sailing.simulator.util.SailingSimulatorConstants;
import com.sap.sse.gwt.client.EntryPointHelper;
import com.sap.sse.gwt.resources.Highcharts;
public class SimulatorEntryPoint extends AbstractSailingEntryPoint {
@@ -45,6 +46,7 @@ public class SimulatorEntryPoint extends AbstractSailingEntryPoint {
@Override
protected void doOnModuleLoad() {
Highcharts.ensureInjectedWithExport();
super.doOnModuleLoad();
EntryPointHelper.registerASyncService((ServiceDefTarget) simulatorService, RemoteServiceMappingConstants.simulatorServiceRemotePath);
checkUrlParameters();
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<inherits name='com.sap.sailing.gwt.ui.CommonConfigs'/>
<!-- Highcharts API -->
<inherits name="com.sap.sse.gwt.Highcharts_Autoinject"/>
<inherits name="com.sap.sse.gwt.Highcharts"/>
<!-- Google Maps API -->
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/PolarSheets.gwt.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<!-- Highcharts API -->
<inherits name="com.sap.sse.gwt.Highcharts_Autoinject" />
<inherits name="com.sap.sse.gwt.Highcharts" />
<!-- Google Maps API -->
<inherits name='com.google.gwt.ajaxloader.AjaxLoader' />
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<inherits name="com.sap.sailing.simulator.Simulator" />
<!-- Highcharts API -->
<inherits name="com.sap.sse.gwt.Highcharts_Autoinject" />
<inherits name="com.sap.sse.gwt.Highcharts" />
<!-- Google Maps API -->
<inherits name='com.google.gwt.ajaxloader.AjaxLoader' />
java/com.sap.sse.gwt/src/com/sap/sse/gwt/resources/Highcharts.java
+14 -1
View File
@@ -13,9 +13,22 @@ public class Highcharts {
public static LegacyResources LEGACY = GWT.create(LegacyResources.class);
public static void ensureInjected() {
ScriptInjector.fromString(LEGACY.highcharts().getText()).setWindow(ScriptInjector.TOP_WINDOW).inject();
ScriptInjector.fromString(LEGACY.highchartsMore().getText()).setWindow(ScriptInjector.TOP_WINDOW).inject();
ScriptInjector.fromString(LEGACY.highchartsThemeGrid().getText()).setWindow(ScriptInjector.TOP_WINDOW).inject();
}
public static void ensureInjectedWithMore() {
ensureInjected();
ScriptInjector.fromString(LEGACY.highchartsMore().getText()).setWindow(ScriptInjector.TOP_WINDOW).inject();
ScriptInjector.fromString(LEGACY.highchartsModuleExport().getText()).setWindow(ScriptInjector.TOP_WINDOW)
.inject();
}
public static void ensureInjectedWithExport() {
ensureInjected();
ensureInjectedWithMore();
ScriptInjector.fromString(LEGACY.highchartsMore().getText()).setWindow(ScriptInjector.TOP_WINDOW).inject();
ScriptInjector.fromString(LEGACY.highchartsModuleExport().getText()).setWindow(ScriptInjector.TOP_WINDOW)
.inject();
}
}