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 2017/04/28 09:21:32 UTC
[27/43] isis git commit: ISIS-1603: ValueChoicesSelect2Panel no
longer implements ScalarModelWith{Multi}Pending, instead use the ScalarModel
ISIS-1603: ValueChoicesSelect2Panel no longer implements ScalarModelWith{Multi}Pending, instead use the ScalarModel
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/715e8767
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/715e8767
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/715e8767
Branch: refs/heads/master
Commit: 715e8767f3665538f39922116f5cc958ad9bea09
Parents: e1e28f9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 27 11:23:48 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 27 13:26:40 2017 +0100
----------------------------------------------------------------------
.../components/scalars/ScalarPanelAbstract.java | 14 ---------
.../scalars/reference/ReferencePanel.java | 16 ++++++----
.../valuechoices/ValueChoicesSelect2Panel.java | 32 ++------------------
3 files changed, 12 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/715e8767/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 76109cb..d2e71a1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -363,20 +363,6 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
return select2;
}
- // the implementation pulled up from ValueChoicesSelect2Panel.
- // however, uses an overloaded version that relies on VCSP implementing ScalarModlWith{Multi}Pending. Experimenting as to whether that's actually required...
-// protected Select2 createSelect2(final String id) {
-// final Select2 select2;
-// if(getModel().isCollection()) {
-// final IModel<ArrayList<ObjectAdapterMemento>> model = ScalarModelWithMultiPending.Util.createModel(this);
-// select2 = Select2.newSelect2MultiChoice(id, model, scalarModel);
-// } else {
-// final IModel<ObjectAdapterMemento> modelObject = ScalarModelWithPending.Util.createModel(this);
-// select2 = Select2.newSelect2Choice(ID_SCALAR_VALUE, modelObject, scalarModel);
-// }
-// return select2;
-// }
-
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/715e8767/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 c8c8a3f..17be714 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
@@ -532,12 +532,6 @@ public class ReferencePanel extends ScalarPanelAbstract implements PanelWithChoi
return autoCompleteFacet != null;
}
- @com.google.inject.Inject
- private WicketViewerSettings wicketViewerSettings;
-
- IsisConfiguration getConfiguration() {
- return getIsisSessionFactory().getConfiguration();
- }
/**
* Repaints just the Select2 component
@@ -555,4 +549,14 @@ public class ReferencePanel extends ScalarPanelAbstract implements PanelWithChoi
}
+
+ // //////////////////////////////////////
+
+ @com.google.inject.Inject
+ WicketViewerSettings wicketViewerSettings;
+
+ IsisConfiguration getConfiguration() {
+ return getIsisSessionFactory().getConfiguration();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/715e8767/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index 7ddf536..fe823ec 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -16,7 +16,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.valuechoices;
-import java.util.ArrayList;
import java.util.List;
import com.google.common.base.Strings;
@@ -37,8 +36,6 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.model.models.ScalarModelWithMultiPending;
-import org.apache.isis.viewer.wicket.model.models.ScalarModelWithPending;
import org.apache.isis.viewer.wicket.ui.components.scalars.PanelWithChoices;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
@@ -46,18 +43,15 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements ScalarModelWithPending, ScalarModelWithMultiPending,
- PanelWithChoices {
+public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements PanelWithChoices {
private static final long serialVersionUID = 1L;
private Select2 select2;
- private ObjectAdapterMemento pending;
public ValueChoicesSelect2Panel(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
- pending = scalarModel.getObjectAdapterMemento();
}
@@ -283,36 +277,14 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
}
}
- // //////////////////////////////////////
-
- @Override
- public ObjectAdapterMemento getPending() {
- return pending;
- }
-
- public void setPending(ObjectAdapterMemento pending) {
- this.pending = pending;
- }
-
- @Override
- public ArrayList<ObjectAdapterMemento> getMultiPending() {
- final ArrayList<ObjectAdapterMemento> mementos = pending != null ? pending.getList() : null;
- return mementos == null || mementos.isEmpty() ? null : mementos;
- }
-
- @Override
- public void setMultiPending(final ArrayList<ObjectAdapterMemento> pending) {
- this.pending = ObjectAdapterMemento.createForList(pending, scalarModel.getTypeOfSpecification().getSpecId());
- }
public ScalarModel getScalarModel() {
return scalarModel;
}
- // //////////////////////////////////////
@com.google.inject.Inject
- private WicketViewerSettings wicketViewerSettings;
+ WicketViewerSettings wicketViewerSettings;
@Override
protected String getScalarPanelType() {