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/09/07 10:00:39 UTC
[1/2] isis git commit: ISIS-1711: comments out the dubious logic for
both reference panel and value choices panel.... now seems to behave as
required.
Repository: isis
Updated Branches:
refs/heads/master f26494f8b -> 02d0fe5e5
ISIS-1711: comments out the dubious logic for both reference panel and value choices panel.... now seems to behave as required.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2767ad85
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2767ad85
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2767ad85
Branch: refs/heads/master
Commit: 2767ad857b7a49ae04eb2c1b962ddb28a646fa0f
Parents: f26494f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 7 10:05:23 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 7 10:05:23 2017 +0100
----------------------------------------------------------------------
.../scalars/reference/ReferencePanel.java | 24 +++++++++++---------
.../valuechoices/ValueChoicesSelect2Panel.java | 24 +++++++++++---------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2767ad85/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 794908d..4521344 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
@@ -367,17 +367,19 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract implements PanelW
return;
}
- if(!curr.containedIn(choiceMementos, getPersistenceSession(), getSpecificationLoader())) {
- if(!choiceMementos.isEmpty() && autoSelect()) {
- final ObjectAdapterMemento newAdapterMemento = choiceMementos.get(0);
- select2.getModel().setObject(newAdapterMemento);
- getModel().setObject(newAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
- getPersistenceSession(), getSpecificationLoader()));
- } else {
- select2.getModel().setObject(null);
- getModel().setObject(null);
- }
- }
+ // dubious behaviour...
+
+// if(!curr.containedIn(choiceMementos, getPersistenceSession(), getSpecificationLoader())) {
+// if(!choiceMementos.isEmpty() && autoSelect()) {
+// final ObjectAdapterMemento newAdapterMemento = choiceMementos.get(0);
+// select2.getModel().setObject(newAdapterMemento);
+// getModel().setObject(newAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+// getPersistenceSession(), getSpecificationLoader()));
+// } else {
+// select2.getModel().setObject(null);
+// getModel().setObject(null);
+// }
+// }
} else {
http://git-wip-us.apache.org/repos/asf/isis/blob/2767ad85/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 e35b3ab..2908537 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
@@ -150,17 +150,19 @@ public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract impleme
if(!getModel().isCollection()) {
- // if currently held value is not compatible with choices, then replace with the first choice
- if(!choicesMementos.contains(curr)) {
-
- final ObjectAdapterMemento newAdapterMemento =
- choicesMementos.isEmpty()
- ? null
- : choicesMementos.get(0);
-
- select2.getModel().setObject(newAdapterMemento);
- getModel().setObjectMemento(newAdapterMemento, getPersistenceSession(), getSpecificationLoader());
- }
+ // dubious behaviour...
+
+// // if currently held value is not compatible with choices, then replace with the first choice
+// if(!choicesMementos.contains(curr)) {
+//
+// final ObjectAdapterMemento newAdapterMemento =
+// choicesMementos.isEmpty()
+// ? null
+// : choicesMementos.get(0);
+//
+// select2.getModel().setObject(newAdapterMemento);
+// getModel().setObjectMemento(newAdapterMemento, getPersistenceSession(), getSpecificationLoader());
+// }
} else {
[2/2] isis git commit: ISIS-1711: removes dead code, renames method
Posted by da...@apache.org.
ISIS-1711: removes dead code, renames method
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/02d0fe5e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/02d0fe5e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/02d0fe5e
Branch: refs/heads/master
Commit: 02d0fe5e585c9324da321f76d31f237a1a4632a8
Parents: 2767ad8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 7 10:58:49 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 7 10:58:49 2017 +0100
----------------------------------------------------------------------
.../scalars/ScalarPanelSelect2Abstract.java | 4 +--
.../scalars/reference/ReferencePanel.java | 21 +---------------
.../valuechoices/ValueChoicesSelect2Panel.java | 26 +-------------------
3 files changed, 4 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/02d0fe5e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
index 67b4e41..917c413 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
@@ -127,7 +127,7 @@ public abstract class ScalarPanelSelect2Abstract extends ScalarPanelAbstract2 {
if(choiceProvider instanceof ObjectAdapterMementoProviderForChoices) {
final ObjectAdapterMementoProviderForChoices providerForChoices = (ObjectAdapterMementoProviderForChoices) choiceProvider;
- resetIfCurrentNotInChoices(select2, providerForChoices.getChoiceMementos());
+ syncIfNull(select2, providerForChoices.getChoiceMementos());
}
}
@@ -139,7 +139,7 @@ public abstract class ScalarPanelSelect2Abstract extends ScalarPanelAbstract2 {
/**
* Mandatory hook (is called by {@link #setProviderAndCurrAndPending(Select2, ObjectAdapter[])})
*/
- protected abstract void resetIfCurrentNotInChoices(final Select2 select2, final List<ObjectAdapterMemento> choicesMementos);
+ protected abstract void syncIfNull(final Select2 select2, final List<ObjectAdapterMemento> choicesMementos);
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/02d0fe5e/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 4521344..295aeff 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
@@ -356,7 +356,7 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract implements PanelW
// called by setProviderAndCurrAndPending
@Override
- protected void resetIfCurrentNotInChoices(final Select2 select2, final List<ObjectAdapterMemento> choiceMementos) {
+ protected void syncIfNull(final Select2 select2, final List<ObjectAdapterMemento> choiceMementos) {
final ObjectAdapterMemento curr = select2.getModelObject();
if(!getModel().isCollection()) {
@@ -364,27 +364,8 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract implements PanelW
if(curr == null) {
select2.getModel().setObject(null);
getModel().setObject(null);
- return;
}
- // dubious behaviour...
-
-// if(!curr.containedIn(choiceMementos, getPersistenceSession(), getSpecificationLoader())) {
-// if(!choiceMementos.isEmpty() && autoSelect()) {
-// final ObjectAdapterMemento newAdapterMemento = choiceMementos.get(0);
-// select2.getModel().setObject(newAdapterMemento);
-// getModel().setObject(newAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
-// getPersistenceSession(), getSpecificationLoader()));
-// } else {
-// select2.getModel().setObject(null);
-// getModel().setObject(null);
-// }
-// }
-
- } else {
-
- // TODO
-
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/02d0fe5e/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 2908537..defe635 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
@@ -139,35 +139,11 @@ public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract impleme
}
@Override
- protected void resetIfCurrentNotInChoices(final Select2 select2, final List<ObjectAdapterMemento> choicesMementos) {
+ protected void syncIfNull(final Select2 select2, final List<ObjectAdapterMemento> choicesMementos) {
final ObjectAdapterMemento curr = getModel().getObjectAdapterMemento();
if(curr == null) {
-
select2.getModel().setObject(null);
-
- } else {
-
- if(!getModel().isCollection()) {
-
- // dubious behaviour...
-
-// // if currently held value is not compatible with choices, then replace with the first choice
-// if(!choicesMementos.contains(curr)) {
-//
-// final ObjectAdapterMemento newAdapterMemento =
-// choicesMementos.isEmpty()
-// ? null
-// : choicesMementos.get(0);
-//
-// select2.getModel().setObject(newAdapterMemento);
-// getModel().setObjectMemento(newAdapterMemento, getPersistenceSession(), getSpecificationLoader());
-// }
-
- } else {
-
- // nothing to do
- }
}
}