You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/06/03 08:52:04 UTC
[isis] 02/02: ISIS-1959: removing some compiler warnings
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6ba074df83215d8f77dae1736ba6623de1bfd875
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jun 3 10:51:54 2018 +0200
ISIS-1959: removing some compiler warnings
Task-Url: https://issues.apache.org/jira/browse/ISIS-1959
---
core/pom.xml | 12 +++++-----
.../components/layout/bs3/tabs/TabGroupPanel.java | 26 ++++++++--------------
.../ui/components/layout/bs3/tabs/TabPanel.java | 3 ++-
3 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index cfcafa9..153c5a9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -156,19 +156,17 @@
<wicket.version>8.0.0</wicket.version>
<wicketstuff.version>8.0.0</wicketstuff.version>
+ <wicket-bootstrap.version>2.0.1</wicket-bootstrap.version>
<wicket-source.version>7.0.0</wicket-source.version>
<!-- [ahuber] update to newer versions just does not work as a drop in replacement
<wicket-webjars.version>2.0.7</wicket-webjars.version>
- <wicket-bootstrap.version>2.0.1</wicket-bootstrap.version>
-->
<wicket-webjars.version>0.5.4</wicket-webjars.version>
- <wicket-bootstrap.version>0.10.16</wicket-bootstrap.version>
+ <select2.version>4.0.5</select2.version>
- <select2.version>4.0.3</select2.version>
-
- <jquery-ui.version>1.11.4</jquery-ui.version>
+ <jquery-ui.version>1.12.1</jquery-ui.version>
<guice.version>4.1.0</guice.version>
<picocontainer.version>2.15</picocontainer.version>
@@ -1989,8 +1987,10 @@ ${license.additional-notes}
<dependency>
+<!-- version 7.0.0 -->
<groupId>net.ftlines.wicket-source</groupId>
-<!-- [ahuber] for version 8.0.0 we might consider<groupId>com.github.jennybrown8.wicket-source</groupId> -->
+<!-- version 8.0.0 -->
+<!-- <groupId>com.github.jennybrown8.wicket-source</groupId> -->
<artifactId>wicket-source</artifactId>
<version>${wicket-source.version}</version>
<exclusions>
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
index 37c0b52..5efc8ef 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.viewer.wicket.ui.components.layout.bs3.tabs;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -35,23 +36,20 @@ import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
-import com.google.common.base.Predicate;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Lists;
-
import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel;
// hmmm... not sure how to make this implement HasDynamicallyVisibleContent
-public class TabGroupPanel extends AjaxBootstrapTabbedPanel {
+public class TabGroupPanel extends AjaxBootstrapTabbedPanel<ITab> {
+ private static final long serialVersionUID = 1L;
- public static final String SESSION_ATTR_SELECTED_TAB = "selectedTab";
+ public static final String SESSION_ATTR_SELECTED_TAB = "selectedTab";
// the view metadata
private final ComponentHintKey selectedTabHintKey;
private final EntityModel entityModel;
private static List<ITab> tabsFor(final EntityModel entityModel, final BS3TabGroup bs3TabGroup) {
- final List<ITab> tabs = Lists.newArrayList();
+ final List<ITab> tabs = new ArrayList<>();
final List<BS3Tab> tablist = _NullSafe.stream(bs3TabGroup.getTabs())
.filter(BS3Tab.Predicates.notEmpty())
@@ -98,13 +96,13 @@ public class TabGroupPanel extends AjaxBootstrapTabbedPanel {
}
@Override
- public TabbedPanel setSelectedTab(final int index) {
+ public TabbedPanel<ITab> setSelectedTab(final int index) {
selectedTabHintKey.set(entityModel.getObjectAdapterMemento().asHintingBookmark(), ""+index);
return super.setSelectedTab(index);
}
private void setSelectedTabFromSessionIfAny(
- final AjaxBootstrapTabbedPanel ajaxBootstrapTabbedPanel) {
+ final AjaxBootstrapTabbedPanel<ITab> ajaxBootstrapTabbedPanel) {
final String selectedTabStr = selectedTabHintKey.get(entityModel.getObjectAdapterMemento().asHintingBookmark());
final Integer tabIndex = parse(selectedTabStr);
if (tabIndex != null) {
@@ -126,15 +124,9 @@ public class TabGroupPanel extends AjaxBootstrapTabbedPanel {
@Override
public boolean isVisible() {
- return FluentIterable.<AbstractTab>from(getTabs()).anyMatch(new Predicate<AbstractTab>() {
- @Override
- public boolean apply(final AbstractTab tab) {
- return tab.isVisible();
- }
- });
+ return _NullSafe.stream(getTabs())
+ .anyMatch(ITab::isVisible);
}
-
-
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
index b78a42e..9c10f87 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabPanel.java
@@ -31,7 +31,8 @@ import org.apache.isis.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
-public class TabPanel extends PanelAbstract implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
+public class TabPanel extends PanelAbstract<EntityModel>
+implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
private static final long serialVersionUID = 1L;
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.