ISIS-1224: updates select2 to v4
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c66f629b Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c66f629b Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c66f629b Branch: refs/heads/master Commit: c66f629b065894dd50a63eb2c1c79bc8c69bdc2d Parents: 8bf0cc7 5576387 Author: Dan Haywood <[email protected]> Authored: Fri Oct 28 01:06:53 2016 +0200 Committer: Dan Haywood <[email protected]> Committed: Fri Oct 28 01:06:53 2016 +0200 ---------------------------------------------------------------------- .../actions/ActionParametersFormPanel.java | 4 ++-- .../CollectionContentsMultipleViewsPanel.java | 2 +- .../components/scalars/ScalarPanelAbstract.java | 9 +++++++++ .../reference/EntityLinkSelect2Panel.html | 2 +- .../scalars/reference/ReferencePanel.html | 2 +- .../scalars/reference/ReferencePanel.java | 16 +++++++++++++--- .../ObjectAdapterMementoProviderAbstract.java | 9 ++++----- .../widgets/breadcrumbs/BreadcrumbModel.java | 2 +- .../widgets/breadcrumbs/BreadcrumbPanel.html | 4 ++++ .../widgets/breadcrumbs/BreadcrumbPanel.java | 20 ++++++++++++-------- .../select2/Select2BootstrapCssReference.java | 10 +++++++--- .../widgets/select2/Select2ChoiceUtil.java | 13 ++++++++++++- .../valuechoices/ValueChoicesSelect2Panel.html | 9 +++++---- .../valuechoices/ValueChoicesSelect2Panel.java | 13 ++++++++++++- .../ui/errors/ExceptionStackTracePanel.html | 9 ++------- .../isis/viewer/wicket/ui/util/Components.java | 7 ++++--- 16 files changed, 90 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java ---------------------------------------------------------------------- diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java index 0039bf6,0cb058a..95b0fac --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java @@@ -21,7 -21,13 +21,11 @@@ package org.apache.isis.viewer.wicket.u import java.util.List; -import javax.inject.Inject; - import com.google.common.collect.Lists; + import org.apache.wicket.ajax.AjaxRequestTarget; + import org.wicketstuff.select2.ChoiceProvider; + import org.wicketstuff.select2.Select2Choice; + import org.wicketstuff.select2.Settings; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; @@@ -533,10 -531,16 +537,16 @@@ public class ReferencePanel extends Sca private WicketViewerSettings wicketViewerSettings; IsisConfiguration getConfiguration() { - return IsisContext.getConfiguration(); + return getIsisSessionFactory().getConfiguration(); } - - - + /** + * Repaints just the Select2 component + * + * @param target The Ajax request handler + */ + @Override + public void repaint(AjaxRequestTarget target) { + target.add(select2Field); + } } http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java ---------------------------------------------------------------------- diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java index cdc2250,1ce0ce7..68956a8 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java @@@ -27,8 -26,6 +27,7 @@@ import org.wicketstuff.select2.ChoicePr import org.apache.wicket.Session; import org.apache.wicket.util.convert.IConverter; import org.apache.wicket.util.string.Strings; - import org.wicketstuff.select2.TextChoiceProvider; + import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking; import org.apache.isis.core.metamodel.adapter.oid.RootOid; http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java ---------------------------------------------------------------------- diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java index 6fa1496,815aaa1..c75a11b --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java @@@ -31,9 -31,10 +31,11 @@@ import org.wicketstuff.select2.ChoicePr import org.wicketstuff.select2.Response; import org.wicketstuff.select2.Select2Choice; import org.wicketstuff.select2.Settings; - import org.wicketstuff.select2.TextChoiceProvider; import org.apache.isis.core.commons.authentication.MessageBroker; ++import org.apache.isis.core.commons.config.IsisConfiguration; ++import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller; + import org.apache.isis.core.metamodel.adapter.oid.RootOid; -import org.apache.isis.core.runtime.system.context.IsisContext; import org.apache.isis.viewer.wicket.model.models.EntityModel; import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil; import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage; @@@ -72,8 -68,10 +74,10 @@@ public class BreadcrumbPanel extends Pa } @Override - protected Object getId(EntityModel choice) { - return breadcrumbModel.getId(choice); + public String getIdValue(EntityModel choice) { + RootOid rootOid = breadcrumbModel.getId(choice); - String id = IsisContext.getOidMarshaller().marshal(rootOid); ++ String id = OidMarshaller.INSTANCE.marshal(rootOid); + return id; } @Override http://git-wip-us.apache.org/repos/asf/isis/blob/c66f629b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java ---------------------------------------------------------------------- diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java index 172069e,32bc2dc..7ae2c63 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java @@@ -29,6 -34,6 +29,7 @@@ import com.google.common.collect.Lists import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; ++import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel;
