solomax commented on a change in pull request #481:
URL: https://github.com/apache/wicket/pull/481#discussion_r748838235



##########
File path: 
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
##########
@@ -44,17 +46,18 @@ public NavigationToolbar(final DataTable<?, ?> table)
 
                WebMarkupContainer span = new WebMarkupContainer("span");
                add(span);
-               span.add(AttributeModifier.replace("colspan", new 
IModel<String>()
-               {
-                       @Override
-                       public String getObject()
-                       {
-                               return 
String.valueOf(table.getColumns().size()).intern();
-                       }
-               }));
+               span.add(AttributeModifier.replace("colspan", (IModel<String>) 
() -> String.valueOf(table.getColumns().size()).intern()));
 
                span.add(newPagingNavigator("navigator", table));
-               span.add(newNavigatorLabel("navigatorLabel", table));
+               Component complexLabel = 
newComplexNavigatorLabel("navigatorLabel", table);
+               if (complexLabel != null)
+               {
+                       span.add(complexLabel);
+               }
+               else
+               {
+                       span.add(newNavigatorLabel("navigatorLabel", table));

Review comment:
       the `null` will be added here in case `newNavigatorLabel` is not 
overwritten and `complexLabel == null`




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to