# HG changeset patch # User gernotbelger # Date 1518000626 -3600 # Node ID fa168fb02a658026c32fd613a9d6672bc07a0b4c # Parent 1009cab0f86bc8513bea5fc868c1103d358fa0a3 Fixed typo diff -r 1009cab0f86b -r fa168fb02a65 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelRecommandationInfo.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelRecommandationInfo.java Fri Jan 19 18:47:53 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde - * Software engineering by - * Björnsen Beratende Ingenieure GmbH - * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt - * - * This file is Free Software under the GNU AGPL (>=v3) - * and comes with ABSOLUTELY NO WARRANTY! Check out the - * documentation coming with Dive4Elements River for details. - */ -package org.dive4elements.river.client.client.ui; - -import org.dive4elements.river.client.client.ui.DatacageTwinPanel.IDatacageTwinPanelInfo; -import org.dive4elements.river.client.shared.model.Recommendation; - -import com.google.gwt.core.client.GWT; - -/** - * @author Gernot Belger - */ -public final class WaterlevelRecommandationInfo implements IDatacageTwinPanelInfo { - - private String outs; - - public WaterlevelRecommandationInfo(String outs ) { - this.outs = outs; - } - - @Override - public String getFactory() { - // FIXME: why are the factory here and the one used in createDataString different? - // Probably also because of the 'throw all this code away comment' - return "waterlevel"; - } - - @Override - public String getDataStringFactory() { - return "staticwkms"; - } - - @Override - public void adjustRecommendation(Recommendation recommendation) { - // XXX: THIS IS AN EVIL HACK TO MAKE W-DIFFERENCES WORK AGAIN! - // TODO: Throw all this code away and do it with server side recommendations! - recommendation.setTargetOut("w_differences"); - - if (recommendation.getIDs() != null) { - GWT.log("Setting staticwkms factory for rec with ID " - + recommendation.getIDs()); - recommendation.setFactory("staticwkms"); - } - /* - // So far, we do not need to rewrite the factory anymore, - // except for staticwkms; probably other cases will pop up later. - else if (recommendation.getFactory().equals("winfo")) { - GWT.log("Setting waterlevel factory for a winfo rec."); - recommendation.setFactory("waterlevel"); - } - */ - else { - GWT.log("Leave rec. id " + recommendation.getIDs() + ", factory " - + recommendation.getFactory() + " untouched."); - } - } - - @Override - public String getOuts() { - return outs; - } -} \ No newline at end of file diff -r 1009cab0f86b -r fa168fb02a65 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelRecommendationInfo.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelRecommendationInfo.java Wed Feb 07 11:50:26 2018 +0100 @@ -0,0 +1,69 @@ +/** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde + * Software engineering by + * Björnsen Beratende Ingenieure GmbH + * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt + * + * This file is Free Software under the GNU AGPL (>=v3) + * and comes with ABSOLUTELY NO WARRANTY! Check out the + * documentation coming with Dive4Elements River for details. + */ +package org.dive4elements.river.client.client.ui; + +import org.dive4elements.river.client.client.ui.DatacageTwinPanel.IDatacageTwinPanelInfo; +import org.dive4elements.river.client.shared.model.Recommendation; + +import com.google.gwt.core.client.GWT; + +/** + * @author Gernot Belger + */ +public final class WaterlevelRecommendationInfo implements IDatacageTwinPanelInfo { + + private String outs; + + public WaterlevelRecommendationInfo(String outs ) { + this.outs = outs; + } + + @Override + public String getFactory() { + // FIXME: why are the factory here and the one used in createDataString different? + // Probably also because of the 'throw all this code away comment' + return "waterlevel"; + } + + @Override + public String getDataStringFactory() { + return "staticwkms"; + } + + @Override + public void adjustRecommendation(Recommendation recommendation) { + // XXX: THIS IS AN EVIL HACK TO MAKE W-DIFFERENCES WORK AGAIN! + // TODO: Throw all this code away and do it with server side recommendations! + recommendation.setTargetOut("w_differences"); + + if (recommendation.getIDs() != null) { + GWT.log("Setting staticwkms factory for rec with ID " + + recommendation.getIDs()); + recommendation.setFactory("staticwkms"); + } + /* + // So far, we do not need to rewrite the factory anymore, + // except for staticwkms; probably other cases will pop up later. + else if (recommendation.getFactory().equals("winfo")) { + GWT.log("Setting waterlevel factory for a winfo rec."); + recommendation.setFactory("waterlevel"); + } + */ + else { + GWT.log("Leave rec. id " + recommendation.getIDs() + ", factory " + + recommendation.getFactory() + " untouched."); + } + } + + @Override + public String getOuts() { + return outs; + } +} \ No newline at end of file diff -r 1009cab0f86b -r fa168fb02a65 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelTwinPanel.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelTwinPanel.java Fri Jan 19 18:47:53 2018 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelTwinPanel.java Wed Feb 07 11:50:26 2018 +0100 @@ -20,6 +20,6 @@ extends DatacageTwinPanel { public WaterlevelTwinPanel(final User user) { - super(user, new WaterlevelTwinPanelValidator(), new WaterlevelRecommandationInfo("winfo_diff_twin_panel"), new WaterlevelRecommandationInfo("winfo_diff_twin_panel") ); + super(user, new WaterlevelTwinPanelValidator(), new WaterlevelRecommendationInfo("winfo_diff_twin_panel"), new WaterlevelRecommendationInfo("winfo_diff_twin_panel") ); } } \ No newline at end of file diff -r 1009cab0f86b -r fa168fb02a65 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/sinfo/FlowDepthTwinPanel.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/sinfo/FlowDepthTwinPanel.java Fri Jan 19 18:47:53 2018 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/sinfo/FlowDepthTwinPanel.java Wed Feb 07 11:50:26 2018 +0100 @@ -11,7 +11,7 @@ import org.dive4elements.river.client.client.ui.DatacageTwinPanel; import org.dive4elements.river.client.client.ui.DefaultDatacageTwinPanelInfo; -import org.dive4elements.river.client.client.ui.WaterlevelRecommandationInfo; +import org.dive4elements.river.client.client.ui.WaterlevelRecommendationInfo; import org.dive4elements.river.client.shared.model.User; /** @@ -20,6 +20,6 @@ public class FlowDepthTwinPanel extends DatacageTwinPanel { public FlowDepthTwinPanel(final User user) { - super(user, new FlowDepthTwinPanelValidator(), new WaterlevelRecommandationInfo("sinfo_flowdepth_waterlevels"), new DefaultDatacageTwinPanelInfo("bedheight", "sinfo_flowdepth_minfo_heights") ); + super(user, new FlowDepthTwinPanelValidator(), new WaterlevelRecommendationInfo("sinfo_flowdepth_waterlevels"), new DefaultDatacageTwinPanelInfo("bedheight", "sinfo_flowdepth_minfo_heights") ); } } \ No newline at end of file