change RibDashboardPanel to DashboardPanel and cleaned up theme

This commit is contained in:
Alexander Ries committed 2015-12-17 11:37:08 +01:00
1 parent 5bc5f4906e
commit d8d016087a
19 files changed
+33 -30

No files matched your search

@@ -6,6 +6,7 @@ import com.googlecode.mgwt.ui.client.MGWTSettings;
import com.googlecode.mgwt.ui.client.MGWTSettings.StatusBarStyle;
import com.googlecode.mgwt.ui.client.MGWTSettings.ViewPort;
import com.googlecode.mgwt.ui.client.MGWTStyle;
import com.sap.sailing.dashboards.gwt.client.dashboardpanel.DashboardPanel;
import com.sap.sailing.dashboards.gwt.client.dataretriever.WindBotDataRetriever;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sse.gwt.client.AbstractEntryPoint;
@@ -21,10 +22,10 @@ public class RibDashboardEntryPoint extends AbstractEntryPoint<StringMessages> {
public void doOnModuleLoad() {
applyMGWTSettings();
DashboardClientFactory dashboardClientFactory = new DashboardClientFactoryImpl();
RibDashboardPanel ribDashboardPanel = new RibDashboardPanel(dashboardClientFactory);
RootLayoutPanel.get().add(ribDashboardPanel);
DashboardPanel rootPanel = new DashboardPanel(dashboardClientFactory);
RootLayoutPanel.get().add(rootPanel);
WindBotDataRetriever windBotDataRetriever = new WindBotDataRetriever(dashboardClientFactory);
windBotDataRetriever.addNumberOfWindBotsChangeListeners(ribDashboardPanel);
windBotDataRetriever.addNumberOfWindBotsChangeListeners(rootPanel);
}
private void applyMGWTSettings() {
@@ -1,4 +1,4 @@
package com.sap.sailing.dashboards.gwt.client;
package com.sap.sailing.dashboards.gwt.client.dashboardpanel;
import java.util.ArrayList;
import java.util.Date;
@@ -18,12 +18,14 @@ import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.LayoutPanel;
import com.google.gwt.user.client.ui.Widget;
import com.googlecode.mgwt.ui.client.widget.carousel.Carousel;
import com.sap.sailing.dashboards.gwt.client.DashboardClientFactory;
import com.sap.sailing.dashboards.gwt.client.PollsLiveDataEvery5Seconds;
import com.sap.sailing.dashboards.gwt.client.RibDashboardImageResources;
import com.sap.sailing.dashboards.gwt.client.actions.GetIDFromRaceThatIsLiveAction;
import com.sap.sailing.dashboards.gwt.client.dataretriever.NumberOfWindBotsChangeListener;
import com.sap.sailing.dashboards.gwt.client.dataretriever.WindBotDataRetrieverProvider;
import com.sap.sailing.dashboards.gwt.client.eventlogo.EventLogo;
import com.sap.sailing.dashboards.gwt.client.notifications.orientation.WrongDeviceOrientationNotification;
import com.sap.sailing.dashboards.gwt.client.resources.DashboardResources;
import com.sap.sailing.dashboards.gwt.client.startanalysis.StartAnalysisComponent;
import com.sap.sailing.dashboards.gwt.client.startlineadvantage.geometry.StartLineAdvantageByGeometryComponent;
import com.sap.sailing.dashboards.gwt.client.startlineadvantage.wind.StartlineAdvantagesByWindComponent;
@@ -40,9 +42,9 @@ import com.sap.sailing.gwt.ui.client.StringMessages;
* @author Alexander Ries
*
*/
public class RibDashboardPanel extends Composite implements NumberOfWindBotsChangeListener, PollsLiveDataEvery5Seconds {
public class DashboardPanel extends Composite implements NumberOfWindBotsChangeListener, PollsLiveDataEvery5Seconds {
interface RootUiBinder extends UiBinder<Widget, RibDashboardPanel> {}
interface RootUiBinder extends UiBinder<Widget, DashboardPanel> {}
private static RootUiBinder uiBinder = GWT.create(RootUiBinder.class);
@@ -85,10 +87,10 @@ public class RibDashboardPanel extends Composite implements NumberOfWindBotsChan
private List<WindBotComponent> windBotComponents;
private StringMessages stringConstants;
DashboardClientFactory dashboardClientFactory;
private static final Logger logger = Logger.getLogger(RibDashboardPanel.class.getName());
private static final Logger logger = Logger.getLogger(DashboardPanel.class.getName());
public RibDashboardPanel(DashboardClientFactory dashboardClientFactory) {
DashboardResources.INSTANCE.style().ensureInjected();
public DashboardPanel(DashboardClientFactory dashboardClientFactory) {
DashboardPanelResources.INSTANCE.style().ensureInjected();
this.dashboardClientFactory = dashboardClientFactory;
windBotComponents = new ArrayList<WindBotComponent>();
startanalysisComponent = new StartAnalysisComponent(this.dashboardClientFactory);
@@ -108,7 +110,7 @@ public class RibDashboardPanel extends Composite implements NumberOfWindBotsChan
private void initLogos() {
Image logo = new Image();
logo.setResource(RibDashboardImageResources.INSTANCE.logo_sap());
logo.getElement().addClassName(DashboardResources.INSTANCE.style().logo());
logo.getElement().addClassName(DashboardPanelResources.INSTANCE.style().logo());
Document.get().getBody().appendChild(logo.getElement());
}
@@ -7,7 +7,7 @@
xmlns:mgwtcarousel="urn:import:com.googlecode.mgwt.ui.client.widget.carousel"
xmlns:mgwtpanel="urn:import:com.googlecode.mgwt.ui.client.widget.panel">
<ui:with field="resources" type="com.sap.sailing.dashboards.gwt.client.resources.DashboardResources"/>
<ui:with field="resources" type="com.sap.sailing.dashboards.gwt.client.dashboardpanel.DashboardPanelResources"/>
<g:LayoutPanel ui:field="root">
<g:layer left="0%" top="0%" right="0%" height="35pt">
@@ -1,4 +1,4 @@
package com.sap.sailing.dashboards.gwt.client.resources;
package com.sap.sailing.dashboards.gwt.client.dashboardpanel;
/**
* @author Alexander Ries (D062114)
@@ -8,11 +8,11 @@ import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.CssResource;
public interface DashboardResources extends ClientBundle {
public interface DashboardPanelResources extends ClientBundle {
public static final DashboardResources INSTANCE = GWT.create(DashboardResources.class);
public static final DashboardPanelResources INSTANCE = GWT.create(DashboardPanelResources.class);
@Source({"theme/theme.gss", "Ribstyle.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "DashboardPanel.gss"})
DashboardGSS style();
public interface DashboardGSS extends CssResource {
@@ -12,7 +12,7 @@ public interface BottomNotificationResources extends ClientBundle{
public static final BottomNotificationResources INSTANCE = GWT.create(BottomNotificationResources.class);
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "BottomNotification.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "BottomNotification.gss"})
NotificationsGSS gss();
public interface NotificationsGSS extends CssResource {
@@ -12,7 +12,7 @@ public interface WrongDeviceOrientationNotificationResources extends ClientBundl
public static final WrongDeviceOrientationNotificationResources INSTANCE = GWT.create(WrongDeviceOrientationNotificationResources.class);
@Source({ "com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "WrongDeviceOrientationNotification.gss"})
@Source({ "com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "WrongDeviceOrientationNotification.gss"})
WrongDeviceNotificationGSS gss();
public interface WrongDeviceNotificationGSS extends CssResource {
@@ -13,10 +13,10 @@ interface StartAnalysisResources extends ClientBundle {
@Source("com/sap/sailing/dashboards/gwt/client/images/windarrow.png")
ImageResource combinedWindIcon();
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "StartAnalysis.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "StartAnalysis.gss"})
StartAnalysisGSS gss();
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "StartAnalysisCombinedWindPanel.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "StartAnalysisCombinedWindPanel.gss"})
CombinedWindPanelStyle combinedWindPanelStyle();
public interface StartAnalysisGSS extends CssResource {
@@ -9,7 +9,7 @@ public interface StartLineAdvantageByGeometryRessources extends ClientBundle {
public static final StartLineAdvantageByGeometryRessources INSTANCE = GWT.create(StartLineAdvantageByGeometryRessources.class);
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "StartLineAdvantageByGeometry.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "StartLineAdvantageByGeometry.gss"})
StartLineAdvantageByGeometryGss gss();
@Shared
@@ -12,7 +12,7 @@ public interface LiveAverageComponentResources extends ClientBundle {
public static final LiveAverageComponentResources INSTANCE = GWT.create(LiveAverageComponentResources.class);
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "LiveAverageComponent.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "LiveAverageComponent.gss"})
LiveAverageComponentGss gss();
interface LiveAverageComponentGss extends CssResource {
@@ -12,7 +12,7 @@ public interface StartlineAdvantagesByWindComponentResources extends ClientBundl
public static final StartlineAdvantagesByWindComponentResources INSTANCE = GWT.create(StartlineAdvantagesByWindComponentResources.class);
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "StartlineAdvantagesByWindComponent.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "StartlineAdvantagesByWindComponent.gss"})
StartlineAdvantagesOnLineChartGSS gss();
public interface StartlineAdvantagesOnLineChartGSS extends CssResource {
@@ -12,7 +12,7 @@ public interface StartlineAdvantagesOnLineChartResources extends ClientBundle {
public static final StartlineAdvantagesOnLineChartResources INSTANCE = GWT.create(StartlineAdvantagesOnLineChartResources.class);
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "StartlineAdvantagesOnLineChart.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "StartlineAdvantagesOnLineChart.gss"})
StartlineAdvantagesOnLineChartGSS gss();
public interface StartlineAdvantagesOnLineChartGSS extends CssResource {
@@ -1,4 +1,4 @@
package com.sap.sailing.dashboards.gwt.client.resources.theme;
package com.sap.sailing.dashboards.gwt.client.theme;
/**
* @author Alexander Ries (D062114)
@@ -1,4 +1,4 @@
package com.sap.sailing.dashboards.gwt.client.resources.theme;
package com.sap.sailing.dashboards.gwt.client.theme;
/**
* @author Alexander Ries (D062114)
@@ -1,4 +1,4 @@
package com.sap.sailing.dashboards.gwt.client.resources.theme;
package com.sap.sailing.dashboards.gwt.client.theme;
/**
* @author Alexander Ries (D062114)
@@ -12,7 +12,7 @@ public interface VerticalWindChartResources extends ClientBundle {
public static final VerticalWindChartResources INSTANCE = GWT.create(VerticalWindChartResources.class);
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "VerticalWindChart.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "VerticalWindChart.gss"})
VerticalWindChartGSS gss();
public interface VerticalWindChartGSS extends CssResource {
@@ -12,7 +12,7 @@ public interface WindBotComponentResources extends ClientBundle {
public static final WindBotComponentResources INSTANCE = GWT.create(WindBotComponentResources.class);
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "WindBotComponent.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "WindBotComponent.gss"})
WindBotComponentGss gss();
public interface WindBotComponentGss extends CssResource {
@@ -8,7 +8,7 @@ import com.google.gwt.resources.client.CssResource.Shared;
public interface LocationPointerCompassRessources extends ClientBundle {
public static final LocationPointerCompassRessources INSTANCE = GWT.create(LocationPointerCompassRessources.class);
@Source({"com/sap/sailing/dashboards/gwt/client/resources/theme/theme.gss", "LocationPointerCompass.gss"})
@Source({"com/sap/sailing/dashboards/gwt/client/theme/theme.gss", "LocationPointerCompass.gss"})
LocationPointerCompassGSS gss();
@Shared