You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/11/02 21:24:01 UTC
[1/2] isis git commit: ISIS-1223 Upgrade Wicket to 7.x
Repository: isis
Updated Branches:
refs/heads/ISIS-1223-upgrade-to-wicket-7 [created] 8eab45773
ISIS-1223 Upgrade Wicket to 7.x
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dc976bcd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dc976bcd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dc976bcd
Branch: refs/heads/ISIS-1223-upgrade-to-wicket-7
Commit: dc976bcddfb59d0d34b267bee21f02d6a56a0e3c
Parents: c8a61af
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 20:27:24 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 20:28:20 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 15 ++---
.../wicket/viewer/IsisWicketApplication.java | 7 +-
.../viewer/settings/IsisResourceSettings.java | 4 +-
.../model/models/BookmarkedPagesModel.java | 2 +-
.../components/about/JarManifestListView.java | 4 +-
.../IsisAjaxFallbackOrderByBorder.java | 3 +-
.../scalars/IsisConverterLocator.java | 4 +-
.../scalars/jdkmath/BigIntegerConverter.java | 68 --------------------
.../jdkmath/JavaMathBigIntegerPanel.java | 5 +-
.../reference/EntityLinkSelect2Panel.java | 2 +-
.../select2/Select2BootstrapCssReference.java | 5 +-
.../widgets/select2/Select2ChoiceUtil.java | 7 +-
.../widgets/select2/Select2JsReference.java | 5 +-
.../wicket/ui/errors/StackTraceListView.java | 4 +-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 6 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 3 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 3 +-
17 files changed, 41 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 089843b..aed6870 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -122,15 +122,14 @@
<jetty.version>9.2.11.v20150529</jetty.version>
- <wicket.version>6.20.0</wicket.version>
- <wicketstuff.version>6.20.0</wicketstuff.version>
+ <wicket.version>7.1.0</wicket.version>
+ <wicketstuff.version>7.1.0</wicketstuff.version>
- <wicket-webjars.version>0.4.7</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.13</wicket-bootstrap.version>
- <wicket-source.version>6.0.0.8</wicket-source.version>
+ <wicket-webjars.version>0.5.3</wicket-webjars.version>
+ <wicket-bootstrap.version>0.10.4</wicket-bootstrap.version>
+ <wicket-source.version>7.0.0</wicket-source.version>
- <wicket-select2.version>6.20.0</wicket-select2.version>
- <select2.version>3.5.2</select2.version>
+ <select2.version>4.0.0-2</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
<guice.version>3.0</guice.version>
@@ -1583,7 +1582,7 @@ ${license.additional-notes}
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
- <version>${wicket-select2.version}</version>
+ <version>${wicketstuff.version}</version>
<exclusions>
<exclusion>
<!-- for dependency convergence -->
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 192851f..401a4b5 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -56,7 +56,7 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
import org.apache.wicket.request.cycle.RequestCycleListenerCollection;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
+import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy;
import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -215,7 +215,7 @@ public class IsisWicketApplication
/**
* Although there are warnings about not overriding this method, it doesn't seem possible
- * to call {@link #setResourceSettings(org.apache.wicket.settings.IResourceSettings)} in the
+ * to call {@link #setResourceSettings(org.apache.wicket.settings.ResourceSettings)} in the
* {@link #init()} method.
*/
@Override
@@ -318,7 +318,6 @@ public class IsisWicketApplication
ApplicationSettings select2Settings = ApplicationSettings.get();
select2Settings.setCssReference(new Select2BootstrapCssReference());
select2Settings.setJavaScriptReference(new Select2JsReference());
- select2Settings.setIncludeJqueryUI(false);
}
private void configureWicketSourcePlugin() {
@@ -347,7 +346,7 @@ public class IsisWicketApplication
settings.setDeferJavascript(false);
Bootstrap.install(this, settings);
- getHeaderContributorListenerCollection().add(new IHeaderContributor() {
+ getHeaderContributorListeners().add(new IHeaderContributor() {
@Override
public void renderHead(IHeaderResponse response) {
BootstrapBaseBehavior bootstrapBaseBehavior = new BootstrapBaseBehavior();
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
index ddb3da6..849b093 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.viewer.settings;
import java.util.List;
import org.apache.wicket.Application;
import org.apache.wicket.resource.loader.*;
-import org.apache.wicket.settings.def.ResourceSettings;
+import org.apache.wicket.settings.ResourceSettings;
import org.apache.wicket.util.lang.Generics;
public class IsisResourceSettings extends ResourceSettings {
@@ -91,7 +91,7 @@ public class IsisResourceSettings extends ResourceSettings {
}
/**
- * @see org.apache.wicket.settings.IResourceSettings#getStringResourceLoaders()
+ * @see org.apache.wicket.settings.ResourceSettings#getStringResourceLoaders()
*/
@Override
public List<IStringResourceLoader> getStringResourceLoaders()
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 1a5d614..077c0d6 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.system.context.IsisContext;
-public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkTreeNode>> {
+public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>> {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
index 1565ac9..9224135 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestListView.java
@@ -30,7 +30,7 @@ public final class JarManifestListView extends ListView<JarManifestAttributes> {
private static final long serialVersionUID = 1L;
private final String idLine;
- public JarManifestListView(String id, String idLine, List<? extends JarManifestAttributes> list) {
+ public JarManifestListView(String id, String idLine, List<JarManifestAttributes> list) {
super(id, list);
this.idLine = idLine;
}
@@ -42,4 +42,4 @@ public final class JarManifestListView extends ListView<JarManifestAttributes> {
item.add(new AttributeAppender("class", detail.getType().name().toLowerCase()));
item.add(label);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
index dedcfdd..92f1b7a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackOrderByBorder.java
@@ -21,7 +21,6 @@ import org.apache.wicket.ajax.attributes.IAjaxCallListener;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort.AjaxFallbackOrderByBorder;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -36,7 +35,7 @@ public class IsisAjaxFallbackOrderByBorder<T> extends AjaxFallbackOrderByBorder<
private final ISortStateLocator<T> stateLocator;
public IsisAjaxFallbackOrderByBorder(String id, IsisAjaxFallbackDataTable<?, ?> dataTable, T sortProperty, ISortStateLocator<T> stateLocator, IAjaxCallListener ajaxCallListener) {
- super(id, sortProperty, stateLocator, new OrderByLink.VoidCssProvider<T>(), ajaxCallListener);
+ super(id, sortProperty, stateLocator, ajaxCallListener);
this.dataTable = dataTable;
this.stateLocator = stateLocator;
this.sortProperty = sortProperty;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
index 95e1d23..b88d42f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/IsisConverterLocator.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.scalars;
import org.apache.wicket.Application;
import org.apache.wicket.IConverterLocator;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.convert.converter.BigIntegerConverter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet;
import org.apache.isis.core.metamodel.facets.value.bigdecimal.BigDecimalValueFacet;
@@ -32,7 +33,6 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.DateConverte
import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.DateConverterForJavaSqlTimestamp;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.DateConverterForJavaUtilDate;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath.BigDecimalConverterWithScale;
-import org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath.BigIntegerConverter;
import org.apache.isis.viewer.wicket.ui.components.scalars.jodatime.DateConverterForJodaDateTime;
import org.apache.isis.viewer.wicket.ui.components.scalars.jodatime.DateConverterForJodaLocalDate;
import org.apache.isis.viewer.wicket.ui.components.scalars.jodatime.DateConverterForJodaLocalDateTime;
@@ -86,7 +86,7 @@ public class IsisConverterLocator {
} else if (java.sql.Timestamp.class == correspondingClass) {
converter = new DateConverterForJavaSqlTimestamp(wicketViewerSettings, adjustBy);
} else if (java.math.BigInteger.class == correspondingClass) {
- converter = BigIntegerConverter.INSTANCE;
+ converter = new BigIntegerConverter();
} else if (java.math.BigDecimal.class == correspondingClass) {
final BigDecimalValueFacet facet = objectSpecification.getFacet(BigDecimalValueFacet.class);
Integer scale = null;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigIntegerConverter.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigIntegerConverter.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigIntegerConverter.java
deleted file mode 100644
index 3f581b4..0000000
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigIntegerConverter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath;
-
-import java.math.BigInteger;
-import java.util.Locale;
-import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.convert.converter.AbstractIntegerConverter;
-import org.apache.wicket.util.string.Strings;
-
-public final class BigIntegerConverter extends AbstractIntegerConverter<BigInteger> {
- private static final long serialVersionUID = 1L;
-
- /**
- * The singleton instance for a big integer converter
- * (cf the Wicket subclasses)
- */
- public static final IConverter<BigInteger> INSTANCE = new BigIntegerConverter();
-
- @Override
- public BigInteger convertToObject(String value, Locale locale) throws ConversionException {
- if (Strings.isEmpty(value))
- {
- return null;
- }
-
- final Number number = parse(value, -Double.MAX_VALUE, Double.MAX_VALUE, locale);
-
- if (number instanceof BigInteger)
- {
- return (BigInteger)number;
- }
- else if (number instanceof Long)
- {
- return BigInteger.valueOf(number.longValue());
- }
- else if (number instanceof Integer)
- {
- return BigInteger.valueOf(number.intValue());
- }
- else
- {
- return new BigInteger(value);
- }
- }
-
- @Override
- protected Class<BigInteger> getTargetType() {
- return BigInteger.class;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
index d68038d..f8e948f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
@@ -26,6 +26,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.convert.converter.BigIntegerConverter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
@@ -40,7 +41,7 @@ public class JavaMathBigIntegerPanel extends ScalarPanelTextFieldNumeric<BigInte
private static final String ID_SCALAR_VALUE = "scalarValue";
public JavaMathBigIntegerPanel(final String id, final ScalarModel scalarModel) {
- super(id, scalarModel, BigInteger.class, BigIntegerConverter.INSTANCE);
+ super(id, scalarModel, BigInteger.class, new BigIntegerConverter());
}
@Override
@@ -51,7 +52,7 @@ public class JavaMathBigIntegerPanel extends ScalarPanelTextFieldNumeric<BigInte
@SuppressWarnings("unchecked")
@Override
public <C> IConverter<C> getConverter(Class<C> type) {
- return (IConverter<C>) (type == BigInteger.class? BigIntegerConverter.INSTANCE: super.getConverter(type));
+ return (IConverter<C>) (type == BigInteger.class? new BigIntegerConverter(): super.getConverter(type));
}
};
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
index 8ac459d..4a93f5f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/EntityLinkSelect2Panel.java
@@ -60,7 +60,7 @@ class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAdapter> i
}
@Override
- protected void convertInput() {
+ public void convertInput() {
owningPanel.convertInput();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
index 6277b87..3baa87e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2BootstrapCssReference.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.select2;
+import java.util.List;
import com.google.common.collect.Lists;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
@@ -36,7 +37,7 @@ public class Select2BootstrapCssReference extends CssResourceReference {
}
@Override
- public Iterable<? extends HeaderItem> getDependencies() {
- return Lists.newArrayList(CssHeaderItem.forReference(new CssResourceReference(Select2Choice.class, "res/select2.css")));
+ public List<HeaderItem> getDependencies() {
+ return Lists.<HeaderItem>newArrayList(CssHeaderItem.forReference(new CssResourceReference(Select2Choice.class, "res/select2.css")));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
index 476286b..0282e1e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
@@ -38,7 +38,7 @@ public final class Select2ChoiceUtil {
return select2Choice;
}
- private static class EmptyChoiceProvider extends ChoiceProvider<ObjectAdapterMemento> {
+ private static class EmptyChoiceProvider implements ChoiceProvider<ObjectAdapterMemento> {
private static final EmptyChoiceProvider INSTANCE = new EmptyChoiceProvider();
@@ -56,5 +56,10 @@ public final class Select2ChoiceUtil {
public Collection<ObjectAdapterMemento> toChoices(Collection<String> ids) {
return null;
}
+
+ @Override
+ public void detach() {
+
+ }
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
index 1363267..b454f32 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2JsReference.java
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.select2;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
+import java.util.List;
import com.google.common.collect.Lists;
import org.apache.wicket.Application;
import org.apache.wicket.markup.head.HeaderItem;
@@ -37,8 +38,8 @@ public class Select2JsReference extends WebjarsJavaScriptResourceReference {
}
@Override
- public Iterable<? extends HeaderItem> getDependencies() {
+ public List<HeaderItem> getDependencies() {
ResourceReference jQueryReference = Application.get().getJavaScriptLibrarySettings().getJQueryReference();
- return Lists.newArrayList(JavaScriptHeaderItem.forReference(jQueryReference));
+ return Lists.<HeaderItem>newArrayList(JavaScriptHeaderItem.forReference(jQueryReference));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
index b703a28..64067ce 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/StackTraceListView.java
@@ -30,7 +30,7 @@ public final class StackTraceListView extends ListView<StackTraceDetail> {
private static final long serialVersionUID = 1L;
private final String idLine;
- public StackTraceListView(String id, String idLine, List<? extends org.apache.isis.viewer.wicket.ui.errors.StackTraceDetail> list) {
+ public StackTraceListView(String id, String idLine, List<org.apache.isis.viewer.wicket.ui.errors.StackTraceDetail> list) {
super(id, list);
this.idLine = idLine;
}
@@ -42,4 +42,4 @@ public final class StackTraceListView extends ListView<StackTraceDetail> {
item.add(new AttributeAppender("class", detail.getType().name().toLowerCase()));
item.add(label);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 6c1d2ab..5045f7f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -74,7 +74,7 @@ public class MmvErrorPage extends WebPage {
private static final String ID_ERROR = "error";
private static final String ID_ERROR_MESSAGE = "errorMessage";
- public MmvErrorPage(final IModel<List<? extends String>> model) {
+ public MmvErrorPage(final IModel<List<String>> model) {
super(model);
addPageTitle();
addApplicationName();
@@ -82,8 +82,8 @@ public class MmvErrorPage extends WebPage {
}
@SuppressWarnings("unchecked")
- private IModel<List<? extends String>> getModel() {
- return (IModel<List<? extends String>>) getDefaultModel();
+ private IModel<List<String>> getModel() {
+ return (IModel<List<String>>) getDefaultModel();
}
private MarkupContainer addPageTitle() {
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 4815d10..95e715a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.ui.panels;
import java.util.List;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.model.IModel;
@@ -43,7 +42,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
public abstract class FormAbstract<T> extends Form<T>
- implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
+ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
AuthenticationSessionProvider, DeploymentCategoryProvider, PersistenceSessionProvider {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/dc976bcd/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index bffaa6b..a451490 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.ui.panels;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
-import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@ -45,7 +44,7 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
* Convenience adapter for {@link Panel}s built up using {@link ComponentType}s.
*/
// TODO mgrigorov: extend GenericPanel and make T the type of the model object, not the model
-public abstract class PanelAbstract<T extends IModel<?>> extends Panel implements IHeaderContributor, PersistenceSessionProvider, AuthenticationSessionProvider,
+public abstract class PanelAbstract<T extends IModel<?>> extends Panel implements PersistenceSessionProvider, AuthenticationSessionProvider,
DeploymentCategoryProvider {
private static final long serialVersionUID = 1L;
[2/2] isis git commit: ISIS-1223 Upgrade Wicket to 7.x
Posted by mg...@apache.org.
ISIS-1223 Upgrade Wicket to 7.x
Fix Maven dependency convergences.
Fix indents.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8eab4577
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8eab4577
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8eab4577
Branch: refs/heads/ISIS-1223-upgrade-to-wicket-7
Commit: 8eab4577340e0b15b0b5db5454ed1f10e89ba5b7
Parents: dc976bc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 2 21:22:47 2015 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 2 21:22:47 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 4 ++++
core/viewer-wicket-applib/pom.xml | 18 +++++++++---------
core/viewer-wicket-model/pom.xml | 16 ++++++++--------
3 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index aed6870..8f481cb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1491,6 +1491,10 @@ ${license.additional-notes}
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-applib/pom.xml b/core/viewer-wicket-applib/pom.xml
index aae5322..e896f80 100644
--- a/core/viewer-wicket-applib/pom.xml
+++ b/core/viewer-wicket-applib/pom.xml
@@ -52,16 +52,16 @@
<dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/isis/blob/8eab4577/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/pom.xml b/core/viewer-wicket-model/pom.xml
index 66bb1cf..4acaa6a 100644
--- a/core/viewer-wicket-model/pom.xml
+++ b/core/viewer-wicket-model/pom.xml
@@ -33,19 +33,19 @@
<dependencies>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-applib</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-wicket-applib</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>