From 41379460724522e7eb76babe43529a3fb699eaad Mon Sep 17 00:00:00 2001 From: Alexander Ries Date: Tue, 3 Nov 2015 10:16:25 +0100 Subject: [PATCH] removed NumberTickingAnimation from LiveAverageComponent --- .../LiveAverageComponent.java | 26 ++----------------- .../StartlineAdvantagesByWindComponent.java | 5 ++-- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startlineadvantage/LiveAverageComponent.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startlineadvantage/LiveAverageComponent.java index 9afcaf508d3..b0d3867c232 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startlineadvantage/LiveAverageComponent.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startlineadvantage/LiveAverageComponent.java @@ -12,7 +12,6 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.dashboards.gwt.client.visualeffects.NumberTickingAnimation; import com.sap.sailing.dashboards.gwt.client.windchart.VerticalWindChartClickListener; import com.sap.sailing.dashboards.gwt.client.windchart.WindBotComponent; import com.sap.sailing.gwt.ui.client.StringMessages; @@ -74,8 +73,6 @@ public class LiveAverageComponent extends Composite implements HasWidgets, Verti LiveAverageComponentStyle style; private StringMessages stringConstants; - private NumberTickingAnimation liveTickingAnimation; - private NumberTickingAnimation averageTickingAnimation; public LiveAverageComponent() { initWidget(uiBinder.createAndBindUi(this)); @@ -90,7 +87,6 @@ public class LiveAverageComponent extends Composite implements HasWidgets, Verti * */ public LiveAverageComponent(String header, String unit) { stringConstants = StringMessages.INSTANCE; - initTickingAnimations(); initWidget(uiBinder.createAndBindUi(this)); liveAveragePanel.getElement().getStyle().setProperty("backgroundColor", "white"); this.header.setInnerText(header); @@ -104,31 +100,13 @@ public class LiveAverageComponent extends Composite implements HasWidgets, Verti this.liveLabel.setInnerHTML(stringConstants.dashboardLiveWind()); this.averageLabel.setInnerHTML(stringConstants.dashboardAverageWind()+"
"+stringConstants.dashboardAverageWindMinutes(15)); } - - private void initTickingAnimations() { - liveTickingAnimation = new NumberTickingAnimation() { - - @Override - public void setValueInUI(String value) { - liveNumber.setInnerText(value); - } - }; - - averageTickingAnimation = new NumberTickingAnimation() { - - @Override - public void setValueInUI(String value) { - averageNumber.setInnerText(value); - } - }; - } public void setLiveValue(String liveValue) { - liveTickingAnimation.execute(liveValue); + liveNumber.setInnerText(liveValue); } public void setAverageValue(String averageValue) { - averageTickingAnimation.execute(averageValue); + averageNumber.setInnerText(averageValue); } @Override diff --git a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startlineadvantage/StartlineAdvantagesByWindComponent.java b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startlineadvantage/StartlineAdvantagesByWindComponent.java index d29bf87d175..b5b93d2a6c1 100644 --- a/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startlineadvantage/StartlineAdvantagesByWindComponent.java +++ b/java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/startlineadvantage/StartlineAdvantagesByWindComponent.java @@ -7,6 +7,7 @@ import java.util.logging.Logger; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Style.Unit; +import com.google.gwt.i18n.client.NumberFormat; import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -77,8 +78,8 @@ public class StartlineAdvantagesByWindComponent extends Composite implements Has if (result != null) { logger.log(Level.INFO, "Updating UI with StartlineAdvantagesWithMaxAndAverageDTO"); startlineAdvantagesOnLineChart.setStartlineAdvantages(result.advantages); - advantageMaximumLiveAverage.setLiveValue("" + result.maximum); - advantageMaximumLiveAverage.setAverageValue("" + result.average); + advantageMaximumLiveAverage.setLiveValue(NumberFormat.getFormat("#0.0").format(result.maximum)); + advantageMaximumLiveAverage.setAverageValue(NumberFormat.getFormat("#0.0").format(result.average)); } else { logger.log(Level.INFO, "StartlineAdvantagesWithMaxAndAverageDTO is null"); }