You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/12/18 08:13:39 UTC
[isis] branch master updated: ISIS-2226: search and replace
'dependentArgs' -> 'pendingArgs'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new df4bb1b ISIS-2226: search and replace 'dependentArgs' -> 'pendingArgs'
df4bb1b is described below
commit df4bb1b324124ec8d26ab9351141a2d45ee8b2fb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Dec 18 09:13:27 2019 +0100
ISIS-2226: search and replace 'dependentArgs' -> 'pendingArgs'
---
.../ActionParameterAutoCompleteFacet.java | 2 +-
.../ActionParameterAutoCompleteFacetViaMethod.java | 4 +--
.../param/choices/ActionParameterChoicesFacet.java | 2 +-
.../choices/ActionParameterChoicesFacetNone.java | 2 +-
...rameterChoicesFacetDerivedFromChoicesFacet.java | 2 +-
.../ActionParameterChoicesFacetViaMethod.java | 4 +--
.../ActionParameterDefaultsFacetViaMethod.java | 10 +++----
...arameterChoicesFacetFromParentedCollection.java | 2 +-
...meterDefaultsFacetFromAssociatedCollection.java | 2 +-
.../apache/isis/metamodel/spec/ManagedObject.java | 18 ++++++------
.../spec/feature/ObjectActionParameter.java | 14 +++++-----
.../specimpl/ObjectActionParameterAbstract.java | 32 +++++++++++-----------
.../ObjectActionParameterContributeeAbstract.java | 8 +++---
.../ObjectActionParameterMixedInAbstract.java | 4 +--
.../viewer/wicket/model/models/ScalarModel.java | 32 +++++++++++-----------
.../scalars/ScalarPanelSelect2Abstract.java | 10 +++----
.../scalars/reference/ReferencePanel.java | 6 ++--
.../valuechoices/ValueChoicesSelect2Panel.java | 8 +++---
...derForReferenceParamOrPropertyAutoComplete.java | 10 +++----
.../actions/depargs/DependentArgsActionMenu.java | 2 +-
20 files changed, 87 insertions(+), 87 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
index 709989a..98fb5cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/ActionParameterAutoCompleteFacet.java
@@ -36,7 +36,7 @@ public interface ActionParameterAutoCompleteFacet extends Facet {
public Object[] autoComplete(
ManagedObject inObject,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
String searchArg,
InteractionInitiatedBy interactionInitiatedBy);
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
index abe7474..f207460 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
@@ -79,13 +79,13 @@ implements ImperativeFacet {
@Override
public Object[] autoComplete(
final ManagedObject owningAdapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final String searchArg,
final InteractionInitiatedBy interactionInitiatedBy) {
final Object collectionOrArray =
ManagedObject.InvokeUtil.invokeAutofit(
- method, owningAdapter, dependentArgs,
+ method, owningAdapter, pendingArgs,
Can.ofSingleton(Optional.ofNullable(searchArg)));
if (collectionOrArray == null) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
index ac089e2..2fab36f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacet.java
@@ -36,6 +36,6 @@ public interface ActionParameterChoicesFacet extends Facet {
public Object[] getChoices(
ManagedObject target,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
InteractionInitiatedBy interactionInitiatedBy);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
index fcab08d..c01e23f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
@@ -33,7 +33,7 @@ public class ActionParameterChoicesFacetNone extends ActionParameterChoicesFacet
@Override
public Object[] getChoices(
final ManagedObject adapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final InteractionInitiatedBy interactionInitiatedBy) {
return new ManagedObject[0];
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
index b43ebf6..3a6c8d6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacet.java
@@ -38,7 +38,7 @@ public class ActionParameterChoicesFacetDerivedFromChoicesFacet extends ActionPa
@Override
public Object[] getChoices(
final ManagedObject adapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final InteractionInitiatedBy interactionInitiatedBy) {
final FacetHolder facetHolder = getFacetHolder();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
index e584ff0..f1f1d62 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
@@ -70,12 +70,12 @@ implements ImperativeFacet {
@Override
public Object[] getChoices(
final ManagedObject owningAdapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final InteractionInitiatedBy interactionInitiatedBy) {
final Object choices =
ManagedObject.InvokeUtil.invokeAutofit(
- method, owningAdapter, dependentArgs);
+ method, owningAdapter, pendingArgs);
if (choices == null) {
return _Constants.emptyObjects;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
index 501f07a..e3d1fc9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
@@ -71,12 +71,12 @@ public class ActionParameterDefaultsFacetViaMethod extends ActionParameterDefaul
@Override
public Object getDefault(
final ManagedObject target,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final Integer paramNumUpdated) {
// this isn't a dependent defaults situation, so just evaluate the default.
- if (dependentArgs.isEmpty() || paramNumUpdated == null) {
- return ManagedObject.InvokeUtil.invokeAutofit(method, target, dependentArgs);
+ if (pendingArgs.isEmpty() || paramNumUpdated == null) {
+ return ManagedObject.InvokeUtil.invokeAutofit(method, target, pendingArgs);
}
// this could be a dependent defaults situation, but has a previous parameter been updated
@@ -91,12 +91,12 @@ public class ActionParameterDefaultsFacetViaMethod extends ActionParameterDefaul
// conversely, if method default2Foo(int), and the second param is updated... we don't want to re-evaluate
// so numParams == 1, and paramNumUpdated == 1, and (paramNumUpdated < numParams) is FALSE
//
- return ManagedObject.InvokeUtil.invokeAutofit(method, target, dependentArgs);
+ return ManagedObject.InvokeUtil.invokeAutofit(method, target, pendingArgs);
}
// otherwise, just return the arguments that are already known; we don't want to recompute the default
// because if we did then this would trample over any pending changes already made by the end-user.
- val argPojo = dependentArgs.stream()
+ val argPojo = pendingArgs.stream()
.skip(paramNum)
.findFirst()
.map(ManagedObject::getPojo)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java
index d835ce1..2022d61 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterChoicesFacetFromParentedCollection.java
@@ -47,7 +47,7 @@ public class ActionParameterChoicesFacetFromParentedCollection extends ActionPar
@Override
public Object[] getChoices(
final ManagedObject target,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final InteractionInitiatedBy interactionInitiatedBy) {
final ManagedObject parentAdapter = determineParentAdapter(target);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
index 2413ef2..e599edd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/ActionParameterDefaultsFacetFromAssociatedCollection.java
@@ -58,7 +58,7 @@ public class ActionParameterDefaultsFacetFromAssociatedCollection extends Action
@Override
public Object getDefault(
final ManagedObject target,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final Integer paramNumUpdated) {
return selectedPojos.get();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
index bb85691..4577c8f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ManagedObject.java
@@ -465,10 +465,10 @@ public interface ManagedObject {
public static Object invokeAutofit(
final Method method,
final ManagedObject target,
- final Can<? extends ManagedObject> dependentArgs,
+ final Can<? extends ManagedObject> pendingArgs,
final Can<Optional<Object>> additionalArgValues) {
- val argArray = adjust(method, dependentArgs, additionalArgValues);
+ val argArray = adjust(method, pendingArgs, additionalArgValues);
return MethodExtensions.invoke(method, unwrapPojo(target), argArray);
}
@@ -479,24 +479,24 @@ public interface ManagedObject {
public static Object invokeAutofit(
final Method method,
final ManagedObject target,
- final Can<? extends ManagedObject> dependentArgs) {
+ final Can<? extends ManagedObject> pendingArgs) {
- return invokeAutofit(method, target, dependentArgs, Can.empty());
+ return invokeAutofit(method, target, pendingArgs, Can.empty());
}
private static Object[] adjust(
final Method method,
- final Can<? extends ManagedObject> dependentArgs,
+ final Can<? extends ManagedObject> pendingArgs,
final Can<Optional<Object>> additionalArgValues) {
val parameterTypes = method.getParameterTypes();
val paramCount = parameterTypes.length;
val additionalArgCount = additionalArgValues.size();
- val dependentArgsToConsiderCount = paramCount - additionalArgCount;
+ val pendingArgsToConsiderCount = paramCount - additionalArgCount;
- val argIterator = dependentArgs.iterator();
+ val argIterator = pendingArgs.iterator();
val adjusted = new Object[paramCount];
- for(int i=0; i<dependentArgsToConsiderCount; i++) {
+ for(int i=0; i<pendingArgsToConsiderCount; i++) {
val paramType = parameterTypes[i];
val arg = argIterator.hasNext() ? unwrapPojo(argIterator.next()) : null;
@@ -505,7 +505,7 @@ public interface ManagedObject {
}
// add the additional parameter values (if any)
- int paramIndex = dependentArgsToConsiderCount;
+ int paramIndex = pendingArgsToConsiderCount;
for(val additionalArg : additionalArgValues) {
val paramType = parameterTypes[paramIndex];
adjusted[paramIndex] = honorPrimitiveDefaults(paramType, additionalArg.orElse(null));
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
index c1e550d..93c3ad3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/feature/ObjectActionParameter.java
@@ -92,7 +92,7 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
*/
ManagedObject[] getAutoComplete(
ManagedObject adapter,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
String searchArg,
InteractionInitiatedBy interactionInitiatedBy);
@@ -111,38 +111,38 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
*/
ManagedObject[] getChoices(
ManagedObject adapter,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
InteractionInitiatedBy interactionInitiatedBy);
ManagedObject getDefault(
ManagedObject adapter,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
Integer paramNumUpdated);
/**
* Whether this parameter is visible given the entered previous arguments
* @param targetAdapter
- * @param dependentArgs
+ * @param pendingArgs
* @param interactionInitiatedBy
* @return
*/
Consent isVisible(
ManagedObject targetAdapter,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
InteractionInitiatedBy interactionInitiatedBy);
/**
* Whether this parameter is disabled given the entered previous arguments
* @param targetAdapter
- * @param dependentArgs
+ * @param pendingArgs
* @param interactionInitiatedBy
* @return
*/
Consent isUsable(
ManagedObject targetAdapter,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
InteractionInitiatedBy interactionInitiatedBy);
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 751759a..f8819d9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -231,7 +231,7 @@ implements ObjectActionParameter, FacetHolder.Delegating {
@Override
public ManagedObject[] getAutoComplete(
final ManagedObject adapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final String searchArg,
final InteractionInitiatedBy interactionInitiatedBy) {
@@ -240,7 +240,7 @@ implements ObjectActionParameter, FacetHolder.Delegating {
if (facet != null) {
final Object[] choices = facet
- .autoComplete(adapter, dependentArgs, searchArg, interactionInitiatedBy);
+ .autoComplete(adapter, pendingArgs, searchArg, interactionInitiatedBy);
checkChoicesOrAutoCompleteType(getSpecificationLoader(), choices, getSpecification());
for (final Object choice : choices) {
adapters.add(getObjectManager().adapt(choice));
@@ -268,10 +268,10 @@ implements ObjectActionParameter, FacetHolder.Delegating {
@Override
public ManagedObject[] getChoices(
final ManagedObject adapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final InteractionInitiatedBy interactionInitiatedBy) {
- val args = argsForDefaultOrChoices(adapter, dependentArgs);
+ val args = argsForDefaultOrChoices(adapter, pendingArgs);
val target = targetForDefaultOrChoices(adapter);
return findChoices(target, args, interactionInitiatedBy);
@@ -279,14 +279,14 @@ implements ObjectActionParameter, FacetHolder.Delegating {
private ManagedObject[] findChoices(
final ManagedObject target,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final InteractionInitiatedBy interactionInitiatedBy) {
final List<ManagedObject> adapters = _Lists.newArrayList();
final ActionParameterChoicesFacet facet = getFacet(ActionParameterChoicesFacet.class);
if (facet != null) {
- final Object[] choices = facet.getChoices(target, dependentArgs, interactionInitiatedBy);
+ final Object[] choices = facet.getChoices(target, pendingArgs, interactionInitiatedBy);
checkChoicesOrAutoCompleteType(getSpecificationLoader(), choices, getSpecification());
for (final Object choice : choices) {
ManagedObject adapter = choice != null? getObjectManager().adapt(choice) : null;
@@ -301,11 +301,11 @@ implements ObjectActionParameter, FacetHolder.Delegating {
@Override
public ManagedObject getDefault(
final ManagedObject adapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final Integer paramNumUpdated) {
final ManagedObject target = targetForDefaultOrChoices(adapter);
- val args = argsForDefaultOrChoices(adapter, dependentArgs);
+ val args = argsForDefaultOrChoices(adapter, pendingArgs);
return findDefault(target, args, paramNumUpdated);
}
@@ -382,22 +382,22 @@ implements ObjectActionParameter, FacetHolder.Delegating {
private ActionArgVisibilityContext createArgumentVisibilityContext(
final ManagedObject objectAdapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final int position,
final InteractionInitiatedBy interactionInitiatedBy) {
return new ActionArgVisibilityContext(
- objectAdapter, parentAction, getIdentifier(), dependentArgs, position, interactionInitiatedBy);
+ objectAdapter, parentAction, getIdentifier(), pendingArgs, position, interactionInitiatedBy);
}
@Override
public Consent isVisible(
final ManagedObject targetAdapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final InteractionInitiatedBy interactionInitiatedBy) {
final VisibilityContext<?> ic = createArgumentVisibilityContext(
- targetAdapter, dependentArgs, getNumber(), interactionInitiatedBy
+ targetAdapter, pendingArgs, getNumber(), interactionInitiatedBy
);
final InteractionResult visibleResult = InteractionUtils.isVisibleResult(this, ic);
@@ -410,7 +410,7 @@ implements ObjectActionParameter, FacetHolder.Delegating {
private ActionArgUsabilityContext createArgumentUsabilityContext(
final ManagedObject objectAdapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final int position,
final InteractionInitiatedBy interactionInitiatedBy) {
@@ -418,7 +418,7 @@ implements ObjectActionParameter, FacetHolder.Delegating {
objectAdapter,
parentAction,
getIdentifier(),
- dependentArgs,
+ pendingArgs,
position,
interactionInitiatedBy);
}
@@ -426,11 +426,11 @@ implements ObjectActionParameter, FacetHolder.Delegating {
@Override
public Consent isUsable(
final ManagedObject targetAdapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final InteractionInitiatedBy interactionInitiatedBy) {
final UsabilityContext<?> ic = createArgumentUsabilityContext(
- targetAdapter, dependentArgs, getNumber(), interactionInitiatedBy
+ targetAdapter, pendingArgs, getNumber(), interactionInitiatedBy
);
final InteractionResult usableResult = InteractionUtils.isUsableResult(this, ic);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterContributeeAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterContributeeAbstract.java
index bfd9492..70803a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterContributeeAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterContributeeAbstract.java
@@ -59,13 +59,13 @@ implements ObjectActionParameterContributee {
@Override
public ManagedObject[] getAutoComplete(
final ManagedObject adapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final String searchArg,
final InteractionInitiatedBy interactionInitiatedBy) {
return serviceActionParameter.getAutoComplete(
getServiceAdapter(),
- dependentArgs,
+ pendingArgs,
searchArg,
interactionInitiatedBy);
}
@@ -83,9 +83,9 @@ implements ObjectActionParameterContributee {
@Override
protected Can<ManagedObject> argsForDefaultOrChoices(
final ManagedObject contributee,
- final Can<ManagedObject> dependentArgs) {
+ final Can<ManagedObject> pendingArgs) {
- final List<ManagedObject> suppliedArgs = dependentArgs.stream()
+ final List<ManagedObject> suppliedArgs = pendingArgs.stream()
.collect(Collectors.toCollection(ArrayList::new));
final int contributeeParam = contributeeAction.getContributeeParam();
ListExtensions.insert(suppliedArgs, contributeeParam, contributee);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterMixedInAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterMixedInAbstract.java
index 955e013..6906c11 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterMixedInAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionParameterMixedInAbstract.java
@@ -45,13 +45,13 @@ implements ObjectActionParameterMixedIn {
@Override
public ManagedObject[] getAutoComplete(
final ManagedObject mixedInAdapter,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final String searchArg,
final InteractionInitiatedBy interactionInitiatedBy) {
return mixinParameter.getAutoComplete(
mixinAdapterFor(mixedInAdapter),
- dependentArgs,
+ pendingArgs,
searchArg,
interactionInitiatedBy);
}
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 4412db6..f11e6c8 100644
--- a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -189,7 +189,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
@Override
public ManagedObject getDefault(
final ScalarModel scalarModel,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final int paramNumUpdated,
final AuthenticationSession authenticationSession) {
@@ -210,7 +210,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
@Override
public List<ManagedObject> getChoices(
final ScalarModel scalarModel,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final AuthenticationSession authenticationSession) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
@@ -234,7 +234,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
@Override
public List<ManagedObject> getAutoComplete(
final ScalarModel scalarModel,
- final Can<ManagedObject> dependentArgs, // ignored for properties
+ final Can<ManagedObject> pendingArgs, // ignored for properties
final String searchArg,
final AuthenticationSession authenticationSession) {
@@ -425,7 +425,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
@Override
public ManagedObject getDefault(
final ScalarModel scalarModel,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final int paramNumUpdated,
final AuthenticationSession authenticationSession) {
@@ -434,7 +434,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
//XXX lombok issue, no val
ManagedObject parentAdapter = scalarModel.getParentEntityModel().load();
- return actionParameter.getDefault(parentAdapter, dependentArgs, paramNumUpdated);
+ return actionParameter.getDefault(parentAdapter, pendingArgs, paramNumUpdated);
}
@Override
@@ -446,7 +446,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
@Override
public List<ManagedObject> getChoices(
final ScalarModel scalarModel,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final AuthenticationSession authenticationSession) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
@@ -458,7 +458,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
final ManagedObject[] choices =
actionParameter.getChoices(
parentAdapter,
- dependentArgs,
+ pendingArgs,
InteractionInitiatedBy.USER);
return choicesAsList(choices);
}
@@ -472,7 +472,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
@Override
public List<ManagedObject> getAutoComplete(
final ScalarModel scalarModel,
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final String searchArg,
final AuthenticationSession authenticationSession) {
@@ -482,7 +482,7 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
ManagedObject parentAdapter = scalarModel.getParentEntityModel().load();
final ManagedObject[] choices = actionParameter.getAutoComplete(
parentAdapter,
- dependentArgs,
+ pendingArgs,
searchArg,
InteractionInitiatedBy.USER);
return choicesAsList(choices);
@@ -635,20 +635,20 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
public abstract ManagedObject getDefault(
ScalarModel scalarModel,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
int paramNumUpdated,
AuthenticationSession authenticationSession);
public abstract boolean hasChoices(ScalarModel scalarModel);
public abstract List<ManagedObject> getChoices(
ScalarModel scalarModel,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
AuthenticationSession authenticationSession);
public abstract boolean hasAutoComplete(ScalarModel scalarModel);
public abstract List<ManagedObject> getAutoComplete(
ScalarModel scalarModel,
- Can<ManagedObject> dependentArgs,
+ Can<ManagedObject> pendingArgs,
String searchArg,
AuthenticationSession authenticationSession);
@@ -927,10 +927,10 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
}
public List<ManagedObject> getChoices(
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final AuthenticationSession authenticationSession) {
- return kind.getChoices(this, dependentArgs, authenticationSession);
+ return kind.getChoices(this, pendingArgs, authenticationSession);
}
public boolean hasAutoComplete() {
@@ -938,11 +938,11 @@ implements LinksProvider, FormExecutorContext, ActionArgumentModel {
}
public List<ManagedObject> getAutoComplete(
- final Can<ManagedObject> dependentArgs,
+ final Can<ManagedObject> pendingArgs,
final String searchTerm,
final AuthenticationSession authenticationSession) {
- return kind.getAutoComplete(this, dependentArgs, searchTerm, authenticationSession);
+ return kind.getAutoComplete(this, pendingArgs, searchTerm, authenticationSession);
}
/**
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
index 1ddd7c4..754762f 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
@@ -112,9 +112,9 @@ public abstract class ScalarPanelSelect2Abstract extends ScalarPanelAbstract2 {
/**
* sets up the choices, also ensuring that any currently held value is compatible.
*/
- private void setProviderAndCurrAndPending(Select2 select2, Can<ManagedObject> dependentArgs) {
+ private void setProviderAndCurrAndPending(Select2 select2, Can<ManagedObject> pendingArgs) {
- final ChoiceProvider<ObjectMemento> choiceProvider = buildChoiceProvider(dependentArgs);
+ final ChoiceProvider<ObjectMemento> choiceProvider = buildChoiceProvider(pendingArgs);
select2.setProvider(choiceProvider);
getModel().clearPending();
@@ -131,7 +131,7 @@ public abstract class ScalarPanelSelect2Abstract extends ScalarPanelAbstract2 {
/**
* Mandatory hook (is called by {@link #setProviderAndCurrAndPending(Select2, Can<ManagedObject>)})
*/
- protected abstract ChoiceProvider<ObjectMemento> buildChoiceProvider(Can<ManagedObject> dependentArgs);
+ protected abstract ChoiceProvider<ObjectMemento> buildChoiceProvider(Can<ManagedObject> pendingArgs);
/**
* Mandatory hook (is called by {@link #setProviderAndCurrAndPending(Select2, Can<ManagedObject>)})
@@ -197,11 +197,11 @@ public abstract class ScalarPanelSelect2Abstract extends ScalarPanelAbstract2 {
}
}
- private boolean updateChoices(Can<ManagedObject> dependentArgs) {
+ private boolean updateChoices(Can<ManagedObject> pendingArgs) {
if (select2 == null) {
return false;
}
- setProviderAndCurrAndPending(select2, dependentArgs);
+ setProviderAndCurrAndPending(select2, pendingArgs);
return true;
}
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index f00260a..f578ec9 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -340,18 +340,18 @@ public class ReferencePanel extends ScalarPanelSelect2Abstract {
// //////////////////////////////////////
@Override
- protected ChoiceProvider<ObjectMemento> buildChoiceProvider(Can<ManagedObject> dependentArgs) {
+ protected ChoiceProvider<ObjectMemento> buildChoiceProvider(Can<ManagedObject> pendingArgs) {
val commonContext = super.getCommonContext();
if (getModel().hasChoices()) {
- val choices = getModel().getChoices(dependentArgs, commonContext.getAuthenticationSession());
+ val choices = getModel().getChoices(pendingArgs, commonContext.getAuthenticationSession());
val choiceMementos = _Lists.map(choices, commonContext::mementoFor);
return new ObjectAdapterMementoProviderForReferenceChoices(getModel(), choiceMementos);
}
if(getModel().hasAutoComplete()) {
- val dependentArgMementos = dependentArgs.stream()
+ val dependentArgMementos = pendingArgs.stream()
.map(commonContext::mementoFor)
.collect(Collectors.toCollection(ArrayList::new)); // serializable
return new ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete(
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index 4443c32..a3df988 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -74,12 +74,12 @@ public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract {
}
- private List<ObjectMemento> getChoiceMementos(final Can<ManagedObject> dependentArgs) {
+ private List<ObjectMemento> getChoiceMementos(final Can<ManagedObject> pendingArgs) {
val commonContext = super.getCommonContext();
val choices =
- scalarModel.getChoices(dependentArgs, commonContext.getAuthenticationSession());
+ scalarModel.getChoices(pendingArgs, commonContext.getAuthenticationSession());
return _Lists.map(choices, commonContext::mementoFor);
}
@@ -165,8 +165,8 @@ public class ValueChoicesSelect2Panel extends ScalarPanelSelect2Abstract {
// in corresponding code in ReferencePanelFactory, these is a branch for different types of providers
// (choice vs autoComplete). Here though - because values don't currently support autoComplete - no branch is required
@Override
- protected ChoiceProvider<ObjectMemento> buildChoiceProvider(Can<ManagedObject> dependentArgs) {
- final List<ObjectMemento> choicesMementos = getChoiceMementos(dependentArgs);
+ protected ChoiceProvider<ObjectMemento> buildChoiceProvider(Can<ManagedObject> pendingArgs) {
+ final List<ObjectMemento> choicesMementos = getChoiceMementos(pendingArgs);
return new ObjectAdapterMementoProviderForValueChoices(scalarModel, choicesMementos);
}
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
index c32bd91..8453be1 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
@@ -52,10 +52,10 @@ extends ObjectAdapterMementoProviderAbstract {
val autoCompleteChoices = _Lists.<ManagedObject>newArrayList();
if (getScalarModel().hasAutoComplete()) {
- // recover any dependentArgs
- val dependentArgs = reconstructDependentArgs(dependentArgMementos);
+ // recover any pendingArgs
+ val pendingArgs = reconstructDependentArgs(dependentArgMementos);
val autoCompleteAdapters = getScalarModel()
- .getAutoComplete(dependentArgs, term, commonContext.getAuthenticationSession());
+ .getAutoComplete(pendingArgs, term, commonContext.getAuthenticationSession());
autoCompleteChoices.addAll(autoCompleteAdapters);
}
@@ -65,11 +65,11 @@ extends ObjectAdapterMementoProviderAbstract {
private Can<ManagedObject> reconstructDependentArgs(List<ObjectMemento> dependentArgMementos) {
val commonContext = super.getCommonContext();
- val dependentArgsStream = _NullSafe.stream(dependentArgMementos)
+ val pendingArgsStream = _NullSafe.stream(dependentArgMementos)
.map(commonContext::reconstructObject)
.map(ManagedObject.class::cast);
- return Can.ofStream(dependentArgsStream);
+ return Can.ofStream(pendingArgsStream);
}
}
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java
index cb1426f..bb3d8fb 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/depargs/DependentArgsActionMenu.java
@@ -37,7 +37,7 @@ public class DependentArgsActionMenu {
@Action
@ActionLayout(cssClassFa="fa-bolt")
- public DependentArgsActionDemo dependentArgsActions(){
+ public DependentArgsActionDemo pendingArgsActions(){
val demo = factoryService.instantiate(DependentArgsActionDemo.class);
demo.initDefaults();
return demo;