Fullscreen Leaderboards - Refactored delegate interfaces

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/FullscreenViewerLeaderboardDelegate.java

@@ -6,12 +6,12 @@ import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
-import com.sap.sailing.gwt.home.client.place.event.oldleaderboard.OldLeaderboard.LeaderboardDelegate;
+import com.sap.sailing.gwt.home.client.place.event.oldleaderboard.OldLeaderboard.OldLeaderboardDelegate;
 import com.sap.sailing.gwt.home.shared.partials.fullscreen.FullscreenContainer;
 import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel;
 import com.sap.sse.common.Color;
 
-public class FullscreenViewerLeaderboardDelegate extends FullscreenContainer<LeaderboardPanel> implements LeaderboardDelegate {
+public class FullscreenViewerLeaderboardDelegate extends FullscreenContainer<LeaderboardPanel> implements OldLeaderboardDelegate {
     
     private final Image autoRefreshControl = new Image("images/home/reload.png");
     private final Image settingsControl = new Image("images/home/settings.png");
@@ -56,7 +56,7 @@ public class FullscreenViewerLeaderboardDelegate extends FullscreenContainer<Lea
     }
     
     @Override
-    public void setLeaderboard(final LeaderboardPanel leaderboardPanel) {
+    public void setLeaderboardPanel(LeaderboardPanel leaderboardPanel) {
         showContent(leaderboardPanel);
     }
     

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.java

@@ -12,7 +12,6 @@ import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.logical.shared.CloseEvent;
 import com.google.gwt.event.logical.shared.CloseHandler;
-import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
@@ -24,6 +23,7 @@ import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.domain.common.dto.LeaderboardDTO;
 import com.sap.sailing.gwt.common.client.i18n.TextMessages;
+import com.sap.sailing.gwt.home.client.place.event.oldleaderboards.LeaderboardDelegate;
 import com.sap.sailing.gwt.home.client.place.event.regattaleaderboard.EventRegattaLeaderboardResources;
 import com.sap.sailing.gwt.ui.client.DebugIdHelper;
 import com.sap.sailing.gwt.ui.client.StringMessages;
@@ -56,13 +56,13 @@ public class OldLeaderboard extends Composite {
 
     private LeaderboardPanel leaderboardPanel;
     private Timer autoRefreshTimer;
-    private final LeaderboardDelegate delegate;
+    private final OldLeaderboardDelegate delegate;
     
     public OldLeaderboard() {
         this(null);
     }
     
-    public OldLeaderboard(LeaderboardDelegate delegate) {
+    public OldLeaderboard(OldLeaderboardDelegate delegate) {
         this.leaderboardPanel = null;
         EventRegattaLeaderboardResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
@@ -158,7 +158,7 @@ public class OldLeaderboard extends Composite {
     void fullscreenClicked(ClickEvent event) {
         if(leaderboardPanel != null && delegate != null) {
             leaderboardPanel.removeFromParent();
-            delegate.setLeaderboard(leaderboardPanel);
+            delegate.setLeaderboardPanel(leaderboardPanel);
         }
     }
 
@@ -218,15 +218,7 @@ public class OldLeaderboard extends Composite {
         lastScoringUpdateTimeDiv.getStyle().setVisibility(Visibility.HIDDEN);
     }
     
-    public interface LeaderboardDelegate {
-        void setLeaderboard(LeaderboardPanel leaderboardPanel);
-        Widget getAutoRefreshControl();
-        Widget getSettingsControl();
-        HandlerRegistration addCloseHandler(CloseHandler<PopupPanel> handler);
-        Element getLastScoringUpdateTimeElement();
-        Element getLastScoringUpdateTextElement();
-        Element getLastScoringCommentElement();
-        Element getScoringSchemeElement();
+    public interface OldLeaderboardDelegate extends LeaderboardDelegate<LeaderboardPanel> {
         Element getHasLiveRaceElement();
     }
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboards/LeaderboardDelegate.java

@@ -0,0 +1,27 @@
+package com.sap.sailing.gwt.home.client.place.event.oldleaderboards;
+
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.event.logical.shared.CloseHandler;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.user.client.ui.PopupPanel;
+import com.google.gwt.user.client.ui.Widget;
+
+public interface LeaderboardDelegate<T extends Widget> {
+
+    void setLeaderboardPanel(T leaderboardPanel);
+
+    Widget getAutoRefreshControl();
+
+    Widget getSettingsControl();
+
+    HandlerRegistration addCloseHandler(CloseHandler<PopupPanel> handler);
+
+    Element getLastScoringUpdateTimeElement();
+
+    Element getLastScoringUpdateTextElement();
+
+    Element getLastScoringCommentElement();
+
+    Element getScoringSchemeElement();
+
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/FullscreenViewerMultiLeaderboardDelegate.java

@@ -6,12 +6,12 @@ import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
-import com.sap.sailing.gwt.home.client.place.event.oldmultileaderboard.OldMultiLeaderboard.MultiLeaderboardDelegate;
+import com.sap.sailing.gwt.home.client.place.event.oldmultileaderboard.OldMultiLeaderboard.OldMultiLeaderboardDelegate;
 import com.sap.sailing.gwt.home.shared.partials.fullscreen.FullscreenContainer;
 import com.sap.sailing.gwt.ui.leaderboard.MultiLeaderboardPanel;
 import com.sap.sse.common.Color;
 
-public class FullscreenViewerMultiLeaderboardDelegate extends FullscreenContainer<MultiLeaderboardPanel> implements MultiLeaderboardDelegate {
+public class FullscreenViewerMultiLeaderboardDelegate extends FullscreenContainer<MultiLeaderboardPanel> implements OldMultiLeaderboardDelegate {
     
     private final Image autoRefreshControl = new Image("images/home/reload.png");
     private final Image settingsControl = new Image("images/home/settings.png");
@@ -55,7 +55,7 @@ public class FullscreenViewerMultiLeaderboardDelegate extends FullscreenContaine
     }
     
     @Override
-    public void setLeaderboard(MultiLeaderboardPanel multiLeaderboardPanel) {
+    public void setLeaderboardPanel(MultiLeaderboardPanel multiLeaderboardPanel) {
         showContent(multiLeaderboardPanel);
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.java

@@ -3,7 +3,6 @@ package com.sap.sailing.gwt.home.client.place.event.oldmultileaderboard;
 import java.util.Date;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.ParagraphElement;
 import com.google.gwt.dom.client.Style.Overflow;
 import com.google.gwt.dom.client.Style.Unit;
@@ -12,7 +11,6 @@ import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.logical.shared.CloseEvent;
 import com.google.gwt.event.logical.shared.CloseHandler;
-import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
@@ -24,6 +22,7 @@ import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.domain.common.dto.LeaderboardDTO;
 import com.sap.sailing.gwt.common.client.i18n.TextMessages;
+import com.sap.sailing.gwt.home.client.place.event.oldleaderboards.LeaderboardDelegate;
 import com.sap.sailing.gwt.home.client.place.event.regattaleaderboard.EventRegattaLeaderboardResources;
 import com.sap.sailing.gwt.ui.client.DebugIdHelper;
 import com.sap.sailing.gwt.ui.client.StringMessages;
@@ -55,13 +54,13 @@ public class OldMultiLeaderboard extends Composite {
 
     private MultiLeaderboardPanel multiLeaderboardPanel;
     private Timer autoRefreshTimer;
-    private final MultiLeaderboardDelegate delegate;
+    private final OldMultiLeaderboardDelegate delegate;
     
     public OldMultiLeaderboard() {
         this(null);
     }
     
-    public OldMultiLeaderboard(MultiLeaderboardDelegate delegate) {
+    public OldMultiLeaderboard(OldMultiLeaderboardDelegate delegate) {
         this.multiLeaderboardPanel = null;
         EventRegattaLeaderboardResources.INSTANCE.css().ensureInjected();
         OldMultiLeaderboardResources.INSTANCE.css().ensureInjected();
@@ -158,7 +157,7 @@ public class OldMultiLeaderboard extends Composite {
     void fullscreenClicked(ClickEvent event) {
         if(multiLeaderboardPanel != null && delegate != null) {
             multiLeaderboardPanel.removeFromParent();
-            delegate.setLeaderboard(multiLeaderboardPanel);
+            delegate.setLeaderboardPanel(multiLeaderboardPanel);
         }
     }
 
@@ -201,14 +200,6 @@ public class OldMultiLeaderboard extends Composite {
         }
     }
     
-    public interface MultiLeaderboardDelegate {
-        void setLeaderboard(MultiLeaderboardPanel multiLeaderboardPanel);
-        Widget getAutoRefreshControl();
-        Widget getSettingsControl();
-        HandlerRegistration addCloseHandler(CloseHandler<PopupPanel> handler);
-        Element getLastScoringUpdateTimeElement();
-        Element getLastScoringUpdateTextElement();
-        Element getLastScoringCommentElement();
-        Element getScoringSchemeElement();
+    public interface OldMultiLeaderboardDelegate extends LeaderboardDelegate<MultiLeaderboardPanel>{
     }
 }