Skip to content

Commit 9d24c46

Browse files
committed
Additional fixes for banner
1 parent 467cd9a commit 9d24c46

4 files changed

Lines changed: 15 additions & 20 deletions

File tree

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/AbstractCoreBean.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
import org.apache.commons.text.StringEscapeUtils;
1313

14-
import com.google.gson.Gson;
15-
1614
import goc.webtemplate.Breadcrumb;
1715
import goc.webtemplate.Constants;
1816
import goc.webtemplate.ContextualFooter;
@@ -460,9 +458,9 @@ public void setUseHttps(boolean value) {
460458

461459
/**
462460
* Returns the version of the CDN files to use to build the page. (e.g v4_0_47)
463-
*
464-
* Set at application level via "wettemplate_version" property in cdn.properties,
465-
* can be overriden programatically.
461+
*
462+
* Set at application level via "wettemplate_version" property in cdn.properties,
463+
* can be overriden programatically.
466464
*/
467465
public String getTemplateVersion() {
468466
this.initializeOnce();
@@ -481,9 +479,9 @@ public String getTemplateVersion() {
481479

482480
/**
483481
* Sets the version of the CDN files to use to build the page. (e.g v4_0_47)
484-
*
485-
* Set at application level via "wettemplate_version" property in cdn.properties,
486-
* can be overriden programatically.
482+
*
483+
* Set at application level via "wettemplate_version" property in cdn.properties,
484+
* can be overriden programatically.
487485
*/
488486
public void setTemplateVersion(String value) {
489487
this.templateVersion = value;
@@ -1569,7 +1567,7 @@ public void setHeaderMenu(HeaderMenu value) {
15691567
}
15701568

15711569
/**
1572-
* Returns a copy of the breadcrumb list, ready for JSON serialization
1570+
* Returns a copy of the breadcrumb list, ready for JSON serialization
15731571
*/
15741572
private List<Breadcrumb> getEncodedBreadcrumbs() {
15751573
List<Breadcrumb> sourceList = this.getBreadcrumbs();
@@ -2060,7 +2058,8 @@ private AppTop buildAppTop() {
20602058
this.getEncodedBreadcrumbs(),
20612059
this.showPreContent,
20622060
this.customSearch != null? Arrays.asList(this.customSearch): null,
2063-
this.getHasLeftMenuSections() //topSecMenu, true if there is at least one left menu section defined
2061+
this.getHasLeftMenuSections(), //topSecMenu, true if there is at least one left menu section defined
2062+
this.infoBanner
20642063
);
20652064
} else {
20662065
appTop = new AppTop.AppTopGCIntranet(
@@ -2295,7 +2294,7 @@ public String getRenderFooter() {
22952294
this.contextualFooter,
22962295
this.hideMainFooter,
22972296
this.hideCorporateFooter
2298-
));
2297+
));
22992298
}
23002299

23012300
/**
@@ -2315,7 +2314,7 @@ public String getRenderTransactionalFooter() {
23152314
null, //contextualFooter
23162315
false, //hideMainFooter
23172316
false //hideCorporateFooter
2318-
));
2317+
));
23192318
}
23202319

23212320

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/jsonentities/Footer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.google.gson.annotations.JsonAdapter;
88

99
import goc.webtemplate.ContextualFooter;
10-
import goc.webtemplate.FooterLink;
1110
import goc.webtemplate.Link;
1211

1312
/**
@@ -29,7 +28,7 @@ public class Footer implements Serializable, IFooter {
2928
private FooterLinkContext privacyLink;
3029

3130
//NOTE: Custom serialization/adapter because value can be both a footer link and a list of footer links
32-
@JsonAdapter(goc.webtemplate.component.jsonentities.adapters.FooterLinkAdapter.class)
31+
@JsonAdapter(goc.webtemplate.component.jsonentities.adapters.FooterLinkAdapter.class)
3332
private FooterLinkContext termsLink;
3433

3534
private String localPath;

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/jsonentities/RefFooter.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
import goc.webtemplate.Utility;
88
import goc.webtemplate.WebAnalyticsInfo;
99

10-
import goc.webtemplate.component.JsonValueUtils;
11-
1210
/**
1311
* Objects of this class are meant to be serialized to a JSON object to be passed
1412
* as parameter to the 'wet.builder.refFooter' JavaScript function in the template
15-
* pages.
13+
* pages.
1614
*/
1715
public class RefFooter implements Serializable {
1816
private static final long serialVersionUID = 1L;
@@ -23,7 +21,7 @@ public class RefFooter implements Serializable {
2321
private String localPath;
2422
private boolean webAnalytics;
2523
private boolean isApplication;
26-
24+
2725
public RefFooter() {
2826
}
2927

@@ -35,7 +33,7 @@ public RefFooter(String cdnEnv, ExitSecureSite exitSecureSite, String jqueryEnv,
3533
this.webAnalytics = webAnalytics;
3634
this.isApplication = isApplication;
3735
}
38-
36+
3937
public RefFooter(String cdnEnv, LeavingSecureSiteWarning lssw, String jqueryEnv, String localPath, WebAnalyticsInfo webAnalyticsInfo, boolean isApplication) {
4038
this.cdnEnv = cdnEnv;
4139
this.exitSecureSite = null;

gocwebtemplate-core/gocwebtemplate-core-base/src/test/java/goc/webtemplate/component/abstractcorebeantest/RenderAppTopTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import goc.webtemplate.HeaderLink;
1111
import goc.webtemplate.HeaderMenu;
1212
import goc.webtemplate.InfoBanner;
13-
import goc.webtemplate.Link;
1413
import goc.webtemplate.MenuItem;
1514

1615
public class RenderAppTopTest {

0 commit comments

Comments
 (0)