From 906aaa87620c6057560e781f31eaeaa7481e4064 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jul 2015 16:01:22 +0200 Subject: [PATCH 1/4] fixing bug 3105: leaderboard group selection was inconsistent after renaming it --- .../gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java index c8dfe53f38d..cae32ef4ee1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java @@ -697,6 +697,11 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements for (int i = 0; i < availableLeaderboardGroups.size(); i++) { LeaderboardGroupDTO group = availableLeaderboardGroups.get(i); if (oldGroupName.equals(group.getName())) { + // if the leaderboard is selected, de-select equality/hashCode may change) and select again when done + final boolean wasSelected = Util.equalsWithNull(groupToUpdate, getSelectedGroup()); + if (wasSelected) { + groupsSelectionModel.setSelected(groupToUpdate, false); + } groupToUpdate.setName(updateDescriptor.getName()); groupToUpdate.description = updateDescriptor.getDescription(); groupToUpdate.setDisplayName(updateDescriptor.getDisplayName()); @@ -708,6 +713,9 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements if (displayedIndex != -1) { groupsProvider.getList().set(displayedIndex, groupToUpdate); } + if (wasSelected) { + groupsSelectionModel.setSelected(groupToUpdate, true); + } } } groupsFilterablePanel.updateAll(availableLeaderboardGroups); From 94747760e2ad3a2dbfd8aa212ffa0cf17b334b28 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jul 2015 16:16:10 +0200 Subject: [PATCH 2/4] extended wait period from 60s to 120s for Selenium tests --- .../src/com/sap/sailing/selenium/pages/PageObject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java index 8b3181d0920..9c058aa723e 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java @@ -44,7 +44,7 @@ import com.sap.sailing.selenium.core.SeleniumFieldDecorator; * D049941 */ public class PageObject { - public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 60; + public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 120; public static final int DEFAULT_POLLING_INTERVAL = 5; From 4fb7991491ad2dcfc8c8a3a8c3178d056532fa3a Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jul 2015 16:43:51 +0200 Subject: [PATCH 3/4] fixed regatta filter by leaderboard group in case leaderboard group is empty --- java/com.sap.sailing.gwt.ui/SailingGWT.launch | 15 ++++++++------- .../client/place/event/partials/Regatta.java | 9 --------- .../eventregatta/EventRegattaList.java | 18 +++++++++++------- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch index 81fe1683cc4..527674e44a2 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch @@ -5,19 +5,19 @@ - - - - - - + + + + + + @@ -30,6 +30,7 @@ + @@ -69,7 +70,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java index 8fc80fe07df..8c3b93a4e86 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java @@ -57,15 +57,6 @@ public class Regatta extends Composite { @UiField SpanElement racesCount; @UiField SpanElement trackedRacesCount; @UiField DivElement isLiveDiv; -// @UiField TableElement isLiveDiv2; -// @UiField DivElement isFinishedDiv; -// @UiField DivElement isFinishedDiv2; -// @UiField DivElement isScheduledDiv; -// @UiField AnchorElement leaderboardLink; -// @UiField DivElement liveRaceInfosPerFleetPanel; -// @UiField(provided=true) RegattaCompetitor competitorWithRank1; -// @UiField(provided=true) RegattaCompetitor competitorWithRank2; -// @UiField(provided=true) RegattaCompetitor competitorWithRank3; @UiField Anchor regattaDetailsLink; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java index e8648ac8ee5..0fd6f0f92ba 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java @@ -60,13 +60,13 @@ public class EventRegattaList extends Composite { leaderboardGroupFilterAnchors = new ArrayList(); boolean hasMultipleLeaderboardGroups = presenter.getCtx().getLeaderboardGroups().size() > 1; - if(event.getType() == EventType.SERIES_EVENT) { + if (event.getType() == EventType.SERIES_EVENT) { regattaListNavigationDiv.getStyle().setDisplay(Display.NONE); } else { - if(hasMultipleLeaderboardGroups) { + if (hasMultipleLeaderboardGroups) { // fill the navigation panel registerFilterLeaderboardGroupEvent(filterNoLeaderboardGroupsAnchor, null); - for(LeaderboardGroupDTO leaderboardGroup: presenter.getCtx().getLeaderboardGroups()) { + for (LeaderboardGroupDTO leaderboardGroup: presenter.getCtx().getLeaderboardGroups()) { AnchorElement filterLeaderboardGroupAnchor = Document.get().createAnchorElement(); filterLeaderboardGroupAnchor.addClassName(EventRegattaListResources.INSTANCE.css().item()); filterLeaderboardGroupAnchor.setHref("javascript:;"); @@ -126,8 +126,10 @@ public class EventRegattaList extends Composite { for (LeaderboardGroupDTO lg : presenter.getCtx().getLeaderboardGroups()) { boolean isVisible = leaderboardGroup.getName().equals(lg.getName()); List regattaElements = regattaElementsByLeaderboardGroup.get(lg.getName()); - for (Regatta regatta : regattaElements) { - regatta.setVisible(isVisible); + if (regattaElements != null) { + for (Regatta regatta : regattaElements) { + regatta.setVisible(isVisible); + } } } } else { @@ -135,8 +137,10 @@ public class EventRegattaList extends Composite { filterNoLeaderboardGroupsAnchor.addClassName(EventRegattaListResources.INSTANCE.css().selectedItem()); for (LeaderboardGroupDTO lg : presenter.getCtx().getLeaderboardGroups()) { List regattaElements = regattaElementsByLeaderboardGroup.get(lg.getName()); - for (Regatta regatta : regattaElements) { - regatta.setVisible(true); + if (regattaElements != null) { + for (Regatta regatta : regattaElements) { + regatta.setVisible(true); + } } } } From 7849cab0d577a301c2e2fe72918a8f612fb566af Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 13 Jul 2015 16:47:20 +0200 Subject: [PATCH 4/4] fixed TAIFUN icon --- .../client/images/boatclass/CANOE_TAIFUN.png | Bin 2152 -> 2297 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/CANOE_TAIFUN.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/CANOE_TAIFUN.png index 44535cc179442c5979bc1b8d37c830bbbba9e4f5..9b5de172ffe0bbb267f1da16e3cb119954866d4f 100644 GIT binary patch delta 2216 zcmV;Z2v_&$5cv_1LI(~m8j}s(%aKVde+X|$L_t(|+U=cPNSjv}$N#4Yi^JBE>?XN+F{Gy{J%-4Ov(#*@bDrWkd=K zqd^%dVI|mt4%-gO`|Khf_ePVN_s#opk~}}oZ881-`aC)Hde>OHK zl|nj=Oa@z9*xttOF5bPv`}Y7)Qv;6&b#-WHKvNT%o6*uDd_J_b;nXQ~bl}*rGWtu4 zGLW>sj;Bv)Z4L1_o;^e9A6N*SK8?;!(cO)6=Wyl>OEN_&g>aZ2KSm^itu1?hR#OxD z`ozVH=a}y6A($W&1e>`#L1DroE1_v=Tgw|G;bcj%h78da6kt)Glx+F$M zFgC`LfQ=2hcMriJUcFMW>ozvx$`x_-D%#rI{21gGv6wbGssZIOMn@?Yb1N!0B*o*} z@Nn7a(U0L_ipMKmQaY_oOq8V_{g{}bbh<(%O-*SYPuUyF4v&YXrYcL)f69vH_g9D> z{qXx~Wu+1%X@Nim>d}utpqwQ|qgq#2g&WF_t}cp3%TUtHOjYR74VsxLCrR4)c(obY z8{^~UASs#DdU~qVPva4VWTVSAYBw z0|U;k%&x7`7hmA*TTZ`NYHP)>zoNU_DM^_O_4Xo}v{j4CMPYL-SI+^+sjTzw>$dmGb9rH@7^vtI>aA;l-BNU-C{%bl1Sjz ztr8{Le84$XNA z#h$O-#bR{!EJx-F;1KDnnLQi_!H z*I%58a!4tAlBmEI2*%9`o|Gah>Ci$G<33V~l$6PECdwhDNJ+0>b0*3mrASG9_g~ILIiwURiI2o8h?H`Sqfj3yf2pR1vrrBxMN0bUBhExQq!cNs zz!@{fO{5elsiA>0Q4T3ZO8WR?&O|w+6e-F0os*31NGVd%$&;Lka!4tAl7y1aNmn`h zQe-84`YDH^98!vuRK%@ojMGRdyroOwc6V?~*NGFw-`mPKL2GN)5ORLOdgcr#qYyeB z|4R~|e}B%&DAen8I&_s}>a7dLE_6Eh5Sgl#l>ZP}Z7q6xIUObF?cFzogDbOreVmUH zY9~Ulge_k$d;lkkySW#%3vH0#gPRxZeDiAwg z-mVOWFK-9L_uq4Fj+Rm3!1+NDH8A<0NL`({ex1{EsEn>(|G;*9e&k94N_yn#_;FF> z^Nma?Wi&a74=%Uz!;5ZX!NZGyxOtP4w6TneiMNU3N#Rs2nWXv?W>FHv(;8W3PmoIaJvTR(wTzvAywYw~vo7CBfogFTMQmL;O@p$o@ z?~Pox(b_8R-sOZXXmoe)8ap0A2GMTZ;AU0QxN*a1=0@7xzSpn5LO9F?VTS&G@$=7y zE6;=^WHQv-%NHOUroCOPu9`ULZ|VZ5f97T}Kd;}c%p6T^t(c!TcNK%#Te`Zt#e)Z& zyn&YW;DPDGMI~INHZUMUAx^(2L!l4`2F(9?Dv`N4p0Is*(A->!8J8@Hh-PQmL_tHd zv!w@Yg(M;h2H8g*L&2aW=~^U-h!z*wN{*q$MXREA`uI7f3;K+ z5hasaPft}F>gl0m(%Mk1mX!Vd-uQTx8X6zBBTri-5fRPIRNa@*%#2N0+9rvJqEW4@ zt11k2bx|~GUyyc6%C^2hpu!CW0(NI;yCfo_l@-nJuRuM1Kdr1dke?%xvP?~B9#4hn z@px!z%CY1elte`7v^FtO_J$@Ve<+=HGB#%=Wr@eN;o-8>GdxW3xbuOzAt_5Nrj3r4 zjh@j_ipAWD%GC0?g=}oly?Y1-6+K|n*oZ4v#MP^4Yjbls%4JFWghI5ifJcv1(R1mN z7#YFXm=bG-sz{RiFY)jpEiK{66L&tq`SW6M5JN*sT^p>Jq5 zvznUF*C#GsM1Mb&d}%;cNqW}T@$@OJtsx%Avu7y%0}FxEr_tFdy1Q}ioch-|mxCld znubII&!1ysgHkD^)5v77wT10%?C#>-yS?){H8t>fP*;bB1~fIHxfv}j!skO<8%~`< qM+c6T(_@C^CaEgn*D=e07XJWV1AaWS(_s++0000qu4r delta 2070 zcmV+x2F8q@;>U6DyEe+S-4L_t(|+U=cRNLzOl$G^X@ZY?FWj&>0x z4ra24NsR685Tp@Vay}gBi}&7eK0W8&{PMfMpCTeu3aJ!Qe<>_3 z($W%ERUj~_=MfOF@RVW7Pot*s)da26LaF+uS-rl;}xwe6QX zdlsRP>g+^U7n++z(viG;Nsk`kfAM2Hf9}|4IDa19-KwVt!JtUWVs#bw?~`d_c9v0A z3`6zy;?gD5*R%LM5dNWda|RVgJQ9oku)-*TUshf zPj<9+QG^l3ipRCbBVzW3$3yWr4@qNV z;^U}W)YzEQl14{GLvBx_f1}Px8Xgt_`Fa{2c0y7#Dyc8bQ#4v$Nv0`DFUC^|qelh) zd_FlzU0o20o2oD|fpFO7IS%vl6bj+5za-s7Qdg&@rx6I)CTU}XE?ht|DXA`r)>ifO zDctUY4szu?U**abF=WYfPr7o&mf1pja8U02R>t6<)lYX1A4*!Se}C9}_|UqiyR|iH zYs2cQG%Aa!uUB((@OUh^C(+fbV#ubcyL9!c75Aij_oOe`+w|_;E3MtVdPQG-h4pp$ zPj4fqPN|=MLPJB5?T)Tr7eltQzE0P#7u)WhJds{hzNYu&Nipq?zWIjNyC~I-VW=N| zD6rk#y(@;w%Iqxef8H%@?2ek6u)Hj(D=S{FT3X7xl5XAQM^=()iXn$drC^#zNup>} zvg9}iTKKQs&CgRMEZ|ZLsAO`_Jcyl2qF79_!=;$^x!9>BfBO7$9R6iWC@W1(>i6IG zRnp|77-GcI5+*12N}}(-m(1|$c)N`#B9g&6cI+O?bK%)DF~pALWjuS9C24p26S$D& z#YOSBB!uH_Da(t}N}+<*%B`XAv`TGm;^U72xWo|GQX(W0yG9%Yj?B!6B=)uRguqq|-QgQYwizKmRQ4jy=ErDw5dq+ixO?{R7_evPfdjt5+h4J%9Wm zlGyX-pCXAp>+2$kJ(-M1V$a`yizN2^^N&cX3`7!dKKe)`vFDRdL=t;Wo)k&!Idw`T zvFFoIMG|{H`%EOUr=dY4aYuQ*B8fd;d?Aw93B3LO2o%Z5smMQk|WW5RQeE<;7Lp-dKX|WO^9;8puYW9(!%S8wA+X*rN)ngmr?`J+bhZ8!af(WyeGe2ci8ft z2n6I=f1Jyc_r8s2KaAa}NJLWPd>I{NK^AZ4MDE4g0rlN?k|-z3=#c!&h9YdpcS8}E zOI^Dr>2juwu3bCO5M+}pE)=%O6`=CjuTikJjE>B?Y`n;TVm4j`)QuaGy7HA#&TJpH zx2e8-S$2ReM_j%v+iLTs#BH_F(4cPJk~G@ef9P)A%4z7RcDK{?E?$(5WLI3gNcnMi zyW3`MjoR8|48oT2g}FI+Jo)@>t{JQzkGgY5QfhspyK^T`L%G}CPSYD4l3=ph=)wgglhUb5qP0~$eG0d`po8*$tHSM8u^8&=B+tcD ze^;ksu|f@@uvcFK0rlX4q`LTrg$EDz&tI@w5`b`69klPWklT=H7C+U8iXa-5`+q?} z(I}Mwiac(3SW=&_q2XaF4HSRq=%@(DZD@3qN(LnzJvJs9jxsbhMpl4QPY{o5k4Jp$ z4UdQ7ak2eiIrR zA{&6k=Nli_K3^>w^7&|doa_PCpE8}+kw|SBibN=#Cfk5rCpJy(^;W+gua``dYz8)- zJCo4^1J!J3V1P0ivLD!fg+xM!!_}rI9HvBq$_2`F9n;joU^VCo2FuXj9Fnxnf5?b# zX{l5_EiE)MLQVh&t{IEzj*d#w)6qe(7&!+VyYkeO?(gTWr@x=3rpRgXo`_--tE;$w zpG=e2n>L1_dV6u{66)(&{HjY#mW_P*k{&(6oZ{FbTTWoCL-8;O053S*H;n*>p zI03gCr%&U|8F)NsY*bB6Xl{nz55K?SW*YqqKPI>gd4r#?00000NkvXX1g=70f;uV- Ak^lez