You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/11/02 19:35:47 UTC
[03/12] isis git commit: ISIS-1020: bumping to wicketstuff-select2
3.5.2
ISIS-1020: bumping to wicketstuff-select2 3.5.2
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e654f934
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e654f934
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e654f934
Branch: refs/heads/master
Commit: e654f934ecb6cc123986200fc601d75294ef66ec
Parents: 426ef81
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Nov 2 13:17:35 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Nov 2 13:24:10 2015 +0000
----------------------------------------------------------------------
core/pom.xml | 11 +--
.../wicket/viewer/IsisWicketApplication.java | 2 +-
.../model/models/ScalarModelWithPending.java | 2 +-
core/viewer-wicket-ui/pom.xml | 4 +-
.../reference/EntityLinkSelect2Panel.java | 6 +-
.../scalars/reference/ReferencePanel.java | 6 +-
.../ObjectAdapterMementoProviderAbstract.java | 4 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 70 ++++++++++----------
.../select2/Select2BootstrapCssReference.java | 5 +-
.../widgets/select2/Select2ChoiceUtil.java | 29 +++++++-
.../valuechoices/ValueChoicesSelect2Panel.java | 7 +-
11 files changed, 84 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 9548411..c7c2f0c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -129,9 +129,9 @@
<wicket-bootstrap.version>0.9.12</wicket-bootstrap.version>
<wicket-source.version>6.0.0.8</wicket-source.version>
- <wicket-select2.version>2.2.3</wicket-select2.version>
- <select2.version>3.5.1</select2.version>
- <jquery-ui.version>1.10.4</jquery-ui.version>
+ <wicket-select2.version>6.20.0</wicket-select2.version>
+ <select2.version>3.5.2</select2.version>
+ <jquery-ui.version>1.11.4</jquery-ui.version>
<guice.version>3.0</guice.version>
<picocontainer.version>2.14.3</picocontainer.version>
@@ -1580,8 +1580,9 @@ ${license.additional-notes}
<!-- Wicket-Select2 -->
<dependency>
- <groupId>com.vaynberg.wicket.select2</groupId>
- <artifactId>wicket-select2</artifactId>
+
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-select2</artifactId>
<version>${wicket-select2.version}</version>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/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 0250ba7..192851f 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
@@ -35,7 +35,7 @@ import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
-import com.vaynberg.wicket.select2.ApplicationSettings;
+import org.wicketstuff.select2.ApplicationSettings;
import org.apache.wicket.Application;
import org.apache.wicket.ConverterLocator;
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
index d153f08..fab9761 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChec
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
/**
- * For widgets that use a <tt>com.vaynberg.wicket.select2.Select2Choice</tt>;
+ * For widgets that use a <tt>org.wicketstuff.select2.Select2Choice</tt>;
* synchronizes the {@link Model} of the <tt>Select2Choice</tt>
* with the parent {@link ScalarModel}, allowing also for pending values.
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/core/viewer-wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/pom.xml b/core/viewer-wicket-ui/pom.xml
index 826dd87..50081b4 100644
--- a/core/viewer-wicket-ui/pom.xml
+++ b/core/viewer-wicket-ui/pom.xml
@@ -89,8 +89,8 @@
<artifactId>wicket-guice</artifactId>
</dependency>
<dependency>
- <groupId>com.vaynberg.wicket.select2</groupId>
- <artifactId>wicket-select2</artifactId>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-select2</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/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 aab5d83..8ac459d 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
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.reference;
-import com.vaynberg.wicket.select2.Select2Choice;
-
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -42,7 +40,7 @@ class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAdapter> i
/**
* Necessary because {@link FormComponentPanel} overrides this as <tt>true</tt>, whereas we want to
- * report on the state of the underlying {@link Select2Choice}.
+ * report on the state of the underlying {@link org.wicketstuff.select2.Select2Choice}.
*/
@Override
public boolean checkRequired() {
@@ -55,8 +53,6 @@ class EntityLinkSelect2Panel extends FormComponentPanelAbstract<ObjectAdapter> i
/**
* Since we override {@link #convertInput()}, it is (apparently) enough to
* just return a value that is suitable for error reporting.
- *
- * @see DateField#getInput() for reference
*/
@Override
public String getInput() {
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git 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
index d712030..937f990 100644
--- 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
@@ -24,9 +24,9 @@ import java.util.List;
import javax.inject.Inject;
import com.google.common.collect.Lists;
-import com.vaynberg.wicket.select2.ChoiceProvider;
-import com.vaynberg.wicket.select2.Select2Choice;
-import com.vaynberg.wicket.select2.Settings;
+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;
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
----------------------------------------------------------------------
diff --git 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
index 0062e8c..bb72f1e 100644
--- 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
@@ -22,7 +22,7 @@ import java.util.Locale;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
-import com.vaynberg.wicket.select2.TextChoiceProvider;
+import org.wicketstuff.select2.TextChoiceProvider;
import org.apache.wicket.Session;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.Strings;
@@ -76,7 +76,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
}
@Override
- public void query(final String term, final int page, final com.vaynberg.wicket.select2.Response<ObjectAdapterMemento> response) {
+ public void query(final String term, final int page, final org.wicketstuff.select2.Response<ObjectAdapterMemento> response) {
final List<ObjectAdapterMemento> mementos = Lists.newArrayList(obtainMementos(term));
// if not mandatory, and the list doesn't contain null already, then add it in.
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git 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
index 76badf0..6d19acc 100644
--- 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
@@ -17,14 +17,14 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs;
import java.util.Collection;
-import com.vaynberg.wicket.select2.Response;
-import com.vaynberg.wicket.select2.Select2Choice;
-import com.vaynberg.wicket.select2.Settings;
-import com.vaynberg.wicket.select2.TextChoiceProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+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.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
@@ -51,34 +51,7 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
final BreadcrumbModel breadcrumbModel = session.getBreadcrumbModel();
final IModel<EntityModel> entityModel = new Model<EntityModel>();
- final Select2Choice<EntityModel> breadcrumbChoice = new Select2Choice<EntityModel>(ID_BREADCRUMBS, entityModel);
-
- breadcrumbChoice.add(
- new AjaxFormComponentUpdatingBehavior("change"){
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- final String oidStr = breadcrumbChoice.getInput();
- final EntityModel selectedModel = breadcrumbModel.lookup(oidStr);
- if(selectedModel == null) {
- final MessageBroker messageBroker = IsisContext.getAuthenticationSession().getMessageBroker();
- messageBroker.addWarning("Cannot find object");
- String feedbackMsg = JGrowlUtil.asJGrowlCalls(messageBroker);
- target.appendJavaScript(feedbackMsg);
- breadcrumbModel.remove(oidStr);
- return;
- }
- setResponsePage(EntityPage.class, selectedModel.getPageParameters());
- }
- });
-
- final Settings settings = breadcrumbChoice.getSettings();
- settings.setMinimumInputLength(0);
- settings.setWidth("100%");
-
- breadcrumbChoice.setProvider(new TextChoiceProvider<EntityModel>() {
+ TextChoiceProvider<EntityModel> choiceProvider = new TextChoiceProvider<EntityModel>() {
private static final long serialVersionUID = 1L;
@@ -91,7 +64,7 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
protected Object getId(EntityModel choice) {
try {
return PageParameterNames.OBJECT_OID.getStringFrom(choice.getPageParameters());
- } catch(Exception ex) {
+ } catch (Exception ex) {
breadcrumbModel.remove(choice);
return null;
}
@@ -106,8 +79,35 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
public Collection<EntityModel> toChoices(Collection<String> ids) {
return breadcrumbModel.getList();
}
-
- });
+
+ };
+ final Select2Choice<EntityModel> breadcrumbChoice = new Select2Choice<>(ID_BREADCRUMBS, entityModel, choiceProvider);
+
+ breadcrumbChoice.add(
+ new AjaxFormComponentUpdatingBehavior("change"){
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ final String oidStr = breadcrumbChoice.getInput();
+ final EntityModel selectedModel = breadcrumbModel.lookup(oidStr);
+ if(selectedModel == null) {
+ final MessageBroker messageBroker = IsisContext.getAuthenticationSession().getMessageBroker();
+ messageBroker.addWarning("Cannot find object");
+ String feedbackMsg = JGrowlUtil.asJGrowlCalls(messageBroker);
+ target.appendJavaScript(feedbackMsg);
+ breadcrumbModel.remove(oidStr);
+ return;
+ }
+ setResponsePage(EntityPage.class, selectedModel.getPageParameters());
+ }
+ });
+
+ final Settings settings = breadcrumbChoice.getSettings();
+ settings.setMinimumInputLength(0);
+ settings.setWidth("100%");
+
addOrReplace(breadcrumbChoice);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/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 acb4daa..6277b87 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,12 +18,11 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.select2;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
-
import com.google.common.collect.Lists;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
+import org.wicketstuff.select2.Select2Choice;
/**
* A CSS reference that loads <a href="https://github.com/ivaynberg/select2/">Select2.css</a>
@@ -38,6 +37,6 @@ public class Select2BootstrapCssReference extends CssResourceReference {
@Override
public Iterable<? extends HeaderItem> getDependencies() {
- return Lists.newArrayList(CssHeaderItem.forReference(new WebjarsCssResourceReference("/select2/current/select2.css")));
+ return Lists.newArrayList(CssHeaderItem.forReference(new CssResourceReference(Select2Choice.class, "res/select2.css")));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/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 fb82253..476286b 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
@@ -16,9 +16,14 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.select2;
-import com.vaynberg.wicket.select2.Select2Choice;
+import java.util.Collection;
+import org.apache.wicket.ajax.json.JSONException;
+import org.apache.wicket.ajax.json.JSONWriter;
import org.apache.wicket.model.IModel;
+import org.wicketstuff.select2.ChoiceProvider;
+import org.wicketstuff.select2.Response;
+import org.wicketstuff.select2.Select2Choice;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -28,8 +33,28 @@ public final class Select2ChoiceUtil {
private Select2ChoiceUtil(){}
public static Select2Choice<ObjectAdapterMemento> newSelect2Choice(String id, final IModel<ObjectAdapterMemento> modelObject, ScalarModel scalarModel) {
- Select2Choice<ObjectAdapterMemento> select2Choice = new Select2Choice<>(id, modelObject);
+ Select2Choice<ObjectAdapterMemento> select2Choice = new Select2Choice<>(id, modelObject, EmptyChoiceProvider.INSTANCE);
select2Choice.setRequired(scalarModel.isRequired());
return select2Choice;
}
+
+ private static class EmptyChoiceProvider extends ChoiceProvider<ObjectAdapterMemento> {
+
+ private static final EmptyChoiceProvider INSTANCE = new EmptyChoiceProvider();
+
+ @Override
+ public void query(String term, int page, Response<ObjectAdapterMemento> response) {
+
+ }
+
+ @Override
+ public void toJson(ObjectAdapterMemento choice, JSONWriter writer) throws JSONException {
+
+ }
+
+ @Override
+ public Collection<ObjectAdapterMemento> toChoices(Collection<String> ids) {
+ return null;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e654f934/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git 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
index 8a05dd3..964188d 100644
--- 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
@@ -16,6 +16,7 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.valuechoices;
+
import java.util.Collection;
import java.util.List;
@@ -25,8 +26,8 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
-import com.vaynberg.wicket.select2.ChoiceProvider;
-import com.vaynberg.wicket.select2.Select2Choice;
+import org.wicketstuff.select2.ChoiceProvider;
+import org.wicketstuff.select2.Select2Choice;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
@@ -192,6 +193,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
@Override
protected List<ObjectAdapterMemento> obtainMementos(String term) {
+ // return choicesMementos; // ISIS-1020: as of Jan 2015
return obtainMementos(term, choicesMementos);
}
@@ -273,7 +275,6 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
// //////////////////////////////////////
-
public ObjectAdapterMemento getPending() {
return pending;
}