# HG changeset patch # User Bernhard Herzog # Date 1370360400 -7200 # Node ID 165020640d7bd85ee9c0d2b4a336a1eefd5b0075 # Parent 9b521dfb8920c350c17714e3992bc4dd9e8dce50 Instantiate RiverInfoPanel with a FLYS reference for SSO. Part of flys/issue1265 diff -r 9b521dfb8920 -r 165020640d7b gwt-client/src/main/java/org/dive4elements/river/client/client/ui/RiverInfoPanel.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/RiverInfoPanel.java Tue Jun 04 17:38:35 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/RiverInfoPanel.java Tue Jun 04 17:40:00 2013 +0200 @@ -17,6 +17,7 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; +import org.dive4elements.river.client.client.FLYS; import org.dive4elements.river.client.client.FLYSConstants; import org.dive4elements.river.client.shared.model.RiverInfo; @@ -27,6 +28,9 @@ */ public class RiverInfoPanel extends HorizontalPanel { + /** The flys instance */ + protected FLYS flys; + /** The message class that provides i18n strings.*/ protected FLYSConstants MSG = GWT.create(FLYSConstants.class); @@ -35,7 +39,9 @@ public final static int PADDING = 8; public final static int MARGIN = 10; - public RiverInfoPanel(RiverInfo riverinfo) { + public RiverInfoPanel(FLYS flys, RiverInfo riverinfo) { + this.flys = flys; + setStyleName("riverinfopanel"); setHeight("" + HEIGHT + "px"); setVerticalAlignment(ALIGN_MIDDLE); diff -r 9b521dfb8920 -r 165020640d7b gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/InfoPanel.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/InfoPanel.java Tue Jun 04 17:38:35 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/InfoPanel.java Tue Jun 04 17:40:00 2013 +0200 @@ -86,7 +86,7 @@ protected void render(RiverInfo riverinfo) { if (this.riverinfopanel == null) { - this.riverinfopanel = new RiverInfoPanel(riverinfo); + this.riverinfopanel = new RiverInfoPanel(this.flys, riverinfo); this.addMember(this.riverinfopanel, 0); }