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/10/14 02:28:53 UTC
[08/12] isis git commit: ISIS-1194: converting regions to use
IntelliJ-style. Removing one or two unused instance vars.
ISIS-1194: converting regions to use IntelliJ-style. Removing one or two unused instance vars.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9f251d9c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9f251d9c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9f251d9c
Branch: refs/heads/ISIS-1213
Commit: 9f251d9c9db58fac4e252a7304067cf5de14a32c
Parents: c62f937
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Oct 13 06:59:33 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Oct 13 06:59:33 2015 +0100
----------------------------------------------------------------------
.../specimpl/ObjectActionContributee.java | 2 +-
.../specloader/specimpl/ObjectActionImpl.java | 66 +++++++++-----------
.../specimpl/ObjectActionMixedIn.java | 3 -
.../specimpl/ObjectActionParameterAbstract.java | 46 ++++++--------
.../ObjectActionParameterContributee.java | 1 -
.../specimpl/ObjectAssociationAbstract.java | 1 -
.../specimpl/ObjectMemberAbstract.java | 52 +++++++--------
.../OneToManyAssociationContributee.java | 9 ++-
.../specimpl/OneToManyAssociationImpl.java | 50 +++++++--------
.../OneToOneActionParameterContributee.java | 8 ---
.../OneToOneAssociationContributee.java | 9 ++-
.../specimpl/OneToOneAssociationImpl.java | 10 ++-
12 files changed, 109 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 8fcf8d8..fe1a5df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -137,7 +137,7 @@ public class ObjectActionContributee extends ObjectActionImpl implements Contrib
(ObjectActionParameterAbstract) serviceParameters.get(serviceParamNum);
final ObjectActionParameterContributee contributedParam;
contributedParam = new OneToOneActionParameterContributee(
- getServiceAdapter(), serviceAction, serviceParameter, serviceParamNum,
+ getServiceAdapter(), serviceParameter,
contributeeParamNum, this);
contributeeParameters.add(contributedParam);
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
index cdc0d56..ae38776 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
@@ -67,6 +67,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectAction {
+
private final static Logger LOG = LoggerFactory.getLogger(ObjectActionImpl.class);
public static ActionType getType(final String typeStr) {
@@ -77,25 +78,24 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
return type;
}
+ //region > fields
/**
* Lazily initialized by {@link #getParameters()} (so don't use directly!)
*/
private List<ObjectActionParameter> parameters;
-
- // //////////////////////////////////////////////////////////////////
- // Constructors
- // //////////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > constructors
public ObjectActionImpl(final FacetedMethod facetedMethod, final ObjectMemberDependencies objectMemberDependencies) {
super(facetedMethod, FeatureType.ACTION, objectMemberDependencies);
}
- // //////////////////////////////////////////////////////////////////
- // ReturnType, OnType, Actions (set)
- // //////////////////////////////////////////////////////////////////
+ //endregion
+ //region > ReturnType, OnType, Actions (set)
/**
* Always returns <tt>null</tt>.
*/
@@ -136,11 +136,9 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
return facet != null? facet.value(): ActionSemantics.Of.NON_IDEMPOTENT;
}
+ //endregion
- // /////////////////////////////////////////////////////////////
- // Type, IsContributed
- // /////////////////////////////////////////////////////////////
-
+ //region > Type
@Override
public ActionType getType() {
return getType(this);
@@ -161,10 +159,9 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
}
return ActionType.USER;
}
+ //endregion
- // /////////////////////////////////////////////////////////////
- // Parameters
- // /////////////////////////////////////////////////////////////
+ //region > Parameters
@Override
public int getParameterCount() {
@@ -264,9 +261,9 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
return parameters.get(position);
}
- // /////////////////////////////////////////////////////////////
- // Visible (or hidden)
- // /////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > visable, usable
@Override
public VisibilityContext<?> createVisibleInteractionContext(
@@ -275,20 +272,15 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
return new ActionVisibilityContext(targetObjectAdapter, getIdentifier(), interactionInitiatedBy, where);
}
- // /////////////////////////////////////////////////////////////
- // Usable (or disabled)
- // /////////////////////////////////////////////////////////////
-
@Override
public UsabilityContext<?> createUsableInteractionContext(
final ObjectAdapter targetObjectAdapter, final InteractionInitiatedBy interactionInitiatedBy,
Where where) {
return new ActionUsabilityContext(targetObjectAdapter, getIdentifier(), interactionInitiatedBy, where);
}
+ //endregion
- // //////////////////////////////////////////////////////////////////
- // validate
- // //////////////////////////////////////////////////////////////////
+ //region > validate
@Override
public Consent isProposedArgumentSetValid(
@@ -331,9 +323,9 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
interactionInitiatedBy);
}
- // //////////////////////////////////////////////////////////////////
- // executeWithRuleChecking, execute
- // //////////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > executeWithRuleChecking, execute
@Override
public ObjectAdapter executeWithRuleChecking(
@@ -381,9 +373,9 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
}
- // //////////////////////////////////////////////////////////////////
- // defaults
- // //////////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > defaults
@Override
public ObjectAdapter[] getDefaults(final ObjectAdapter target) {
@@ -437,9 +429,9 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
return pojo == null ? null : getPersistenceSessionService().adapterFor(pojo);
}
- // /////////////////////////////////////////////////////////////
- // options (choices)
- // /////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > choices
@Override
public ObjectAdapter[][] getChoices(
@@ -506,9 +498,9 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
return parameterChoicesAdapters;
}
- // //////////////////////////////////////////////////////////////////
- // debug, toString
- // //////////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > debug, toString
@Override
public String debugData() {
@@ -537,5 +529,7 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
return sb.toString();
}
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index 9574080..64b48e7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -110,7 +110,6 @@ public class ObjectActionMixedIn extends ObjectActionImpl implements MixedInMemb
}
public synchronized List<ObjectActionParameter> getParameters() {
- //return mixinAction.getParameters();
if (this.parameters == null) {
final List<ObjectActionParameter> mixinActionParameters = mixinAction.getParameters();
@@ -195,8 +194,6 @@ public class ObjectActionMixedIn extends ObjectActionImpl implements MixedInMemb
bulkInteractionContext.setInvokedAs(Bulk.InteractionContext.InvokedAs.REGULAR);
actionInvocationContext.setDomainObjects(Collections.singletonList(mixedInAdapter.getObject()));
}
-
-
}
final CommandContext commandContext = getServicesInjector().lookupService(CommandContext.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 4552f0a..81bff3d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -67,8 +67,6 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
private final ObjectActionImpl parentAction;
private final TypedHolder peer;
-
-
protected ObjectActionParameterAbstract(final int number, final ObjectActionImpl objectAction, final TypedHolder peer) {
this.number = number;
this.parentAction = objectAction;
@@ -93,7 +91,6 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return getAdapterMap().adapterFor(proposed);
}
-
protected MutableProposedHolder getProposedHolder(final ObjectAdapter owner) {
if (!(owner instanceof MutableProposedHolder)) {
throw new IllegalArgumentException("Instance should implement MutableProposedHolder");
@@ -101,7 +98,6 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return (MutableProposedHolder) owner;
}
-
/**
* Parameter number, 0-based.
*/
@@ -116,9 +112,10 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
}
/**
- * NOT API, but exposed for the benefit of {@link ObjectActionParameterContributee}.
+ * NOT API, but exposed for the benefit of {@link ObjectActionParameterContributee}
+ * and {@link ObjectActionParameterMixedIn}.
*/
- public TypedHolder getPeer() {
+ TypedHolder getPeer() {
return peer;
}
@@ -199,9 +196,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return Allow.DEFAULT;
}
- // //////////////////////////////////////////////////////////
- // FacetHolder
- // //////////////////////////////////////////////////////////
+ //region > FacetHolder
@Override
public boolean containsFacet(final Class<? extends Facet> facetType) {
@@ -257,10 +252,9 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
}
}
+ //endregion
- // /////////////////////////////////////////////////////////////
- // AutoComplete
- // /////////////////////////////////////////////////////////////
+ //region > AutoComplete
@Override
public boolean hasAutoComplete() {
@@ -300,10 +294,9 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return facet != null? facet.getMinLength(): MinLengthUtil.MIN_LENGTH_DEFAULT;
}
+ //endregion
- // /////////////////////////////////////////////////////////////
- // Choices
- // /////////////////////////////////////////////////////////////
+ //region > Choices
@Override
public boolean hasChoices() {
@@ -348,10 +341,10 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
*/
return adapters.toArray(new ObjectAdapter[adapters.size()]);
}
-
- // /////////////////////////////////////////////////////////////
- // Defaults
- // /////////////////////////////////////////////////////////////
+
+ //endregion
+
+ //region > Defaults
@Override
public ObjectAdapter getDefault(final ObjectAdapter adapter) {
@@ -437,10 +430,9 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
}
}
-
- // /////////////////////////////////////////////////////////////
- // Validation
- // /////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > Validation
@Override
public ActionArgumentContext createProposedArgumentInteractionContext(
@@ -499,9 +491,9 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return arguments;
}
- // /////////////////////////////////////////////////////////////
- // Dependencies (from parent)
- // /////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > Dependencies (from parent)
protected SpecificationLoader getSpecificationLoader() {
return parentAction.getSpecificationLoader();
@@ -515,4 +507,6 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return parentAction.getPersistenceSessionService();
}
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterContributee.java
index 4930fa1..877a994 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterContributee.java
@@ -18,7 +18,6 @@ package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-
public interface ObjectActionParameterContributee extends ObjectActionParameter {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
index 8787b5d..3884074 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
-// TODO need to pull up the common methods. like getName(), from subclasses
public abstract class ObjectAssociationAbstract extends ObjectMemberAbstract implements ObjectAssociation {
private final ObjectSpecification specification;
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index 30e3e4e..57eb6fb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.consent.InteractionResult;
@@ -56,12 +55,11 @@ import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.Collecti
public abstract class ObjectMemberAbstract implements ObjectMember {
- private final PersistenceSessionService persistenceSessionService;
-
public static ObjectSpecification getSpecification(final SpecificationLoader specificationLookup, final Class<?> type) {
return type == null ? null : specificationLookup.loadSpecification(type);
}
+ //region > fields
private final CollectionTypeRegistry collectionTypeRegistry = new CollectionTypeRegistry();
protected final String defaultName;
@@ -70,6 +68,8 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
private final FeatureType featureType;
private final SpecificationLoader specificationLookup;
private final ServicesInjector servicesInjector;
+ private final PersistenceSessionService persistenceSessionService;
+ //endregion
protected ObjectMemberAbstract(
final FacetedMethod facetedMethod,
@@ -89,10 +89,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
this.persistenceSessionService = objectMemberDependencies.getPersistenceSessionService();
}
-
- // /////////////////////////////////////////////////////////////
- // Identifiers
- // /////////////////////////////////////////////////////////////
+ //region > Identifiers
@Override
public String getId() {
@@ -116,9 +113,9 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return featureType;
}
- // /////////////////////////////////////////////////////////////
- // Facets
- // /////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > Facets
@Override
public boolean containsFacet(final Class<? extends Facet> facetType) {
@@ -165,10 +162,9 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
getFacetedMethod().removeFacet(facetType);
}
- // /////////////////////////////////////////////////////////////
- // Name, Description, Help (convenience for facets)
- // /////////////////////////////////////////////////////////////
+ //endregion
+ //region > Name, Description, Help (convenience for facets)
/**
* Return the default label for this member. This is based on the name of
* this member.
@@ -200,10 +196,9 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return facet.value();
}
- // /////////////////////////////////////////////////////////////
- // Hidden (or visible)
- // /////////////////////////////////////////////////////////////
+ //endregion
+ //region > Hidden (or visible)
/**
* Create an {@link InteractionContext} to represent an attempt to view this
* member (that is, to check if it is visible or not).
@@ -251,11 +246,9 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
final VisibilityContext<?> ic = createVisibleInteractionContext(target, interactionInitiatedBy, where);
return InteractionUtils.isVisibleResult(this, ic);
}
+ //endregion
- // /////////////////////////////////////////////////////////////
- // Disabled (or enabled)
- // /////////////////////////////////////////////////////////////
-
+ //region > Disabled (or enabled)
/**
* Create an {@link InteractionContext} to represent an attempt to
* use this member (that is, to check if it is usable or not).
@@ -291,10 +284,9 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return InteractionUtils.isUsableResult(this, ic);
}
- // //////////////////////////////////////////////////////////////////
- // isAssociation, isAction
- // //////////////////////////////////////////////////////////////////
+ //endregion
+ //region > isAssociation, isAction
@Override
public boolean isAction() {
return featureType.isAction();
@@ -314,21 +306,18 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
public boolean isOneToOneAssociation() {
return featureType.isProperty();
}
+ //endregion
-
- // //////////////////////////////////////////////////////////////////
- // toString
- // //////////////////////////////////////////////////////////////////
+ //region > toString
@Override
public String toString() {
return String.format("id=%s,name='%s'", getId(), getName());
}
- // //////////////////////////////////////////////////////////////////
- // Dependencies
- // //////////////////////////////////////////////////////////////////
+ //endregion
+ //region > Dependencies
public SpecificationLoader getSpecificationLoader() {
return specificationLookup;
@@ -345,4 +334,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
public CollectionTypeRegistry getCollectionTypeRegistry() {
return collectionTypeRegistry;
}
+
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 0762472..953d4bc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -161,11 +161,8 @@ public class OneToManyAssociationContributee extends OneToManyAssociationImpl im
return InteractionUtils.isUsableResult(this, ic).createConsent();
}
-
- // //////////////////////////////////////
- // FacetHolder
- // //////////////////////////////////////
-
+ //region > FacetHolder
+
@Override
public Class<? extends Facet>[] getFacetTypes() {
return facetHolder.getFacetTypes();
@@ -220,4 +217,6 @@ public class OneToManyAssociationContributee extends OneToManyAssociationImpl im
return getServiceAdapter().getSpecification();
}
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
index 41291a1..fda40d2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
@@ -29,11 +29,11 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.consent.InteractionResult;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionClearFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
+import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.interactions.CollectionAddToContext;
import org.apache.isis.core.metamodel.interactions.CollectionRemoveFromContext;
import org.apache.isis.core.metamodel.interactions.CollectionUsabilityContext;
@@ -42,7 +42,6 @@ import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -69,9 +68,7 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
return getCollectionTypeRegistry().semanticsOf(underlyingClass);
}
- // /////////////////////////////////////////////////////////////
- // Hidden (or visible)
- // /////////////////////////////////////////////////////////////
+ //region > visible, usable
@Override
public VisibilityContext<?> createVisibleInteractionContext(
@@ -80,9 +77,6 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
return new CollectionVisibilityContext(ownerAdapter, getIdentifier(), interactionInitiatedBy, where);
}
- // /////////////////////////////////////////////////////////////
- // Disabled (or enabled)
- // /////////////////////////////////////////////////////////////
@Override
public UsabilityContext<?> createUsableInteractionContext(
@@ -91,10 +85,9 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
return new CollectionUsabilityContext(ownerAdapter, getIdentifier(), interactionInitiatedBy, where);
}
- // /////////////////////////////////////////////////////////////
- // Validate Add
- // /////////////////////////////////////////////////////////////
+ //endregion
+ //region > Validate Add
// Not API
private ValidityContext<?> createValidateAddInteractionContext(
final InteractionInitiatedBy interactionInitiatedBy,
@@ -121,10 +114,9 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
return InteractionUtils.isValidResult(this, validityContext);
}
- // /////////////////////////////////////////////////////////////
- // Validate Remove
- // /////////////////////////////////////////////////////////////
+ //endregion
+ //region > Validate Remove
private ValidityContext<?> createValidateRemoveInteractionContext(
final ObjectAdapter ownerAdapter,
final ObjectAdapter proposedToRemoveAdapter,
@@ -156,9 +148,9 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
return !isNotPersisted();
}
- // /////////////////////////////////////////////////////////////
- // get, isEmpty, add, clear
- // /////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > get, isEmpty, add, clear
@Override
public ObjectAdapter get(
@@ -183,9 +175,9 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
return facet.size(collection) == 0;
}
- // /////////////////////////////////////////////////////////////
- // add, clear
- // /////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > add, clear
@Override
public void addElement(
@@ -231,10 +223,9 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
}
}
- // /////////////////////////////////////////////////////////////
- // defaults
- // /////////////////////////////////////////////////////////////
+ //endregion
+ //region > defaults
@Override
public ObjectAdapter getDefault(final ObjectAdapter ownerAdapter) {
return null;
@@ -244,9 +235,9 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
public void toDefault(final ObjectAdapter ownerAdapter) {
}
- // /////////////////////////////////////////////////////////////
- // choices & autoComplete
- // /////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > choices & autoComplete
@Override
public ObjectAdapter[] getChoices(
@@ -279,10 +270,9 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
return 0; // n/a
}
- // /////////////////////////////////////////////////////////////
- // debug, toString
- // /////////////////////////////////////////////////////////////
+ //endregion
+ //region > debug, toString
@Override
public String debugData() {
final DebugString debugString = new DebugString();
@@ -302,5 +292,7 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
return str.toString();
}
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
index c9df053..f387d1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterContributee.java
@@ -26,25 +26,17 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
public class OneToOneActionParameterContributee extends OneToOneActionParameterImpl implements ObjectActionParameterContributee{
private final ObjectAdapter serviceAdapter;
- private final ObjectActionImpl serviceAction;
private final ObjectActionParameter serviceActionParameter;
- private final int serviceParamNumber;
- private final int contributeeParamNumber;
private final ObjectActionContributee contributeeAction;
public OneToOneActionParameterContributee(
final ObjectAdapter serviceAdapter,
- final ObjectActionImpl serviceAction,
final ObjectActionParameterAbstract serviceActionParameter,
- final int serviceParamNumber,
final int contributeeParamNumber,
final ObjectActionContributee contributeeAction) {
super(contributeeParamNumber, contributeeAction, serviceActionParameter.getPeer());
this.serviceAdapter = serviceAdapter;
- this.serviceAction = serviceAction;
this.serviceActionParameter = serviceActionParameter;
- this.serviceParamNumber = serviceParamNumber;
- this.contributeeParamNumber = contributeeParamNumber;
this.contributeeAction = contributeeAction;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
index 6901257..42997b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
@@ -145,11 +145,7 @@ public class OneToOneAssociationContributee extends OneToOneAssociationImpl impl
return InteractionUtils.isUsableResult(this, ic).createConsent();
}
-
- // //////////////////////////////////////
- // FacetHolder
- // //////////////////////////////////////
-
+ //region > FacetHolder
@Override
public Class<? extends Facet>[] getFacetTypes() {
return facetHolder.getFacetTypes();
@@ -195,6 +191,8 @@ public class OneToOneAssociationContributee extends OneToOneAssociationImpl impl
facetHolder.removeFacet(facetType);
}
+ //endregion
+
private ObjectAdapter getServiceAdapter() {
return getPersistenceSessionService().adapterFor(servicePojo);
}
@@ -204,4 +202,5 @@ public class OneToOneAssociationContributee extends OneToOneAssociationImpl impl
return getServiceAdapter().getSpecification();
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9f251d9c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
index 94d70e1..07874fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
@@ -50,7 +50,6 @@ import org.apache.isis.core.metamodel.interactions.PropertyVisibilityContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MutableCurrentHolder;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
@@ -58,12 +57,17 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
public class OneToOneAssociationImpl extends ObjectAssociationAbstract implements OneToOneAssociation {
- public OneToOneAssociationImpl(final FacetedMethod facetedMethod, final ObjectMemberDependencies objectMemberDependencies) {
+ public OneToOneAssociationImpl(
+ final FacetedMethod facetedMethod,
+ final ObjectMemberDependencies objectMemberDependencies) {
this(facetedMethod, getSpecification(objectMemberDependencies.getSpecificationLoader(), facetedMethod.getType()),
objectMemberDependencies);
}
- protected OneToOneAssociationImpl(final FacetedMethod facetedMethod, final ObjectSpecification objectSpec, final ObjectMemberDependencies objectMemberDependencies) {
+ protected OneToOneAssociationImpl(
+ final FacetedMethod facetedMethod,
+ final ObjectSpecification objectSpec,
+ final ObjectMemberDependencies objectMemberDependencies) {
super(facetedMethod, FeatureType.PROPERTY, objectSpec, objectMemberDependencies);
}