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 2021/02/03 14:34:03 UTC
[isis] branch master updated: ISIS-2518: fixing Javadoc validation
issues as indicated by the IDE (3)
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 9691c1e ISIS-2518: fixing Javadoc validation issues as indicated by the IDE (3)
9691c1e is described below
commit 9691c1e2344a3b260624823720cd69b519453c5f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 3 15:33:49 2021 +0100
ISIS-2518: fixing Javadoc validation issues as indicated by the IDE (3)
---
.../java/org/apache/isis/applib/Identifier.java | 2 +-
.../isis/applib/adapters/DefaultsProvider.java | 3 ---
.../apache/isis/applib/adapters/EncoderDecoder.java | 5 +----
.../org/apache/isis/applib/adapters/Parser.java | 15 ++++-----------
.../org/apache/isis/applib/annotation/Action.java | 7 ++-----
.../isis/applib/annotation/DomainService.java | 4 ++--
.../org/apache/isis/applib/annotation/Nature.java | 21 +++++++--------------
.../org/apache/isis/applib/annotation/Where.java | 16 ++++++++++------
.../org/apache/isis/applib/clock/VirtualClock.java | 8 +++++---
.../applib/layout/component/ActionLayoutData.java | 8 ++------
.../layout/component/CollectionLayoutData.java | 8 ++------
.../layout/component/ServiceActionLayoutData.java | 8 ++------
.../java/org/apache/isis/applib/query/Query.java | 4 ++--
.../RepresentsInteractionMemberExecution.java | 4 +++-
.../exceprecog/ExceptionRecognizerForType.java | 4 ++--
.../services/wrapper/control/ExecutionMode.java | 3 ++-
.../wrapper/events/ActionInvocationEvent.java | 1 +
.../wrapper/events/ActionVisibilityEvent.java | 1 +
.../services/wrapper/events/InteractionEvent.java | 4 ++--
.../services/wrapper/events/VisibilityEvent.java | 1 +
.../services/xactn/TransactionalProcessor.java | 3 ++-
.../isis/applib/types/MemberIdentifierType.java | 8 +++-----
.../apache/isis/applib/types/TargetActionType.java | 7 ++-----
.../apache/isis/applib/types/TargetClassType.java | 7 ++-----
.../isis/commons/concurrent/AwaitableLatch.java | 4 ++--
.../apache/isis/core/metamodel/consent/Allow.java | 2 --
.../core/metamodel/consent/InteractionResult.java | 2 +-
.../apache/isis/core/metamodel/consent/Veto.java | 2 +-
...PropertyOrCollectionIdentifyingFacetFactory.java | 10 +++++-----
.../facets/members/cssclass/CssClassFacet.java | 9 +++++----
.../facets/members/hidden/HiddenFacetAbstract.java | 8 --------
.../object/bookmarkpolicy/BookmarkPolicyFacet.java | 8 +++++++-
.../object/domainservice/DomainServiceFacet.java | 8 --------
.../metamodel/facets/object/icon/IconFacet.java | 8 ++++----
.../facets/object/viewmodel/ViewModelFacet.java | 11 ++++++-----
.../ActionParameterDefaultsFacetViaMethod.java | 1 -
.../validate/ActionParameterValidationFacet.java | 1 -
.../value/bigdecimal/BigDecimalValueFacet.java | 14 +++-----------
.../interactions/HidingInteractionAdvisor.java | 3 +--
.../metamodel/interactions/InteractionContext.java | 5 +++--
.../interactions/ValidatingInteractionAdvisor.java | 5 ++---
.../interactions/managed/MemberInteraction.java | 1 -
.../services/appfeat/ApplicationFeatureId.java | 2 +-
.../classsubstitutor/ClassSubstitutorAbstract.java | 2 +-
.../apache/isis/core/metamodel/spec/Described.java | 4 +++-
.../isis/core/metamodel/spec/ManagedObjects.java | 2 +-
.../core/metamodel/spec/feature/ObjectMember.java | 2 +-
.../core/metamodel/util/snapshot/IsisSchema.java | 4 ++--
.../core/metamodel/util/snapshot/XmlSchema.java | 11 ++++++-----
.../core/metamodel/util/snapshot/XsMetaModel.java | 10 +++++-----
.../isis/core/runtime/memento/ObjectMemento.java | 4 ++--
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 7 +++++--
.../authentication/AuthenticationContext.java | 4 ++--
.../fixtures/AuthenticationRequestLogonFixture.java | 6 +++---
.../api/permission/ApplicationPermission.java | 6 ++++--
.../api/permission/ApplicationPermissionMode.java | 4 ++--
.../api/permission/ApplicationPermissionValue.java | 2 +-
.../extensions/secman/api/user/AccountType.java | 3 ++-
.../model/dom/role/ApplicationRole_addAction.java | 2 +-
.../model/dom/role/ApplicationRole_addClass.java | 2 +-
.../dom/role/ApplicationRole_addCollection.java | 2 +-
.../model/dom/role/ApplicationRole_addPackage.java | 2 +-
.../model/dom/role/ApplicationRole_addProperty.java | 2 +-
.../jdo/seed/SeedUsersAndRolesFixtureScript.java | 2 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 6 +++---
.../jpa/seed/SeedUsersAndRolesFixtureScript.java | 2 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 6 +++---
.../ui/components/collections/TableViewFx.java | 2 +-
.../ui/components/form/field/CustomFieldFx.java | 2 +-
.../isis/legacy/applib/DomainObjectContainer.java | 8 +++++---
.../apache/isis/legacy/applib/filter/Filter.java | 4 +++-
.../threadpool/ThreadPoolExecutionMode.java | 2 +-
.../scalars/isisapplib/IsisColorPanel.java | 3 ++-
.../scalars/isisapplib/IsisMoneyPanel.java | 2 +-
.../scalars/isisapplib/IsisPercentagePanel.java | 4 ++--
.../restclient/lib/ClientRequestConfigurer.java | 14 +++++++-------
.../restclient/lib/RestfulHttpMethodHelper.java | 2 +-
.../jdo/applib/integration/JdoSupportService.java | 1 -
.../isis/extensions/zip/dom/impl/ZipService.java | 3 ++-
.../testing/fixtures/applib/clock/FixtureClock.java | 2 +-
.../common/model/action/form/FormUiModel.java | 7 +++++--
.../viewer/common/model/object/ObjectUiModel.java | 3 +--
.../AbstractObjectMemberReprRenderer.java | 2 +-
.../rendering/service/RepresentationService.java | 2 +-
.../ContentNegotiationServiceOrgApacheIsisV2.java | 5 ++---
.../model/mementos/ActionParameterMemento.java | 1 -
.../viewer/wicket/model/models/ActionModel.java | 3 ++-
.../isis/viewer/wicket/model/models/PageType.java | 2 --
.../wicket/model/models/ServiceActionsModel.java | 4 ++--
.../ui/app/registry/ComponentFactoryRegistrar.java | 2 +-
.../ui/components/about/JarManifestModel.java | 2 +-
.../collection/AssociatedWithActionsHelper.java | 3 ++-
.../ui/components/scalars/ScalarPanelAbstract.java | 3 +--
.../components/scalars/bookmark/BookmarkPanel.java | 1 +
.../scalars/bookmark/BookmarkPanelFactory.java | 2 --
.../ui/components/widgets/navbar/BrandName.java | 4 ++--
.../StandaloneCollectionPage.java | 2 +-
.../viewer/wicket/ui/pages/value/ValuePage.java | 2 +-
.../isis/viewer/wicket/ui/panels/PanelAbstract.java | 2 +-
.../viewer/services/mementos/ObjectMementoWkt.java | 4 ++--
.../viewer/wicketapp/IsisWicketApplication.java | 12 ++++++------
101 files changed, 215 insertions(+), 255 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
index 273e537..64dd590 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
@@ -348,7 +348,7 @@ public class Identifier implements Comparable<Identifier> {
/**
* Factory method.
*
- * @see #toIdentityString(int)
+ * @see #toIdentityString(Depth)
*/
public static Identifier fromIdentityString(final String asString) {
if (asString == null) {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java
index 98f332b..5ff44e9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java
@@ -30,9 +30,6 @@ package org.apache.isis.applib.adapters;
* for itself. The framework will instantiate an instance, invoke the
* appropriate method method, and use the returned object. The instantiated
* instance itself will be discarded.</li>
- * <li>Alternatively, an implementor of this interface can be nominated in the
- * {@link org.apache.isis.applib.annotations.Defaulted} annotation, allowing a
- * class that needs to have a default to indicate where its default comes from.</li>
*
* <p>
* Whatever the class that implements this interface, it must also expose either
diff --git a/api/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java
index 51d61df..d9c3632 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java
@@ -30,9 +30,6 @@ package org.apache.isis.applib.adapters;
* a factory for itself. The framework will instantiate an instance, invoke the
* appropriate method method, and use the returned object. The instantiated
* instance itself will be discarded.</li>
- * <li>Alternatively, an implementor of this interface can be nominated in the
- * {@link org.apache.isis.applib.annotation.Encodable} annotation, allowing a
- * class that needs to be encodeable to indicate how it can be encoded/decoded.</li>
*
* <p>
* Whatever the class that implements this interface, it must also expose either
@@ -66,7 +63,7 @@ public interface EncoderDecoder<T> {
* <p>
* Note that here the implementing class is acting as a factory for itself.
*
- * @see #toEncodedString(T toEncode)
+ * @see #toEncodedString(Object)
*/
T fromEncodedString(String encodedString);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java b/api/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
index ccbc3ea..f46418b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
@@ -41,14 +41,10 @@ package org.apache.isis.applib.adapters;
* than having the framework do this).
*
* <p>
- * Similarly, the ability to return a typical length also overlaps with the
- * {@link TypicalLength} annotation; which is why {@link TypicalLength} cannot
- * be applied to types, only to properties and parameters.
- *
- * <p>
- * For third-party value types, eg {@see http://timeandmoney.sourceforge.net/
- * Time-and-Money} there is no ability to write <tt>title()</tt> methods or
- * annotated with {@link TypicalLength}; so this is the main reason that this
+ * For third-party value types,
+ * eg see <a href="http://timeandmoney.sourceforge.net/">Time-and-Money</a>
+ * there is no ability to write <tt>title()</tt> methods;
+ * so this is the main reason that this
* interface has to deal with titles and lengths.
*
* <p>
@@ -59,9 +55,6 @@ package org.apache.isis.applib.adapters;
* The framework will instantiate an instance, invoke the appropriate method
* method, and use the returned object. The instantiated instance itself will be
* discarded.</li>
- * <li>Alternatively, an implementor of this interface can be nominated in the
- * {@link org.apache.isis.applib.annotation.Parseable} annotation, allowing a
- * class that needs to be parseable to indicate how it can be parsed.</li>
*
* <p>
* Whatever the class that implements this interface, it must also expose either
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
index 93faf34..907a528 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Action.java
@@ -142,13 +142,10 @@ public @interface Action {
*
* <p>
* It is also possible to suppress an action's visibility using {@link ActionLayout#hidden()}.
- * </p>
*
* <p>
- * For {@link DomainService domain service} actions, the action's visibility is dependent upon its
- * {@link DomainService#nature() nature} and for contributed actions on how it is
- * {@link ActionLayout#contributed()}.
- * </p>
+ * For {@link DomainService domain service} actions, the action's visibility is dependent upon its
+ * {@link DomainService#nature() nature}.
*/
Where hidden()
default Where.NOT_SPECIFIED;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
index cc3eb6f..774360a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
@@ -36,9 +36,9 @@ import org.springframework.stereotype.Service;
* Also indicates whether the domain service acts as a repository for an entity, and menu ordering UI hints.
* </p>
*
- * @apiNote Meta annotation {@link Service} allows for the Spring framework to pick up (discover) the
+ * @implNote Meta annotation {@link Service} allows for the Spring framework to pick up (discover) the
* annotated type.
- * For more details see {@link org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring}.
+ * For more details see {@code org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring}.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
index 5ad37b7..eabaa6c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Nature.java
@@ -27,10 +27,6 @@ import org.apache.isis.applib.ViewModel;
/**
* The different sorts of domain objects recognized by Isis.
*
- * <p>
- * Note that {@link #EXTERNAL_ENTITY} and {@link #VIEW_MODEL} are implemented identically internally; the
- * difference is one of intent.
- * </p>
* @since 1.x {@index}
*/
public enum Nature {
@@ -57,17 +53,14 @@ public enum Nature {
* is aggregate of one or more domain entity.
*
* <p>
- * The identity of a view model is determined solely by the state of object's properties (that have
- * not been set to be ignored using {@link org.apache.isis.applib.annotation.Property#notPersisted()}).
- * Using this nature should be considered exactly equivalent to annotating with {@link ViewModel}.
- * </p>
- *
+ * The identity of a view model is determined solely by the state of object's properties.
+ * Using this nature should be considered exactly equivalent to annotating with {@link ViewModel}.
+ *
* <p>
- * Note that collections are ignored; if their state is required to fully identify the view model, define the
- * view model using the JAXB {@link XmlRootElement} annotation instead (where the object's state is serialized
- * to an arbitrarily deep graph of data, with references to persistent entities transparently resolved to
- * <code><oid-dto></code> elements).
- * </p>
+ * Note that collections are ignored; if their state is required to fully identify the view model, define the
+ * view model using the JAXB {@link XmlRootElement} annotation instead (where the object's state is serialized
+ * to an arbitrarily deep graph of data, with references to persistent entities transparently resolved to
+ * <code><oid-dto></code> elements).
*
* @see ViewModel
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
index cd0573c..cbd8085 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Where.java
@@ -27,19 +27,23 @@ import org.apache.isis.applib.util.Enums;
* Represents the location in the user interface where a class member is to be rendered.
*
* <p>
- * Used to control visibility (eg using the {@link Hidden} annotation) and enablement
- * (eg using the {@link Disabled} annotation) in different regions of the user interface.
+ * Used to control visibility (eg using the {@link Property#hidden()} annotation) and
+ * enablement (eg using the {@link Property#editing()} annotation) in different regions
+ * of the user interface.
*
* <p>
* The application programmer may use any of the values of this enum. Some represent
* concrete locations (eg {@link #OBJECT_FORMS}, {@link #PARENTED_TABLES}), whereas some
* represent a combination of locations (eg {@link #ALL_TABLES}, {@link #ANYWHERE}).
*
- * <h4>Framework Implementation Notes</h4>
- * <p>
- * This enum is also used internally within the framework. When rendering an element,
- * the framework developer should only use those values that represent concrete locations.
+ * @see Action
+ * @see Collection
+ * @see Property
+ *
* @since 1.x {@index}
+ *
+ * @implNote This enum is also used internally within the framework. When rendering an element,
+ * the framework developer should only use those values that represent concrete locations.
*/
@XmlType(
namespace = "http://isis.apache.org/applib/layout/component"
diff --git a/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java b/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
index e42238a..adecb08 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/clock/VirtualClock.java
@@ -34,16 +34,18 @@ import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.apache.isis.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
+import org.apache.isis.applib.services.iactn.ExecutionContext;
import org.apache.isis.applib.services.iactn.Interaction;
import lombok.NonNull;
import lombok.val;
/**
- * Works in connection with {@link InteractionFactory}, such that it allows an {@link Interaction}
+ * Works in connection with {@code org.apache.isis.core.interaction.session.InteractionFactory},
+ * such that it allows an {@link Interaction}
* to run with its own simulated (or actual) time.
- * <p>
- * Relates to {@link VirtualContext}
+ *
+ * @see ExecutionContext
*
* @since 2.0 {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
index 92a609c..cf53bfa 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ActionLayoutData.java
@@ -33,12 +33,8 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
/**
- * Describes the layout of a single action, broadly corresponding to {@link org.apache.isis.applib.annotation.ActionLayout}.
- *
- * <p>
- * Note that {@link org.apache.isis.applib.annotation.ActionLayout#contributed()} is omitted because this only applies
- * to domain services.
- * </p>
+ * Describes the layout of a single action, broadly corresponding to
+ * {@link org.apache.isis.applib.annotation.ActionLayout}.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
index 47807bd..ecb1292 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
@@ -32,12 +32,8 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
/**
- * Describes the layout of a single collection, broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
- *
- * <p>
- * Note that {@link org.apache.isis.applib.annotation.CollectionLayout#render()} is omitted because
- * {@link #defaultView} is its replacement.
- * </p>
+ * Describes the layout of a single collection, broadly corresponds to the
+ * {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
index 93e3248..af8928c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/component/ServiceActionLayoutData.java
@@ -30,12 +30,8 @@ import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.layout.links.Link;
/**
- * Describes the layout of a single action, broadly corresponding to {@link org.apache.isis.applib.annotation.ActionLayout}.
- *
- * <p>
- * Note that {@link org.apache.isis.applib.annotation.ActionLayout#contributed()} is omitted because this only applies
- * to domain services.
- * </p>
+ * Describes the layout of a single action, broadly corresponding to
+ * {@link org.apache.isis.applib.annotation.ActionLayout}.
*
* @since 1.x {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/query/Query.java b/api/applib/src/main/java/org/apache/isis/applib/query/Query.java
index 39c2441..ece4b15 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/query/Query.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/query/Query.java
@@ -34,8 +34,8 @@ import lombok.NonNull;
* The implementations of these objects are be provided by the underlying
* persistor/object store; consult its documentation.
* <p>
- * Implementations are expected to implement the {@link #getStart()} and
- * {@link #getCount()} methods, which are used to support range / paging
+ * Implementations are expected to implement the {@link #getRange()}
+ * method, which is used to support range / paging
* the data. Returned result sets are expected to start from index "start",
* and no more than "count" items are expected.
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/RepresentsInteractionMemberExecution.java b/api/applib/src/main/java/org/apache/isis/applib/services/RepresentsInteractionMemberExecution.java
index 9defd94..485ba6c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/RepresentsInteractionMemberExecution.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/RepresentsInteractionMemberExecution.java
@@ -21,11 +21,13 @@ package org.apache.isis.applib.services;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.commons.having.HasUniqueId;
import org.apache.isis.schema.ixn.v2.InteractionDto;
+import org.apache.isis.schema.ixn.v2.MemberExecutionDto;
/**
* Extends {@link HasUniqueId}, where the {@link HasUniqueId#getUniqueId()} is interpreted as an
* interaction (cf {@link InteractionDto}) that has at least one member execution (cf
- * {@link org.apache.isis.schema.ixn.v1.MemberExecutionDto}) and may (by way of {@link WrapperFactory}) contain
+ * {@link MemberExecutionDto})
+ * and may (by way of {@link WrapperFactory}) contain
* several.
*
* <p>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
index 3cbad46..5edbd5e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
@@ -46,7 +46,7 @@ public class ExceptionRecognizerForType extends ExceptionRecognizerAbstract {
}
/**
- * A {@link Predicate} that {@link Predicate#apply(Object) applies} only if the message(s)
+ * A {@link Predicate} that {@link Predicate#test(Object) applies} only if the message(s)
* supplied do <i>NOT</i> appear in the {@link Throwable} or any of its {@link Throwable#getCause() cause}s
* (recursively).
*
@@ -70,7 +70,7 @@ public class ExceptionRecognizerForType extends ExceptionRecognizerAbstract {
/**
- * A {@link Predicate} that {@link Predicate#apply(Object) applies} only if at least one of the message(s)
+ * A {@link Predicate} that {@link Predicate#test(Object) applies} only if at least one of the message(s)
* supplied <i>DO</i> appear in the {@link Throwable} or any of its {@link Throwable#getCause() cause}s
* (recursively).
*
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/ExecutionMode.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/ExecutionMode.java
index 4fd7081..6289ed6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/ExecutionMode.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/ExecutionMode.java
@@ -38,7 +38,8 @@ public enum ExecutionMode {
* Skip actual execution.
*
* <p>
- * This is not supported for {@link WrapperFactory#asyncWrap(Object, AsyncControl)}; instead just invoke {@link WrapperFactory#wrap(Object, ImmutableEnumSet)}.
+ * This is not supported for {@link WrapperFactory#asyncWrap(Object, AsyncControl)};
+ * instead just invoke {@link WrapperFactory#wrap(Object, SyncControl)}.
*/
SKIP_EXECUTION,
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
index 3f0caf8..fff5225 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionInvocationEvent.java
@@ -20,6 +20,7 @@
package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.services.wrapper.WrapperFactory;
/**
* <i>Supported only by {@link WrapperFactory} service, </i> represents a check
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
index 28bb5ed..dc5d267 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/ActionVisibilityEvent.java
@@ -20,6 +20,7 @@
package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.services.wrapper.WrapperFactory;
/**
* <i>Supported only by {@link WrapperFactory} service, </i> represents a check as
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
index 3d0dc1d..7b8af47 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/InteractionEvent.java
@@ -111,7 +111,7 @@ public abstract class InteractionEvent extends EventObjectBase<Object> {
}
/**
- * As per {@link #getMemberParameterName()}, but naturalized.
+ * As per {@link #getMemberParameterNames()}, but naturalized.
*/
public List<String> getMemberParameterNaturalNames() {
return identifier.getMemberParameterNaturalNames();
@@ -122,7 +122,7 @@ public abstract class InteractionEvent extends EventObjectBase<Object> {
* otherwise disallowed.
*
* <p>
- * Intended to be {@link #setExecuteIn(String) set} as a result of consulting
+ * Intended to be {@link #advised(String, Class) set} as a result of consulting
* one of the facets.
*/
public String getReason() {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
index 706da59..b36ada9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/events/VisibilityEvent.java
@@ -20,6 +20,7 @@
package org.apache.isis.applib.services.wrapper.events;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.services.wrapper.WrapperFactory;
/**
* <i>Supported only by {@link WrapperFactory} service, </i> represents a
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionalProcessor.java b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionalProcessor.java
index 174cc2e..0f026f7 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionalProcessor.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/xactn/TransactionalProcessor.java
@@ -70,7 +70,8 @@ public interface TransactionalProcessor {
* Runs given {@code runnable} with a transactional boundary, where the detailed transactional behavior
* is governed by given {@link Propagation} {@code propagation}.
* <p>
- * More fine grained control is given via {@link #runTransactional(TransactionDefinition, Callable)}
+ * More fine grained control is given via
+ * {@link #runTransactional(TransactionDefinition, ThrowingRunnable)}
*/
default Result<Void> runTransactional(Propagation propagation, ThrowingRunnable runnable) {
return callTransactional(propagation, ThrowingRunnable.toCallable(runnable));
diff --git a/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java b/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
index 4b71f78..128a7cc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java
@@ -18,16 +18,14 @@
*/
package org.apache.isis.applib.types;
-import java.sql.Timestamp;
-import java.util.UUID;
-
-import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
import lombok.experimental.UtilityClass;
/**
- * As per {@link Command#getMemberIdentifier()} and {@link org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#audit(UUID, int, String, Bookmark, String, String, String, String, String, Timestamp)}.
+ * As per {@link Command#getLogicalMemberIdentifier()}
+ * and
+ * {@link org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#onChanging(org.apache.isis.applib.services.publishing.spi.EntityPropertyChange)}.
*
* @since 2.0 {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java b/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
index 4ec7905..0680208 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java
@@ -18,16 +18,13 @@
*/
package org.apache.isis.applib.types;
-import java.sql.Timestamp;
-import java.util.UUID;
-
-import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
import lombok.experimental.UtilityClass;
/**
- * A user-friendly name of an action, as per {@link Command#getTargetAction()}, {@link org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#audit(UUID, int, String, Bookmark, String, String, String, String, String, Timestamp)}.
+ * A user-friendly name of an action, as per {@link Command#getTargetAction()},
+ * {@link org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#onChanging(org.apache.isis.applib.services.publishing.spi.EntityPropertyChange)}.
*
* @since 2.0 {@index}
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java b/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
index 9ba83b1..71a7165 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java
@@ -18,16 +18,13 @@
*/
package org.apache.isis.applib.types;
-import java.sql.Timestamp;
-import java.util.UUID;
-
-import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
import lombok.experimental.UtilityClass;
/**
- * A user-friendly name of a class, as per {@link Command#getTargetClass()}, {@link org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#audit(UUID, int, String, Bookmark, String, String, String, String, String, Timestamp)}.
+ * A user-friendly name of a class, as per {@link Command#getTargetClass()},
+ * {@link org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#onChanging(org.apache.isis.applib.services.publishing.spi.EntityPropertyChange)}.
*
* @since 2.0 {@index}
*/
diff --git a/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java b/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
index 56b1455..6d4ce2d 100644
--- a/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
+++ b/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
@@ -41,7 +41,7 @@ public final class AwaitableLatch {
/**
* {@link AwaitableLatch#await()}
- * @throws InterruptedException
+ * @throws RuntimeException when an InterruptedException occurred
*/
public void await() {
try {
@@ -53,7 +53,7 @@ public final class AwaitableLatch {
/**
* {@link AwaitableLatch#await(long, TimeUnit)}
- * @throws InterruptedException
+ * @throws RuntimeException when an InterruptedException occurred
*/
public boolean await(long timeout, TimeUnit unit) {
try {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
index 5dfc204..7c5984a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
@@ -41,8 +41,6 @@ public class Allow extends ConsentAbstract {
*
* @see Veto
* @deprecated
- * @param reasonVeteod
- * @param advisorClass
*/
@Deprecated
public Allow(final String description) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
index 08bf6ce..235c66e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionResult.java
@@ -97,7 +97,7 @@ public class InteractionResult {
}
/**
- * Returns the first of the {@link #getAdvisors()} that has been
+ * Returns the first of the {@link #getAdvisorFacets()} that has been
* {@link #advise(String, InteractionAdvisor) advised} , or <tt>null</tt> if
* none yet.
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
index 801216d..0620b89 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Veto.java
@@ -34,7 +34,7 @@ public class Veto extends ConsentAbstract {
* logic into {@link Facet}s so that it is available for use by other
* viewers.
*
- * @param reasonVeteod
+ * @param reasonVetoed
* - must not be empty or <tt>null</tt>
*/
public Veto(final String reasonVetoed) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java
index 7961d5f..36ba648 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactory.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
* indicating which.
*
* <p>
- * Used by the Java5 Reflector's <tt>ProgrammingModel</tt> to determine which
+ * Used by the Java 8 Reflector's <tt>ProgrammingModel</tt> to determine which
* facet factories to ask whether a {@link Method} represents a property or a
* collection.
*
@@ -46,8 +46,8 @@ public interface PropertyOrCollectionIdentifyingFacetFactory extends FacetFactor
/**
* Whether (this facet is able to determine that) the supplied
* {@link Method} possibly represents the accessor of either a
- * {@link ValueAssociation value property}, {@link OneToOneAssociation
- * reference property} or a {@link OneToManyAssociation collection}.
+ * {@link OneToOneAssociation reference property}
+ * or a {@link OneToManyAssociation collection}.
*
* <p>
* For example, if a method name has a prefix of <tt>get</tt> or
@@ -58,8 +58,8 @@ public interface PropertyOrCollectionIdentifyingFacetFactory extends FacetFactor
/**
* Whether (this facet is able to determine that) the supplied
- * {@link Method} represents <i>either</i> a {@link ValueAssociation value
- * property} or a {@link OneToOneAssociation reference property}.
+ * {@link Method} represents <i>either</i> a
+ * {@link OneToOneAssociation reference property}.
*/
public boolean isPropertyAccessor(Method method);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
index ccb580f..3c0f329 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
@@ -19,20 +19,21 @@
package org.apache.isis.core.metamodel.facets.members.cssclass;
+import javax.annotation.Nullable;
+
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
/**
- * The css class of a class, a property, collection, or an action.
+ * The CSS class of a class, a property, collection, or an action.
*/
public interface CssClassFacet extends Facet {
/**
* return custom CSS (if any) for provided {@link ManagedObject object}.
*
- * @param objectAdapter - to evaluate. May be <tt>null</tt> in exceptional circumstances (specifically: the {@link org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson#asJson(ObjectSpecification)} which generates <tt>xxx.layout.json</tt> for a spec without recourse to any given object).
+ * @param objectAdapter - to evaluate. May be <tt>null</tt> in exceptional circumstances.
*/
- public String cssClass(final ManagedObject objectAdapter);
+ public String cssClass(final @Nullable ManagedObject objectAdapter);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index 10408fb..6814317 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -19,12 +19,9 @@
package org.apache.isis.core.metamodel.facets.members.hidden;
-import java.util.function.Predicate;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.WhereValueFacetAbstract;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
@@ -42,11 +39,6 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
* <li>that there is nevertheless always at least one facet that is registered under <tt>HiddenFacet.class</tt>;
* this is used by the {@link org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson} exporter</li>
* </ul>
- * <p>
- * Note that the {@link FacetUtil#getFacets(java.util.Map, Predicate)}
- * (which among other things is used to return all facets matching a particular facet type) ensures that the list
- * of facets returned contains no duplicates.
- * </p>
*/
public abstract class HiddenFacetAbstract extends WhereValueFacetAbstract implements HiddenFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java
index e2c5525..15496b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/BookmarkPolicyFacet.java
@@ -19,12 +19,18 @@
package org.apache.isis.core.metamodel.facets.object.bookmarkpolicy;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
/**
- * Corresponds to annotating the class or an action with the {@link Bookmarkable} annotation.
+ * Corresponds to annotating the class with {@link DomainObjectLayout#bookmarking()}.
+ * or an action with {@link ActionLayout#bookmarking()}.
+ *
+ * @see ActionLayout
+ * @see DomainObjectLayout
*/
public interface BookmarkPolicyFacet extends SingleValueFacet<BookmarkPolicy> {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
index f5497d3..3e4f623 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
@@ -26,8 +26,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet;
-import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
/**
* Corresponds to annotating the class with the {@link org.apache.isis.applib.annotation.DomainService} annotation.
@@ -37,12 +35,6 @@ public interface DomainServiceFacet extends Facet {
/**
* Corresponds to {@link org.apache.isis.applib.annotation.DomainService#nature()}.
*
- * <p>
- * If set to {@link org.apache.isis.applib.annotation.NatureOfService#DOMAIN},
- * then {@link ContributingFacet} and
- * {@link NotInServiceMenuFacet} is
- * derived for all actions.
- * </p>
*/
public NatureOfService getNatureOfService();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java
index 65f751b..69a42b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java
@@ -29,10 +29,10 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
* file into a certain directory).
*
* <p>
- * The facet is checked each time the object is rendered, allowing the icon to be changed on an instance-by-instance basis. For
- * example, the icon might be adapted with an overlay to represent its state through some well-defined lifecycle (eg
- * pending approval, approved, rejected). Alternatively a {@link BoundedFacet bounded} class might have completely
- * different icons for its instances (eg Visa, Mastercard, Amex).
+ * The facet is checked each time the object is rendered, allowing the icon to be
+ * changed on an instance-by-instance basis. For example, the icon might be adapted
+ * with an overlay to represent its state through some well-defined lifecycle (eg
+ * pending approval, approved, rejected).
*
* <p>
* In the standard Apache Isis Programming Model, typically corresponds to a method named {@code iconName}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
index 950a235..6a0a2fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.viewmodel;
import java.util.function.Function;
+import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -30,14 +31,14 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
*
* <p>
* In the standard Apache Isis Programming Model, corresponds to
- * applying either {@link org.apache.isis.applib.annotation.ViewModel} annotation or
+ * applying either {@link org.apache.isis.applib.annotation.DomainObject} annotation with
+ * {@link Nature} = {@link Nature#VIEW_MODEL} or
* {@link org.apache.isis.applib.ViewModel} interface (for a view model), or by annotating
*
* <p>
- * Note: this facet is called "ViewModelFacet" for historical reasons; a better name would be
- * "RecreatableObjectFacet". The old name has been retained only to avoid unnecessarily breaking
- * some add-ons (eg Isis Addons Excel Module) that use this facet.
- * </p>
+ * Note: this facet is called "ViewModelFacet" for historical reasons; a better name would be
+ * "RecreatableObjectFacet". The old name has been retained only to avoid unnecessarily breaking
+ * some add-ons (eg Isis Addons Excel Module) that use this facet.
*/
public interface ViewModelFacet extends Facet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
index 26aa584..1d9ad82 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethod.java
@@ -49,7 +49,6 @@ implements ImperativeFacet {
* @param method
* @param paramNum - which parameter this facet relates to.
* @param holder
- * @param adapterManager
*/
public ActionParameterDefaultsFacetViaMethod(
final Method method,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java
index dc5548f..9b31547 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validate/ActionParameterValidationFacet.java
@@ -43,7 +43,6 @@ extends Facet, ValidatingInteractionAdvisor {
/**
* Reason why the validation has failed, or <tt>null</tt> if okay.
- * @param can
*/
public String invalidReason(
ManagedObject target,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacet.java
index 145119b..c1e4d63 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueFacet.java
@@ -36,23 +36,15 @@ public interface BigDecimalValueFacet extends Facet {
*/
Integer getPrecision();
- /*
- * Same as {@link #getPrecision()}.
- *
- * @deprecated
- */
- //@Deprecated
- //Integer getLength();
-
/**
* The number of digits to the right of the decimal place (fractional part) for this decimal.
*
* <p>
* For example:
* <ul>
- * <li><tt>12345.789</tt> has scale of 3 (and a {@link #getLength() length} of 8)</li>
- * <li><tt>12345</tt> has a scale of 0 (and a {@link #getLength() length} of 5)</li>
- * <li><tt>12345.0</tt> has a scale of 1 (and a {@link #getLength() length} of 6)</li>
+ * <li><tt>12345.789</tt> has scale of 3 (and a {@link #getPrecision() precision} of 8)</li>
+ * <li><tt>12345</tt> has a scale of 0 (and a {@link #getPrecision() precision} of 5)</li>
+ * <li><tt>12345.0</tt> has a scale of 1 (and a {@link #getPrecision() precision} of 6)</li>
* </ul>
*/
Integer getScale();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
index 10fc8cf..cc7bc1e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/HidingInteractionAdvisor.java
@@ -38,8 +38,7 @@ public interface HidingInteractionAdvisor extends InteractionAdvisorFacet, Hidin
* Implementations should use the provided {@link InteractionContext} to
* determine whether they declare the object/member is hidden. They must
* however guard against a <tt>null</tt>
- * {@link InteractionContext#getTarget() target} and
- * {@link InteractionContext#getSession() session} - neither are guaranteed
+ * {@link InteractionContext#getTarget() target} is not guaranteed
* to be populated.
*/
String hides(VisibilityContext ic);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
index 796b462..8fff57c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
@@ -53,8 +53,9 @@ import lombok.Getter;
* public API.
*
* <p>
- * The class is generic so that the {@link #createInteractionEvent() factory
- * method} can return the correct subclass without having to downcast.
+ * The class is generic so that the
+ * {@link InteractionEventSupplier#createInteractionEvent() factory method}
+ * can return the correct subclass without having to downcast.
*/
public abstract class InteractionContext {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
index 86442e1..23ddd4b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ValidatingInteractionAdvisor.java
@@ -42,9 +42,8 @@ public interface ValidatingInteractionAdvisor extends InteractionAdvisorFacet, V
* <p>
* Implementations should use the provided {@link ValidityContext} to
* determine whether they declare the interaction invalid. They must however
- * guard against a <tt>null</tt> {@link ValidityContext#getTarget() target}
- * and {@link ValidityContext#getSession() session} - neither are guaranteed
- * to be populated.
+ * guard against a <tt>null</tt> {@link ValidityContext#getTarget() target}
+ * is not guaranteed to be populated.
*/
String invalidates(ValidityContext ic);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
index 4d4318d..2bace39 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/MemberInteraction.java
@@ -65,7 +65,6 @@ public abstract class MemberInteraction<T extends ManagedMember, H extends Membe
/**
* Only check usability if intent is {@code MUTATE}.
- * @param where
* @param intent
* @return self
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
index 45e12fa..0d0ab86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
@@ -48,7 +48,7 @@ import lombok.NonNull;
* Value type representing a package, class or member.
* <p>
* This value is {@link Comparable}, the implementation of which considers
- * {@link #getType() (feature) type}, {@link #getPackageName() package name},
+ * {@link #getType() (feature) type}, {@link #getNamespace() logical package name},
* {@link #getTypeSimpleName() class name} and {@link #getMemberName() member name}.
*/
@Value
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
index 1b98ded..72cd8e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorAbstract.java
@@ -96,7 +96,7 @@ public abstract class ClassSubstitutorAbstract implements ClassSubstitutor {
/**
- * For any classes registered as ignored, {@link #getClass(Class)} will
+ * For any classes registered as ignored, {@link #getReplacement(Class)} will
* return <tt>null</tt>.
*/
protected void ignoreClass(final String className) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java
index b34c45c..3ed6524 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Described.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.spec;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+
/**
* Anything in the metamodel that has a description.
*/
@@ -28,7 +30,7 @@ public interface Described {
* Returns a description of how the member is used - this complements the
* help text.
*
- * @see #getHelp()
+ * @see ObjectMember#getHelp()
*/
String getDescription();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index 876dd93..04e3097 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -704,7 +704,7 @@ public final class ManagedObjects {
}
/**
- * same as {@link #invokeAutofit(Method, ManagedObject, List, List)} w/o additionalArgValues
+ * same as {@link #invokeAutofit(Method, ManagedObject, Can, List)} w/o additionalArgValues
*/
public static Object invokeAutofit(
final Method method,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
index ff08d86..199ad9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
@@ -143,7 +143,7 @@ public interface ObjectMember extends ObjectFeature {
*
* <p>
* For the former case, is thrown by
- * {@link ObjectAction#executeWithRuleChecking(ManagedObject, ManagedObject[], org.apache.isis.commons.authentication.Authentication, org.apache.isis.applib.annotation.Where)}
+ * {@link ObjectAction#executeWithRuleChecking(org.apache.isis.core.metamodel.interactions.InteractionHead, org.apache.isis.commons.collections.Can, InteractionInitiatedBy, Where)}
* when the action being executed is not visible or not usable for the specified session. One reason this
* might occur if there was an attempt to construct a URL (eg a bookmarked action) and invoke in an unauthenticated session.
* </p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/IsisSchema.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/IsisSchema.java
index c3896a8..599c5a6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/IsisSchema.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/IsisSchema.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
final class IsisSchema {
/**
- * The generated XML schema references the NOF metamodel schema. This is the
+ * The generated XML schema references the <i>Apache Isis</i> metamodel schema. This is the
* default location for this schema.
*/
public static final String DEFAULT_LOCATION = "isis.xsd";
@@ -60,7 +60,7 @@ final class IsisSchema {
*/
public static final String FEATURE_VALUE = "value";
/**
- * Namespace prefix for {@link NS_URI}.
+ * Namespace prefix for {@link #NS_URI}.
*
* The NamespaceManager will not allow any namespace to use this prefix.
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSchema.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSchema.java
index 24a6498..acf5b54 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSchema.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSchema.java
@@ -88,23 +88,24 @@ public final class XmlSchema {
throw new IllegalArgumentException("Namespace prefix reserved for w3.org XML schema-instance namespace.");
}
if (IsisSchema.NS_URI.equals(base)) {
- throw new IllegalArgumentException("Namespace URI reserved for NOF metamodel namespace.");
+ throw new IllegalArgumentException("Namespace URI reserved for Apache Isis metamodel namespace.");
}
if (IsisSchema.NS_PREFIX.equals(prefix)) {
- throw new IllegalArgumentException("Namespace prefix reserved for NOF metamodel namespace.");
+ throw new IllegalArgumentException("Namespace prefix reserved for Apache Isis metamodel namespace.");
}
this.uriBase = base;
this.prefix = prefix;
}
/**
- * The base of the Uri in use. All namespaces are concatenated with this.
+ * The base of the URI in use. All namespaces are concatenated with this.
*
* The namespace string will be the concatenation of the plus the package
* name of the class of the object being referenced.
*
- * If not specified in the constructor, then {@link #DEFAULT_URI_PREFIX} is
- * used.
+ * If not specified in the constructor, then
+ * {@link IsisSchema#DEFAULT_URI_BASE}
+ * is used.
*/
public String getUriBase() {
return uriBase;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XsMetaModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XsMetaModel.java
index 2fce668..b768241 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XsMetaModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XsMetaModel.java
@@ -39,7 +39,7 @@ final class XsMetaModel {
*/
public static final String W3_ORG_XMLNS_URI = "http://www.w3.org/2000/xmlns/";
/**
- * Namespace prefix for {@link W3_ORG_XMLNS_URI}.
+ * Namespace prefix for {@link #W3_ORG_XMLNS_URI}.
*
* The NamespaceManager will not allow any namespace to use this prefix.
*/
@@ -49,7 +49,7 @@ final class XsMetaModel {
*/
public static final String W3_ORG_XS_URI = "http://www.w3.org/2001/XMLSchema";
/**
- * Namespace prefix for {@link W3_ORG_XS_URI}.
+ * Namespace prefix for {@link #W3_ORG_XS_URI}.
*
* The NamespaceManager will not allow any namespace to use this prefix.
*/
@@ -59,7 +59,7 @@ final class XsMetaModel {
*/
public static final String W3_ORG_XSI_URI = "http://www.w3.org/2001/XMLSchema-instance";
/**
- * Namespace prefix for {@link W3_ORG_XSI_URI}.
+ * Namespace prefix for {@link #W3_ORG_XSI_URI}.
*
* The NamespaceManager will not allow any namespace to use this prefix.
*/
@@ -79,8 +79,8 @@ final class XsMetaModel {
* In addition:
* <ul>
* <li>the elementFormDefault is set
- * <li>the NOF namespace is set
- * <li>the <code>xs:import</code> element referencing the NOF namespace is
+ * <li>the <i>Apache Isis</i> namespace is set
+ * <li>the <code>xs:import</code> element referencing the <i>Apache Isis</i> namespace is
* added as a child
* </ul>
*/
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectMemento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectMemento.java
index 40fdc03..a3b62db 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectMemento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectMemento.java
@@ -39,7 +39,7 @@ public interface ObjectMemento extends Serializable {
/**
* Returns a bookmark only if
- * {@link org.apache.isis.core.runtimeservices.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
+ * {@link org.apache.isis.viewer.wicket.viewer.services.mementos.ObjectMementoWkt.RecreateStrategy#LOOKUP} and
* {@link #getCardinality() sort} is {@link Cardinality#SCALAR scalar}.
* Returns {@code null} otherwise.
*/
@@ -47,7 +47,7 @@ public interface ObjectMemento extends Serializable {
/**
* Returns a bookmark only if
- * {@link org.apache.isis.core.runtimeservices.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
+ * {@link org.apache.isis.viewer.wicket.viewer.services.mementos.ObjectMementoWkt.RecreateStrategy#LOOKUP} and
* {@link #getCardinality() sort} is {@link Cardinality#SCALAR scalar}.
* Returns {@code null} otherwise.
*/
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
index aafa8ef..02e2d3d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -93,8 +93,11 @@ public class XmlSnapshotServiceDefault implements XmlSnapshotService {
/**
* Creates a builder that allows a custom snapshot - traversing additional associated
- * properties or collections (using {@link Snapshot.Builder#includePath(String)} and
- * {@link Snapshot.Builder#includePathAndAnnotation(String, String)}) - to be created.
+ * properties or collections
+ * (using {@link org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService.Snapshot.Builder#includePath(String)}
+ * and
+ * {@link org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService.Snapshot.Builder#includePathAndAnnotation(String, String)})
+ * - to be created.
*/
@Override
public Snapshot.Builder builderFor(final Object domainObject) {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationContext.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationContext.java
index 70be66d..3fbd90f 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationContext.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationContext.java
@@ -32,10 +32,10 @@ public interface AuthenticationContext {
/**
* Optionally provides the current thread's {@link Authentication}, based
- * on whether there is an open {@link InteractionSession}.
+ * on whether there is an open {@link org.apache.isis.core.interaction.session.InteractionSession}.
* <p>
* That is the {@link Authentication} that sits at the top of
- * the current thread's {@link InteractionSession}'s
+ * the current thread's {@link org.apache.isis.core.interaction.session.InteractionSession}'s
* authentication layer stack.
*/
Optional<Authentication> currentAuthentication();
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
index 1bc4ee9..3d50f27 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.security.authentication.AuthenticationRequestAbstrac
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
/**
- * For testing purposes, request corresponding to a {@link LogonFixture}.
+ * For testing purposes.
*
* <p>
* Understood directly by {@link AuthenticationManager}.
@@ -37,8 +37,8 @@ public class AuthenticationRequestLogonFixture extends AuthenticationRequestAbst
public static AuthenticationRequestLogonFixture of(final String name, final String ... roles) {
return new AuthenticationRequestLogonFixture(name,
roles == null
- ? Collections.emptyList()
- : _Lists.of(roles));
+ ? Collections.emptyList()
+ : _Lists.of(roles));
}
public AuthenticationRequestLogonFixture(final String name, final Collection<String> roles) {
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
index a207be5..0a7b6d0 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
@@ -27,6 +27,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeature;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureType;
import org.apache.isis.extensions.secman.api.IsisModuleExtSecmanApi;
@@ -36,11 +37,12 @@ import lombok.val;
/**
* Specifies how a particular {@link #getRole() application role} may interact with a specific
- * {@link #getFeature() application feature}.
+ * {@link ApplicationFeature application feature}.
*
* <p>
* Each permission has a {@link #getRule() rule} and a {@link #getMode() mode}. The
- * {@link ApplicationPermissionRule rule} determines whether the permission {@link ApplicationPermissionRule#ALLOW grants}
+ * {@link ApplicationPermissionRule rule} determines whether the permission
+ * {@link ApplicationPermissionRule#ALLOW grants}
* access to the feature or {@link ApplicationPermissionRule#VETO veto}es access
* to it. The {@link ApplicationPermissionMode mode} indicates whether
* the role can {@link ApplicationPermissionMode#VIEWING view} the feature
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionMode.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionMode.java
index 1076fcc..bb699e5 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionMode.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionMode.java
@@ -33,7 +33,7 @@ public enum ApplicationPermissionMode {
*
* <p>
* The {@link ApplicationPermissionRule rule} of the
- * {@link org.apache.isis.extensions.security.manager.jdo.dom.permission.ApplicationPermission} indicates whether access is being
+ * {@link ApplicationPermission} indicates whether access is being
* granted or denied.
* </p>
*/
@@ -48,7 +48,7 @@ public enum ApplicationPermissionMode {
*
* <p>
* The {@link ApplicationPermissionRule rule} of the
- * {@link org.apache.isis.extensions.security.manager.jdo.dom.permission.ApplicationPermission} indicates whether access is being
+ * {@link ApplicationPermission} indicates whether access is being
* granted or denied.
* </p>
*
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValue.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValue.java
index 7291ce6..fbd3766 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValue.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValue.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
/**
* A serializable value object representing an (anonymized)
- * {@link org.apache.isis.extensions.security.manager.jdo.dom.permission.ApplicationPermission}.
+ * {@link ApplicationPermission}.
*
* <p>
* Intended for value type arithmetic and also for caching. No user/role information is held because that information
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java
index 1fbe34f..a15a0ca 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java
@@ -22,7 +22,8 @@ import org.apache.isis.core.metamodel.commons.StringExtensions;
/**
* Whether the user's account is local enabled (user/password) or
- * delegated (eg LDAP), as per {@link IsisModuleSecurityRealm#setDelegateAuthenticationRealm(org.apache.shiro.realm.AuthenticatingRealm)}.
+ * delegated (eg LDAP), as per
+ * {@code org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanShiroRealm#setDelegateAuthenticationRealm(org.apache.shiro.realm.AuthenticatingRealm)}.
*
* @since 2.0 {@index}
*/
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addAction.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addAction.java
index 0df9363..ef977c7 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addAction.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addAction.java
@@ -47,7 +47,7 @@ public class ApplicationRole_addAction {
private final ApplicationRole holder;
/**
- * Adds a {@link org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission permission} for this role to a
+ * Adds a {@link ApplicationPermission permission} for this role to a
* {@link ApplicationMemberType#ACTION action}
* {@link ApplicationFeatureType#MEMBER member}
* {@link ApplicationFeature feature}.
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addClass.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addClass.java
index 3b2297c..db47ff7 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addClass.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addClass.java
@@ -44,7 +44,7 @@ public class ApplicationRole_addClass {
private final ApplicationRole holder;
/**
- * Adds a {@link org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission permission} for this role to a
+ * Adds a {@link ApplicationPermission permission} for this role to a
* {@link ApplicationFeatureType#MEMBER member}
* {@link ApplicationFeature feature}.
*/
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addCollection.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addCollection.java
index 15b51ae..c64442b 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addCollection.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addCollection.java
@@ -50,7 +50,7 @@ public class ApplicationRole_addCollection {
/**
- * Adds a {@link org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission permission} for this role to a
+ * Adds a {@link ApplicationPermission permission} for this role to a
* {@link ApplicationMemberType#COLLECTION collection}
* {@link ApplicationFeatureType#MEMBER member}
* {@link ApplicationFeature feature}.
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java
index b915285..29c360d 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java
@@ -46,7 +46,7 @@ public class ApplicationRole_addPackage {
private final ApplicationRole holder;
/**
- * Adds a {@link org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission permission}
+ * Adds a {@link ApplicationPermission permission}
* for this role to a
* {@link ApplicationFeatureType#PACKAGE package}
* {@link ApplicationFeature feature}.
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addProperty.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addProperty.java
index d9d56c1..131cbbb 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addProperty.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addProperty.java
@@ -51,7 +51,7 @@ public class ApplicationRole_addProperty {
// -- addProperty (action)
/**
- * Adds a {@link org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission permission} for this role to a
+ * Adds a {@link ApplicationPermission permission} for this role to a
* {@link ApplicationMemberType#PROPERTY property}
* {@link ApplicationFeatureType#MEMBER member}
* {@link ApplicationFeature feature}.
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
index 25cb3f2..182af02 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
@@ -33,7 +33,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
* This fixture script will be run automatically on start-up by virtue of the fact that the
* {@link org.apache.isis.extensions.secman.jdo.seed.SeedSecurityModuleService} is a
* {@link org.apache.isis.applib.annotation.DomainService} and calls the setup during its
- * {@link org.apache.isis.extensions.secman.jdo.seed.SeedSecurityModuleService#init() init}
+ * {@link org.apache.isis.extensions.secman.jdo.seed.SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init}
* ({@link javax.annotation.PostConstruct}) method.
*
* @since 2.0 {@index}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
index f95f536..2352337 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
@@ -67,7 +67,7 @@ public abstract class AbstractRoleAndPermissionsFixtureScript extends FixtureScr
// -- newPackagePermissions, newClassPermissions, newMemberPermissions
/**
- * For subclasses to call in {@link #execute(org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext)}.
+ * For subclasses to call in {@link #execute(FixtureScript.ExecutionContext)}.
*/
protected void newPackagePermissions(
final ApplicationPermissionRule rule,
@@ -78,7 +78,7 @@ public abstract class AbstractRoleAndPermissionsFixtureScript extends FixtureScr
}
/**
- * For subclasses to call in {@link #execute(org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext)}.
+ * For subclasses to call in {@link #execute(FixtureScript.ExecutionContext)}.
*/
protected void newClassPermissions(
final ApplicationPermissionRule rule,
@@ -90,7 +90,7 @@ public abstract class AbstractRoleAndPermissionsFixtureScript extends FixtureScr
/**
- * For subclasses to call in {@link #execute(org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext)}.
+ * For subclasses to call in {@link #execute(FixtureScript.ExecutionContext)}.
*/
protected void newMemberPermissions(
final ApplicationPermissionRule rule,
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
index 9e5583d..076d702 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
@@ -33,7 +33,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
* This fixture script will be run automatically on start-up by virtue of the fact that the
* {@link org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService} is a
* {@link org.apache.isis.applib.annotation.DomainService} and calls the setup during its
- * {@link org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService#init() init}
+ * {@link org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init}
* ({@link javax.annotation.PostConstruct}) method.
*
* @since 2.0 {@index}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
index 58a36c8..fb75029 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
@@ -62,7 +62,7 @@ public abstract class AbstractRoleAndPermissionsFixtureScript extends FixtureScr
// -- newPackagePermissions, newClassPermissions, newMemberPermissions
/**
- * For subclasses to call in {@link #execute(org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext)}.
+ * For subclasses to call in {@link #execute(FixtureScript.ExecutionContext)}.
*/
protected void newPackagePermissions(
final ApplicationPermissionRule rule,
@@ -73,7 +73,7 @@ public abstract class AbstractRoleAndPermissionsFixtureScript extends FixtureScr
}
/**
- * For subclasses to call in {@link #execute(org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext)}.
+ * For subclasses to call in {@link #execute(FixtureScript.ExecutionContext)}.
*/
protected void newClassPermissions(
final ApplicationPermissionRule rule,
@@ -85,7 +85,7 @@ public abstract class AbstractRoleAndPermissionsFixtureScript extends FixtureScr
/**
- * For subclasses to call in {@link #execute(org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext)}.
+ * For subclasses to call in {@link #execute(FixtureScript.ExecutionContext)}.
*/
protected void newMemberPermissions(
final ApplicationPermissionRule rule,
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/collections/TableViewFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
index 41134be..9152f16 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/collections/TableViewFx.java
@@ -83,9 +83,9 @@ public class TableViewFx extends VBox {
/**
* Constructs a (page-able) {@link Grid} from given {@code managedCollection}
+ * @param uiContext
* @param managedCollection
* @param where
- * @param collectionData
*/
public static TableViewFx forManagedCollection(
final @NonNull UiContextFx uiContext,
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/form/field/CustomFieldFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/form/field/CustomFieldFx.java
index 13b42e6..5c0aee0 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/form/field/CustomFieldFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/form/field/CustomFieldFx.java
@@ -79,7 +79,7 @@ public abstract class CustomFieldFx<T> extends Pane {
* It can also be use to show the value to the user in some way,
* like placing it in an element contained on the field.
*
- * @param newPresentationValue The new presentation value.
+ * @param value - the new presentation value.
*/
protected abstract void setPresentationValue(T value);
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
index df89aa4..7084cea 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
@@ -33,6 +33,8 @@ import org.springframework.objenesis.instantiator.util.ClassUtils;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.ViewModel;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.query.Query;
@@ -110,7 +112,7 @@ public class DomainObjectContainer {
* that original functionality is performed automatically by the framework.
* </p>
*
- * @deprecated - equivalent to {@link IsisJdoSupport#refresh(Object)}.
+ * @deprecated - equivalent to {@link JdoSupportService#refresh(Object)}.
*/
@Programmatic
@Deprecated
@@ -127,7 +129,7 @@ public class DomainObjectContainer {
* that original functionality is performed automatically by the framework.
* </p>
*
- * @deprecated - equivalent to {@link IsisJdoSupport#refresh(Object)}.
+ * @deprecated - equivalent to {@link JdoSupportService#refresh(Object)}.
*/
@Programmatic
@Deprecated
@@ -201,7 +203,7 @@ public class DomainObjectContainer {
*
* <p>
* Rather than use this constructor it is generally preferable to simply instantiate a
- * class annotated with {@link org.apache.isis.applib.annotation.ViewModel annotation}.
+ * class annotated with {@link DomainObject} using nature {@link Nature#VIEW_MODEL}.
* If services need injecting into it, use {@link #injectServicesInto(Object)}.
* </p>
*/
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java
index 247e892..fb55d48 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java
@@ -19,6 +19,8 @@
package org.apache.isis.legacy.applib.filter;
+import java.util.function.Predicate;
+
/**
* For use by repository implementations to allow a set of objects returned by a
* back-end objectstore to be filtered before being returned to the caller.
@@ -43,6 +45,6 @@ public interface Filter<T> {
* @return <tt>true</tt> if this pojo is acceptable, <tt>false</tt>
* otherwise.
*/
- public boolean accept(T t);
+ public boolean accept(T pojo);
}
diff --git a/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java
index 7af7e53..00c6aa1 100644
--- a/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java
@@ -47,7 +47,7 @@ enum ThreadPoolExecutionMode {
;
/**
- * {@link ThreadPoolSupport.HIGHEST_CONCURRENCY_EXECUTION_MODE_ALLOWED} acts as an upper bound for the
+ * {@link ThreadPoolSupport#HIGHEST_CONCURRENCY_EXECUTION_MODE_ALLOWED} acts as an upper bound for the
* concurrency level supported.
* @param proposedExecutionMode
* @return proposedExecutionMode or the highest possible concurrent execution mode allowed, if
diff --git a/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
index aa4b01c..646d94b 100644
--- a/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
+++ b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
@@ -19,11 +19,12 @@
package org.apache.isis.legacy.runtime.viewer.wicket.ui.components.scalars.isisapplib;
+import org.apache.isis.legacy.applib.value.Color;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
/**
- * Panel for rendering scalars of type {@link org.apache.isis.applib.value.Color Isis' applib.Color}.
+ * Panel for rendering scalars of type {@link Color} Isis' applib.Color.
*/
public class IsisColorPanel extends ScalarPanelTextFieldParseableAbstract {
diff --git a/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
index bd33c35..2b0dfa6 100644
--- a/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
+++ b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
@@ -24,7 +24,7 @@ import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
/**
- * Panel for rendering scalars of type {@link Money Isis' applib.Money}.
+ * Panel for rendering scalars of type {@link Money} Isis' applib.Money.
*/
public class IsisMoneyPanel extends ScalarPanelTextFieldParseableAbstract {
diff --git a/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
index dfdb4a2..7f45b20 100644
--- a/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
+++ b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
@@ -24,8 +24,8 @@ import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
/**
- * Panel for rendering scalars of type {@link Percentage Isis'
- * applib.Percentage}.
+ * Panel for rendering scalars of type {@link Percentage} Isis'
+ * applib.Percentage.
*/
public class IsisPercentagePanel extends ScalarPanelTextFieldParseableAbstract {
diff --git a/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
index 360d38d..79d0e28 100644
--- a/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
+++ b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
@@ -38,9 +38,9 @@ import lombok.val;
* <p>
* Needed because, unfortunately, {@link ClientRequest} does not seem to allow
* the query string to be set directly (only
- * {@link ClientRequest#getQueryParameters() query parameters}). Instead, it is
- * necessary to {@link ResteasyUriBuilder#replaceQuery(String) use} its underlying
- * {@link ResteasyUriBuilder}.
+ * {@literal ClientRequest#getQueryParameters() query parameters}). Instead, it is
+ * necessary to {@literal ResteasyUriBuilder#replaceQuery(String) use} its underlying
+ * {@literal ResteasyUriBuilder}.
*/
public class ClientRequestConfigurer {
@@ -93,7 +93,7 @@ public class ClientRequestConfigurer {
* <ul>
* <li> RestfulClient#createRequest(RestfulHttpMethod, String)
* <li> {@link RestfulRequest#withArg(RequestParameter, Object)} for each arg
- * <li> {@link RestfulRequest#execute()} - which calls this method.
+ * <li> {@literal RestfulRequest#execute()} - which calls this method.
* </ul>
*/
public ClientRequestConfigurer configureArgs(final Map<RequestParameter<?>, Object> args) {
@@ -130,7 +130,7 @@ public class ClientRequestConfigurer {
/**
* Called back from
- * {@link RestfulHttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+ * {@literal RestfulHttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
*/
public ClientRequestConfigurer body(final JsonRepresentation requestArgs) {
clientRequest.jsonPayload(requestArgs.toString());
@@ -139,7 +139,7 @@ public class ClientRequestConfigurer {
/**
* Called back from
- * {@link RestfulHttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+ * {@literal RestfulHttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
*/
public ClientRequestConfigurer queryString(final JsonRepresentation requestArgs) {
if (requestArgs.size() == 0) {
@@ -152,7 +152,7 @@ public class ClientRequestConfigurer {
/**
* Called back from
- * {@link RestfulHttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+ * {@literal RestfulHttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
*/
public ClientRequestConfigurer queryArgs(final JsonRepresentation requestArgs) {
diff --git a/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
index 7220916..4073107 100644
--- a/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
+++ b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
@@ -61,7 +61,7 @@ enum RestfulHttpMethodHelper {
}
/**
- * It's a bit nasty that we need to ask for the {@link org.jboss.resteasy.specimpl.ResteasyUriBuilder} as
+ * It's a bit nasty that we need to ask for the {@code org.jboss.resteasy.specimpl.ResteasyUriBuilder} as
* well as the {@link ClientRequest}, but that's because the
* {@link ClientRequest} does not allow us to setup raw query strings (only
* query name/arg pairs)
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/integration/JdoSupportService.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/integration/JdoSupportService.java
index b0866bb..5e4d02c 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/integration/JdoSupportService.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/integration/JdoSupportService.java
@@ -163,7 +163,6 @@ public interface JdoSupportService {
/**
* Fetch Optimization
- * @see {@link IsisJdoSupport_v3_2#disableMultivaluedFetch(JDOQLTypedQuery)}
* @param query
*/
default void disableMultivaluedFetch(Query<?> query) {
diff --git a/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java b/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
index c5b0879..b0534bd 100644
--- a/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
+++ b/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
@@ -71,7 +71,8 @@ public class ZipService {
}
/**
- * As per {@link #zip(List)}, but using each file's name as the zip entry (rather than providing it).
+ * As per {@link #zipNamedFiles(List)},
+ * but using each file's name as the zip entry (rather than providing it).
*/
public byte[] zipFiles(final List<File> fileList) {
return zipNamedFiles(fileList.stream()
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/clock/FixtureClock.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/clock/FixtureClock.java
index b5a783c..2c97ca5 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/clock/FixtureClock.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/clock/FixtureClock.java
@@ -91,7 +91,7 @@ public class FixtureClock extends Clock {
// //////////////////////////////////////////////////
/**
- * Access via {@link Clock#getTime()}.
+ * Access via {@link Clock#getInstance()}.
*
* <p>
* Will just return the system time until {@link #setDate(int, int, int)} or
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/form/FormUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/form/FormUiModel.java
index 3d69fb8..e30891f 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/form/FormUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/form/FormUiModel.java
@@ -25,6 +25,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.interactions.managed.ActionInteractionHead;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -37,10 +38,12 @@ public interface FormUiModel extends HasTitle {
ObjectAction getMetaModel();
- /** action's owner
+ /**
+ * Action's owner.
+ *
* @apiNote for mixins this is not the target to use on mixin actions
* instead the logic of resolving the target for action invocation is
- * encapsulated within the {@link PendingParameterModelHead}
+ * encapsulated within the {@link ActionInteractionHead}
*/
ManagedObject getOwner();
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
index 3fdf28e..0a9753a 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
@@ -90,8 +90,7 @@ public interface ObjectUiModel {
public interface HasRenderingHints {
/**
- * Similar to {@link #mustBeEditable()}, though not called from the same locations.
- *
+ * @apiNote Similar to {@code #mustBeEditable()}, though not called from the same locations.
* My suspicion is that it amounts to more or less the same set of conditions.
*/
boolean isInlinePrompt();
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
index ec49abc..a689086 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
@@ -118,7 +118,7 @@ extends ReprRendererAbstract<R, ManagedMember> {
}
/**
- * Must be called after {@link #with(ObjectAndMember)} (which provides the
+ * Must be called after {@link #with(ManagedMember)} (which provides the
* {@link #objectAdapter}).
*/
public R usingLinkTo(final ObjectAdapterLinkTo linkTo) {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
index 385fe32..83902e1 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
@@ -40,7 +40,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndAc
public interface RepresentationService {
/**
- * As returned by {@link resourceContext6#getIntent()}, applies only to the representation of
+ * As returned by {@link IResourceContext#getIntent()}, applies only to the representation of
* domain objects.
*/
enum Intent {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
index 371f7e8..2dced99 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
@@ -51,7 +51,6 @@ import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import org.apache.isis.viewer.restfulobjects.rendering.Responses;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndActionInvocation;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectPropertyReprRenderer;
-import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
import lombok.val;
@@ -183,9 +182,9 @@ public class ContentNegotiationServiceOrgApacheIsisV2 extends ContentNegotiation
* (ie invocations returning void or scalar value are not supported).
*
* Action invocations returning a domain object will be rendered as a map with the RO v1.0 representation as a
- * '$$ro' property within (same as {@link #buildResponse(RepresentationService.Context2, ManagedObject)}), while
+ * '$$ro' property within (same as {@link #buildResponse(IResourceContext, ManagedObject)}), while
* action invocations returning a list will be rendered as a list with the RO v1.0 representation as a map object
- * with a single '$$ro' property (similar to {@link #buildResponse(RepresentationService.Context2, ObjectAndCollection)})
+ * with a single '$$ro' property (similar to {@link #buildResponse(IResourceContext, ManagedCollection)})
*/
@Override
public Response.ResponseBuilder buildResponse(
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
index e4d8383..9f13931 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
@@ -81,7 +81,6 @@ public class ActionParameterMemento implements Serializable {
/**
* Convenience.
- * @param specificationLoader
*/
public ObjectSpecification getSpecification(final Supplier<SpecificationLoader> specLoader) {
return getActionParameter(specLoader).getSpecification();
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 7f5c1ed..aacab39 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -50,6 +50,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
+import org.apache.isis.core.metamodel.interactions.managed.ActionInteractionHead;
import org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
@@ -226,7 +227,7 @@ implements FormUiModel, FormExecutorContext, BookmarkableModel {
/** Resets arguments to their fixed point default values
- * @see PendingParameterModelHead#defaults()
+ * @see ActionInteractionHead#defaults()
*/
public void clearArguments() {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
index 103d42e..d7af3dd 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageType.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.wicket.model.models;
-
-
/**
* Enumerates the different types of pages that can be rendered.
*
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
index 1f5deb5..d2c9ae7 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
@@ -32,8 +32,8 @@ public class ServiceActionsModel extends ModelAbstract<MenuUiModel> {
private final MenuUiModel menuUiModel;
/**
- * @param menuUiModel
- * @param menuBarSelect - may be null in special case of rendering the tertiary menu on the error page.
+ * @param commonContext
+ * @param menuUiModel - may be null in special case of rendering the tertiary menu on the error page.
*/
public ServiceActionsModel(
final IsisAppCommonContext commonContext,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
index d469466..57bc3e6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/registry/ComponentFactoryRegistrar.java
@@ -31,7 +31,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
* Defines an API for registering {@link ComponentFactory}s.
*
* <p>
- * As used by {@link ComponentFactoryListDefault}.
+ * As used by {@link org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault}.
*/
public interface ComponentFactoryRegistrar {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
index 5bdc914..6cce7d9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
@@ -52,7 +52,7 @@ public class JarManifestModel extends ModelAbstract<JarManifestModel> {
/**
* @param commonContext
- * @param metaInfManifestIs provide using <tt>getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")</tt>
+ * @param metaInfManifestProvider provide using <tt>getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")</tt>
*/
public JarManifestModel(
IsisAppCommonContext commonContext,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
index d582f1c..40db444 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
@@ -33,11 +33,12 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
+import org.apache.isis.viewer.wicket.ui.components.collection.bulk.BulkActionsProvider;
import lombok.val;
/**
- * See also {@link BulkActionsHelper}.
+ * See also {@link BulkActionsProvider}.
*/
public class AssociatedWithActionsHelper implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 746c20e..f1e6e25 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -140,8 +140,7 @@ implements ScalarModelSubscriber {
/**
*
- * @param actionModel - the action being invoked
- *
+ * @param argsAndConsents - the action being invoked
* @param target - in case there's more to be repainted...
*
* @return - true if changed as a result of these pending arguments.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanel.java
index a9611d3..55a6643 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanel.java
@@ -19,6 +19,7 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.bookmark;
+import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanelFactory.java
index c9e3f80..c5bff92 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/bookmark/BookmarkPanelFactory.java
@@ -22,10 +22,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.bookmark;
import org.apache.wicket.Component;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
-import org.apache.isis.viewer.wicket.ui.components.scalars.string.MultiLineStringPanel;
public class BookmarkPanelFactory extends ComponentFactoryScalarAbstract {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index c5e6e4d..0ad5fd4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -35,8 +35,8 @@ public class BrandName extends LabelBase {
/**
* Constructor.
*
- * @param id The component id
- * @param placement
+ * @param id - The component id
+ * @param branding
*/
public BrandName(final String id, final BrandingUiModel branding) {
super(id);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
index 0f5fbfd..b6c027e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
@@ -37,7 +37,7 @@ public class StandaloneCollectionPage extends PageAbstract {
private static final long serialVersionUID = 1L;
/**
- * For use with {@link Component#setResponsePage(org.apache.wicket.Page)}
+ * For use with {@link Component#setResponsePage(org.apache.wicket.request.component.IRequestablePage)}
*/
public StandaloneCollectionPage(final EntityCollectionModel model) {
super(PageParametersUtils.newPageParameters(), actionNameFrom(model), ComponentType.STANDALONE_COLLECTION);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
index b301537..93e6a93 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
@@ -40,7 +40,7 @@ public class ValuePage extends PageAbstract {
private static final String ID_ACTION_NAME = "actionName";
/**
- * For use with {@link Component#setResponsePage(org.apache.wicket.Page)}
+ * For use with {@link Component#setResponsePage(org.apache.wicket.request.component.IRequestablePage)}
*/
public ValuePage(final ValueModel valueModel) {
this(valueModel, actionNameFrom(valueModel));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index f708425..154715d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -30,7 +30,7 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
/**
* Convenience adapter for {@link Panel}s built up using {@link ComponentType}s.
- * @param <M>
+ * @param <T>
* @apiNote using raw-types here, to not further complicate generic type constraints on PanelAbstract
*/
@SuppressWarnings("rawtypes")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
index 7ef3641..96bcefb 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoWkt.java
@@ -168,7 +168,7 @@ final class ObjectMementoWkt implements Serializable {
private enum RecreateStrategy {
/**
- * The {@link ObjectAdapter} that this is the memento for, directly has
+ * The {@link ManagedObject} that this is the memento for, directly has
* an {@link EncodableFacet} (it is almost certainly a value), and so is
* stored directly.
*/
@@ -210,7 +210,7 @@ final class ObjectMementoWkt implements Serializable {
}
},
/**
- * The {@link ObjectAdapter} that this is for, is already known by its
+ * The {@link ManagedObject} that this is for, is already known by its
* (persistent) {@link Oid}.
*/
LOOKUP {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index d73df3a..a56f7fd 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -122,18 +122,18 @@ import net.ftlines.wicketsource.WicketSource;
*
* <p>
* New {@link ComponentFactory}s can be specified in two ways. The preferred
- * approach is to use the have the IoC container discover the ComponentFactory.
+ * approach is to have the IoC container discover the ComponentFactory.
* See <tt>asciidoc</tt> extension for an example of this.
*
- * <p>
- * Alternatively, {@link ComponentFactory}s can be specified by overriding {@link #newIsisWicketModule()}.
- * This mechanism allows a number of other aspects to be customized.
*/
@Log4j2
public class IsisWicketApplication
extends AuthenticatedWebApplication
-implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketViewerSettingsAccessor,
-IsisAppCommonContext.Provider {
+implements
+ ComponentFactoryRegistryAccessor,
+ PageClassRegistryAccessor,
+ WicketViewerSettingsAccessor,
+ IsisAppCommonContext.Provider {
private static final long serialVersionUID = 1L;