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 2018/03/01 11:14:49 UTC
[isis] branch master updated: ISIS-1841 comments: reduce visual
clutter
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 838a168 ISIS-1841 comments: reduce visual clutter
838a168 is described below
commit 838a168127f22b6911a13d68785250e5cb9109db
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 1 12:14:45 2018 +0100
ISIS-1841 comments: reduce visual clutter
replace 'region .. endregion' comment markers with just headers
---
.../isis/applib/util/ObjectContractsLegacy.java | 14 +--
.../java/org/apache/isis/applib/AppManifest.java | 16 +--
.../apache/isis/applib/DomainObjectContainer.java | 24 ++--
.../org/apache/isis/applib/IsisApplibModule.java | 9 +-
.../isis/applib/domain/DomainObjectList.java | 36 +++---
.../isis/applib/fixturescripts/FixtureResult.java | 24 ++--
.../applib/fixturescripts/FixtureResultList.java | 20 ++--
.../isis/applib/fixturescripts/FixtureScript.java | 74 ++++++-------
.../fixturescripts/clock/TickingClockFixture.java | 4 +-
.../apache/isis/applib/security/UserMemento.java | 24 ++--
.../isis/applib/services/command/Command.java | 72 ++++++------
.../applib/services/command/CommandDefault.java | 88 +++++++--------
.../services/eventbus/AbstractDomainEvent.java | 32 +++---
.../services/eventbus/AbstractLifecycleEvent.java | 4 +-
.../applib/services/eventbus/AbstractUiEvent.java | 12 +-
.../services/eventbus/ActionDomainEvent.java | 36 +++---
.../services/eventbus/CollectionDomainEvent.java | 24 ++--
.../applib/services/eventbus/CssClassUiEvent.java | 20 ++--
.../applib/services/eventbus/EventBusService.java | 24 ++--
.../isis/applib/services/eventbus/IconUiEvent.java | 20 ++--
.../services/eventbus/ObjectCreatedEvent.java | 12 +-
.../services/eventbus/ObjectLoadedEvent.java | 12 +-
.../services/eventbus/ObjectPersistedEvent.java | 12 +-
.../services/eventbus/ObjectPersistingEvent.java | 12 +-
.../services/eventbus/ObjectRemovingEvent.java | 12 +-
.../services/eventbus/ObjectUpdatedEvent.java | 12 +-
.../services/eventbus/ObjectUpdatingEvent.java | 12 +-
.../services/eventbus/PropertyDomainEvent.java | 22 ++--
.../applib/services/eventbus/TitleUiEvent.java | 24 ++--
.../fixturespec/FixtureScriptsDefault.java | 24 ++--
.../applib/services/i18n/TranslatableString.java | 20 ++--
.../isis/applib/services/iactn/Interaction.java | 48 ++++----
.../queryresultscache/QueryResultsCache.java | 123 +++++++++++++++++++++
.../apache/isis/schema/utils/ChangesDtoUtils.java | 8 +-
.../apache/isis/schema/utils/CommandDtoUtils.java | 4 +-
.../apache/isis/schema/utils/CommonDtoUtils.java | 26 ++---
.../isis/schema/utils/InteractionDtoUtils.java | 42 +++----
.../core/integtestsupport/IsisSystemForTest.java | 30 ++---
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 2 +-
.../RepositoryServiceLegacyInternalDefault.java | 2 +-
.../AuthenticationSessionAbstract.java | 18 +--
.../core/commons/authentication/MessageBroker.java | 12 +-
.../core/commons/components/InstallerAbstract.java | 6 +-
.../commons/config/IsisConfigurationDefault.java | 2 +-
.../configbuilder/IsisConfigurationBuilder.java | 14 +--
.../core/metamodel/adapter/oid/OidMarshaller.java | 10 +-
.../isis/core/metamodel/adapter/oid/RootOid.java | 18 +--
.../core/metamodel/adapter/version/Version.java | 14 +--
.../core/metamodel/facets/DomainEventHelper.java | 8 +-
.../metamodel/facets/FacetFactoryAbstract.java | 4 +-
...assFacetOnActionFromConfiguredRegexFactory.java | 2 +-
.../core/metamodel/services/ServicesInjector.java | 16 +--
.../services/appfeat/ApplicationFeature.java | 28 ++---
.../services/appfeat/ApplicationFeatureId.java | 34 +++---
.../ApplicationFeatureRepositoryDefault.java | 12 +-
.../container/DomainObjectContainerDefault.java | 18 +--
.../exceprecog/ExceptionRecognizerDocDefault.java | 2 +-
.../services/grid/GridLoaderServiceDefault.java | 2 +-
.../PersistenceSessionServiceInternal.java | 10 +-
.../RepositoryServiceInternalDefault.java | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 20 ++--
.../metamodel/specloader/ServiceInitializer.java | 6 +-
.../metamodel/specloader/SpecificationLoader.java | 20 ++--
.../classsubstitutor/ClassSubstitutor.java | 6 +-
.../specloader/facetprocessor/FacetProcessor.java | 2 +-
.../specloader/specimpl/ObjectActionDefault.java | 24 ++--
.../specloader/specimpl/ObjectActionMixedIn.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 12 +-
.../specloader/specimpl/ObjectMemberAbstract.java | 22 ++--
.../specimpl/ObjectSpecificationAbstract.java | 48 ++++----
.../specimpl/OneToManyAssociationContributee.java | 4 +-
.../specimpl/OneToManyAssociationDefault.java | 16 +--
.../specimpl/OneToManyAssociationMixedIn.java | 2 +-
.../specimpl/OneToOneAssociationContributee.java | 2 +-
.../specimpl/OneToOneAssociationDefault.java | 16 +--
.../specimpl/dflt/ObjectSpecificationDefault.java | 14 +--
.../ObjectSpecificationOnStandaloneList.java | 12 +-
.../exploration/ExplorationAuthenticator.java | 2 +-
.../standard/AuthenticatorAbstract.java | 8 +-
.../QueryResultsCacheUsingGuava.java | 111 +++----------------
.../queryresultscache/QueryResultsCacheTest.java | 8 +-
.../fixtures/FixturesInstallerDelegate.java | 8 +-
.../FixturesInstallerFromConfiguration.java | 4 +-
.../isis/core/runtime/headless/IsisSystem.java | 22 ++--
.../runtime/persistence/adapter/PojoAdapter.java | 24 ++--
.../query/PersistenceQueryAbstract.java | 4 +-
.../services/ServicesInstallerFromAnnotation.java | 20 ++--
.../command/CommandDtoServiceInternalDefault.java | 2 +-
.../services/eventbus/EventBusServiceDefault.java | 4 +-
.../core/runtime/services/i18n/po/PoReader.java | 2 +-
.../core/runtime/services/i18n/po/PoWriter.java | 2 +-
.../services/i18n/po/TranslationServicePo.java | 2 +-
.../services/publish/PublishedObjectsDefault.java | 10 +-
.../publish/PublishingServiceInternalDefault.java | 2 +-
.../userreg/EmailNotificationServiceDefault.java | 12 +-
.../system/persistence/PersistenceSession.java | 62 +++++------
.../adaptermanager/OidAdapterHashMap.java | 6 +-
.../adaptermanager/PojoAdapterHashMap.java | 10 +-
.../core/runtime/system/session/IsisSession.java | 14 +--
.../runtime/system/session/IsisSessionFactory.java | 10 +-
.../system/session/IsisSessionFactoryBuilder.java | 4 +-
.../system/transaction/IsisTransaction.java | 18 +--
.../system/transaction/IsisTransactionManager.java | 16 +--
.../IsisComponentProvider.java | 10 +-
.../IsisComponentProviderDefault2.java | 4 +-
.../IsisComponentProviderUsingInstallers.java | 10 +-
.../AuthenticationSessionStrategyAbstract.java | 2 +-
.../CreateSchemaObjectFromClassMetadata.java | 10 +-
.../objectstore/jdo/service/RegisterEntities.java | 2 +-
.../shiro/ShiroAuthenticatorOrAuthorizor.java | 10 +-
.../conneg/ContentNegotiationServiceAbstract.java | 2 +-
.../restfulobjects/server/ResourceContext.java | 6 +-
.../viewer/imagecache/ImageResourceCacheKey.java | 10 +-
.../integration/wicket/WebRequestCycleForIsis.java | 4 +-
.../ui/components/collection/CollectionPanel.java | 4 +-
.../selector/CollectionSelectorHelper.java | 2 +-
.../columns/ObjectAdapterToggleboxColumn.java | 4 +-
.../StandaloneCollectionPanel.java | 8 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 6 +-
.../wicket/ui/panels/PromptFormPanelAbstract.java | 2 +-
.../modules/simple/dom/impl/SimpleObject.java | 4 +-
.../modules/simple/dom/impl/SimpleObject.java | 4 +-
123 files changed, 1015 insertions(+), 974 deletions(-)
diff --git a/core/applib-legacy/src/main/java/org/apache/isis/applib/util/ObjectContractsLegacy.java b/core/applib-legacy/src/main/java/org/apache/isis/applib/util/ObjectContractsLegacy.java
index f07f2d9..887ca44 100644
--- a/core/applib-legacy/src/main/java/org/apache/isis/applib/util/ObjectContractsLegacy.java
+++ b/core/applib-legacy/src/main/java/org/apache/isis/applib/util/ObjectContractsLegacy.java
@@ -34,7 +34,7 @@ import com.google.common.collect.Ordering;
public class ObjectContractsLegacy {
- //region > compare
+ // -- compare
/**
* Evaluates which of p and q is first.
@@ -78,7 +78,7 @@ public class ObjectContractsLegacy {
}
//endregion
- //region > compareBy
+ // -- compareBy
/**
* Returns a {@link Comparator} to evaluate objects by their property name(s).
* @deprecated - please be aware that this utility heavily uses reflection. We don't actually intend to deprecate this method (it's useful while prototyping), but we wanted to bring this to your attention!
@@ -98,7 +98,7 @@ public class ObjectContractsLegacy {
}
//endregion
- //region > toString
+ // -- toString
/**
* Returns a string representation of the object consisting of the specified property name(s).
@@ -119,7 +119,7 @@ public class ObjectContractsLegacy {
}
//endregion
- //region > hashCode
+ // -- hashCode
/**
* Returns the hashCode for the object using the specified property name(s).
* @deprecated - please be aware that this utility heavily uses reflection. We don't actually intend to deprecate this method (it's useful while prototyping), but we wanted to bring this to your attention!
@@ -153,7 +153,7 @@ public class ObjectContractsLegacy {
}
//endregion
- //region > equals
+ // -- equals
/**
* Returns whether two objects are equal, considering just the specified property name(s).
@@ -207,7 +207,7 @@ public class ObjectContractsLegacy {
}
//endregion
- //region > helpers
+ // -- helpers
private static Iterable<Clause> clausesFor(final Iterable<String> iterable) {
return _NullSafe.stream(iterable)
.map(Clause::parse)
@@ -224,7 +224,7 @@ public class ObjectContractsLegacy {
}
//endregion
- //region > toStringOf
+ // -- toStringOf
public interface ToStringEvaluator {
boolean canEvaluate(Object o);
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
index cfab0aa..e392790 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifest.java
@@ -173,7 +173,7 @@ public interface AppManifest {
return instance;
}
- //region > persistenceCapableTypes
+ // -- persistenceCapableTypes
private Set<Class<?>> persistenceCapableTypes;
/**
* @return <tt>null</tt> if no appManifest is defined
@@ -184,9 +184,9 @@ public interface AppManifest {
public void setPersistenceCapableTypes(final Set<Class<?>> persistenceCapableTypes) {
this.persistenceCapableTypes = persistenceCapableTypes;
}
- //endregion
+
- //region > mixinTypes
+ // -- mixinTypes
private Set<Class<?>> mixinTypes;
/**
@@ -198,9 +198,9 @@ public interface AppManifest {
public void setMixinTypes(final Set<Class<?>> mixinTypes) {
this.mixinTypes = mixinTypes;
}
- //endregion
+
- //region > fixtureScriptTypes
+ // -- fixtureScriptTypes
private Set<Class<? extends FixtureScript>> fixtureScriptTypes;
/**
@@ -212,10 +212,10 @@ public interface AppManifest {
public void setFixtureScriptTypes(final Set<Class<? extends FixtureScript>> fixtureScriptTypes) {
this.fixtureScriptTypes = fixtureScriptTypes;
}
- //endregion
+
- //region > domainServiceTypes
+ // -- domainServiceTypes
private Set<Class<?>> domainServiceTypes;
/**
* @return <tt>null</tt> if no appManifest is defined
@@ -226,7 +226,7 @@ public interface AppManifest {
public void setDomainServiceTypes(final Set<Class<?>> domainServiceTypes) {
this.domainServiceTypes = domainServiceTypes;
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java b/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
index cb37aae..fb6be5b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/DomainObjectContainer.java
@@ -39,7 +39,7 @@ import org.apache.isis.applib.services.xactn.TransactionService;
@Deprecated
public interface DomainObjectContainer {
- //region > resolve, objectChanged (DEPRECATED)
+ // -- resolve, objectChanged (DEPRECATED)
/**
* Re-initialises the fields of an object, using the
@@ -86,9 +86,9 @@ public interface DomainObjectContainer {
void objectChanged(Object domainObject);
- //endregion
+
- //region > commit (DEPRECATED)
+ // -- commit (DEPRECATED)
/**
* Commit all changes to the object store.
@@ -104,9 +104,9 @@ public interface DomainObjectContainer {
@Deprecated
void commit();
- //endregion
+
- //region > newViewModelInstance
+ // -- newViewModelInstance
/**
@@ -116,10 +116,10 @@ public interface DomainObjectContainer {
@Programmatic
<T> T newViewModelInstance(final Class<T> ofType, final String memento);
- //endregion
+
- //region > isValid, validate
+ // -- isValid, validate
/**
* Whether the object is in a valid state, that is that none of the
@@ -149,9 +149,9 @@ public interface DomainObjectContainer {
@Programmatic
String validate(Object domainObject);
- //endregion
+
- //region > isViewModel
+ // -- isViewModel
/**
* @deprecated - use {@link org.apache.isis.applib.services.metamodel.MetaModelService#sortOf(Class, MetaModelService.Mode)} instead.
@@ -160,9 +160,9 @@ public interface DomainObjectContainer {
@Programmatic
boolean isViewModel(Object domainObject);
- //endregion
+
- //region > persist, remove (DEPRECATED)
+ // -- persist, remove (DEPRECATED)
/**
* @deprecated - use {@link org.apache.isis.applib.services.repository.RepositoryService#persist(Object)} instead. Please note that {@link org.apache.isis.applib.services.repository.RepositoryService#persist(Object)} will not throw an exception if the Domain Object is already persistent, so the implementation will be the same as that of {@link org.apache.isis.applib.services.repository.RepositoryService#persist(Object)}instead.
@@ -178,7 +178,7 @@ public interface DomainObjectContainer {
@Programmatic
void remove(Object persistentDomainObject);
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index a98a5ef..4724939 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -18,13 +18,12 @@
*/
package org.apache.isis.applib;
-import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "module")
public class IsisApplibModule extends ModuleAbstract {
- //region > ui event classes
+ // -- ui event classes
@SuppressWarnings("serial") // serial versionId to be provided by concrete class
public abstract static class TitleUiEvent<S>
extends org.apache.isis.applib.services.eventbus.TitleUiEvent<S> { }
@@ -34,10 +33,8 @@ public class IsisApplibModule extends ModuleAbstract {
@SuppressWarnings("serial") // serial versionId to be provided by concrete class
public abstract static class CssClassUiEvent<S>
extends org.apache.isis.applib.services.eventbus.CssClassUiEvent<S> { }
- //endregion
-
- //region > domain event classes
+ // -- domain event classes
@SuppressWarnings("serial") // serial versionId to be provided by concrete class
public abstract static class ActionDomainEvent<S> extends org.apache.isis.applib.services.eventbus.ActionDomainEvent<S> {
@@ -51,6 +48,6 @@ public class IsisApplibModule extends ModuleAbstract {
public abstract static class PropertyDomainEvent<S,T> extends org.apache.isis.applib.services.eventbus.PropertyDomainEvent<S,T> {
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
index d97b524..8f2f5bb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
@@ -59,19 +59,19 @@ import org.apache.isis.schema.utils.jaxbadapters.PersistentEntitiesAdapter;
)
public class DomainObjectList {
- //region > ui event classes
+ // -- ui event classes
public static class TitleUiEvent extends IsisApplibModule.TitleUiEvent<DomainObjectList>{}
public static class IconUiEvent extends IsisApplibModule.IconUiEvent<DomainObjectList>{}
public static class CssClassUiEvent extends IsisApplibModule.CssClassUiEvent<DomainObjectList>{}
- //endregion
+
- //region > domain event classes
+ // -- domain event classes
public static abstract class PropertyDomainEvent<T> extends IsisApplibModule.PropertyDomainEvent<DomainObjectList, T> { }
public static abstract class CollectionDomainEvent<T> extends IsisApplibModule.CollectionDomainEvent<DomainObjectList, T> { }
public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<DomainObjectList> { }
- //endregion
+
- //region > constructors
+ // -- constructors
public DomainObjectList() {
}
public DomainObjectList(
@@ -86,16 +86,16 @@ public class DomainObjectList {
this.actionId = actionId;
this.actionArguments = actionArguments;
}
- //endregion
+
- //region > title
+ // -- title
private String title;
public String title() {
return title;
}
- //endregion
+
- //region > property: elementObjectType
+ // -- property: elementObjectType
public static class ElementObjectTypeDomainEvent extends PropertyDomainEvent<String> { }
private String elementObjectType;
@@ -106,9 +106,9 @@ public class DomainObjectList {
public String getElementObjectType() {
return elementObjectType;
}
- //endregion
+
- //region > property: actionOwningType
+ // -- property: actionOwningType
public static class ActionOwningTypeDomainEvent extends PropertyDomainEvent<String> { }
private String actionOwningType;
@@ -121,9 +121,9 @@ public class DomainObjectList {
public String getActionOwningType() {
return actionOwningType;
}
- //endregion
+
- //region > property: actionId
+ // -- property: actionId
public static class ActionIdDomainEvent extends PropertyDomainEvent<String> { }
private String actionId;
@@ -136,9 +136,9 @@ public class DomainObjectList {
public String getActionId() {
return actionId;
}
- //endregion
+
- //region > property: actionArguments
+ // -- property: actionArguments
public static class ActionArgumentsDomainEvent extends PropertyDomainEvent<String> { }
private String actionArguments;
@@ -151,9 +151,9 @@ public class DomainObjectList {
public String getActionArguments() {
return actionArguments;
}
- //endregion
+
- //region > collection: objects
+ // -- collection: objects
public static class ObjectsDomainEvent extends CollectionDomainEvent<Object> { }
@XmlJavaTypeAdapter(PersistentEntitiesAdapter.class)
@@ -170,6 +170,6 @@ public class DomainObjectList {
public void setObjects(final List<Object> objects) {
this.objects = objects;
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java
index 607903e..8404f05 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResult.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.*;
public class FixtureResult {
- //region > fixtureScriptClassName (property)
+ // -- fixtureScriptClassName (property)
private String fixtureScriptClassName;
@@ -42,9 +42,9 @@ public class FixtureResult {
this.fixtureScriptClassName = fixtureScriptClassName;
}
- //endregion
+
- //region > fixtureScriptQualifiedName (programmatic)
+ // -- fixtureScriptQualifiedName (programmatic)
private String fixtureScriptQualifiedName;
@@ -57,9 +57,9 @@ public class FixtureResult {
this.fixtureScriptQualifiedName = fixtureScriptQualifiedName;
}
- //endregion
+
- //region > key (property)
+ // -- key (property)
private String key;
@@ -73,9 +73,9 @@ public class FixtureResult {
this.key = key;
}
- //endregion
+
- //region > object (property)
+ // -- object (property)
private Object object;
@@ -89,9 +89,9 @@ public class FixtureResult {
this.object = object;
}
- //endregion
+
- //region > className (derived property)
+ // -- className (derived property)
@PropertyLayout(named="Result class")
@@ -100,13 +100,13 @@ public class FixtureResult {
return object != null? object.getClass().getName(): null;
}
- //endregion
+
- //region > injected services
+ // -- injected services
@javax.inject.Inject
FixtureScripts fixtureScripts;
- //endregion
+
}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResultList.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResultList.java
index 1e25b43..90a45c0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResultList.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureResultList.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.internal.collections._Maps;
public class FixtureResultList {
- //region > constructor
+ // -- constructor
FixtureResultList(
final FixtureScripts fixtureScripts,
@@ -44,10 +44,10 @@ public class FixtureResultList {
this.fixtureScripts = fixtureScripts;
this.executionContext = executionContext;
}
- //endregion
+
- //region > list of FixtureResults
+ // -- list of FixtureResults
private final List<FixtureResult> list = _Lists.newArrayList();
@@ -103,9 +103,9 @@ public class FixtureResultList {
return Collections.unmodifiableList(list);
}
- //endregion
+
- //region > nextItemFor
+ // -- nextItemFor
private final Map<FixtureScript, AtomicInteger> itemNumberByScript = _Maps.newHashMap();
@@ -118,10 +118,10 @@ public class FixtureResultList {
return "item-"+atomicInteger.incrementAndGet();
}
- //endregion
+
- //region > lookup
+ // -- lookup
<T> T lookup(final String key, Class<T> cls) {
final FixtureResult fixtureResult = fixtureResultByKey.get(key);
@@ -138,9 +138,9 @@ public class FixtureResultList {
return _Casts.uncheckedCast(object);
}
- //endregion
+
- //region > injected services
+ // -- injected services
/**
* Injected in {@link #FixtureResultList(FixtureScripts, org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext) constructor}.
@@ -150,5 +150,5 @@ public class FixtureResultList {
* Injected in {@link #FixtureResultList(FixtureScripts, org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext) constructor}.
*/
private final FixtureScript.ExecutionContext executionContext;
- //endregion
+
}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 139e86c..80780f3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -57,7 +57,7 @@ public abstract class FixtureScript
protected static final String PATH_SEPARATOR = "/";
- //region > constructors
+ // -- constructors
/**
* Initializes a {@link Discoverability#NON_DISCOVERABLE} fixture, with
@@ -123,9 +123,9 @@ public abstract class FixtureScript
return str != null ? str : _Strings.asNaturalName2.apply(getClass().getSimpleName());
}
- //endregion
+
- //region > tracing
+ // -- tracing
private PrintStream tracePrintStream;
@@ -146,9 +146,9 @@ public abstract class FixtureScript
return withTracing(System.out);
}
- //endregion
+
- //region > viewModel impl
+ // -- viewModel impl
@Programmatic
@Override
@@ -162,18 +162,18 @@ public abstract class FixtureScript
fixtureScripts.initOf(mementoStr, this);
}
- //endregion
+
- //region > qualifiedName
+ // -- qualifiedName
@Programmatic
public String getQualifiedName() {
return getParentPath() + getLocalName();
}
- //endregion
+
- //region > friendlyName (property)
+ // -- friendlyName (property)
private String friendlyName;
@@ -186,9 +186,9 @@ public abstract class FixtureScript
this.friendlyName = friendlyName;
}
- //endregion
+
- //region > localName
+ // -- localName
private String localName;
/**
@@ -203,9 +203,9 @@ public abstract class FixtureScript
this.localName = localName;
}
- //endregion
+
- //region > parentPath
+ // -- parentPath
private String parentPath;
@@ -221,9 +221,9 @@ public abstract class FixtureScript
this.parentPath = parentPath;
}
- //endregion
+
- //region > discoverability
+ // -- discoverability
/**
@@ -265,9 +265,9 @@ public abstract class FixtureScript
return this;
}
- //endregion
+
- //region > ExecutionContext
+ // -- ExecutionContext
public static class ExecutionContext {
@@ -680,7 +680,7 @@ public abstract class FixtureScript
}
}
- //region > previouslyExecuted
+ // -- previouslyExecuted
/**
* Always populated, irrespective of {@link FixtureScripts#getMultipleExecutionStrategy() execution strategy},
@@ -703,7 +703,7 @@ public abstract class FixtureScript
return Collections.unmodifiableList(previouslyExecuted);
}
- //endregion
+
/**
* used and populated only if the {@link FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_CLASS}
@@ -717,9 +717,9 @@ public abstract class FixtureScript
*/
private final Map<FixtureScript, FixtureScript> fixtureScriptByValue = _Maps.newLinkedHashMap();
- //endregion
+
- //region > tracing
+ // -- tracing
private int traceHighwatermark = 40;
private PrintStream tracePrintStream;
@@ -754,7 +754,7 @@ public abstract class FixtureScript
traceHighwatermark = Math.max(key.length(), traceHighwatermark);
return pad(key, roundup(traceHighwatermark, 20));
}
- //endregion
+
private static String pad(final String str, final int padTo) {
return _Strings.padEnd(str, padTo, ' ');
@@ -781,9 +781,9 @@ public abstract class FixtureScript
}
- //endregion
+
- //region > defaultParam, checkParam
+ // -- defaultParam, checkParam
protected <T> T defaultParam(final String parameterName, final ExecutionContext ec, final T defaultValue) {
final T value = valueFor(parameterName, ec, defaultValue);
setParam(parameterName, value);
@@ -855,9 +855,9 @@ public abstract class FixtureScript
private String uppercase(final String parameterName) {
return parameterName.substring(0, 1).toUpperCase() + parameterName.substring(1);
}
- //endregion
+
- //region > run (entry point for FixtureScripts service to call)
+ // -- run (entry point for FixtureScripts service to call)
/**
* It's a bit nasty to hold onto this as a field, but required in order to support
@@ -887,10 +887,10 @@ public abstract class FixtureScript
return null;
}
- //endregion
+
- //region > execute (API for subclasses to implement)
+ // -- execute (API for subclasses to implement)
/**
* Subclasses should <b>implement this</b> but SHOULD <i>NOT</i> CALL DIRECTLY.
@@ -902,9 +902,9 @@ public abstract class FixtureScript
@Programmatic
protected abstract void execute(final ExecutionContext executionContext);
- //endregion
+
- //region > (legacy) InstallableFixture impl
+ // -- (legacy) InstallableFixture impl
@Override
@Programmatic
@@ -917,9 +917,9 @@ public abstract class FixtureScript
run(null);
}
- //endregion
+
- //region > helpers (for subclasses)
+ // -- helpers (for subclasses)
/**
* Returns the first non-null value; for convenience of subclass implementations
@@ -964,18 +964,18 @@ public abstract class FixtureScript
transactionService.nextTransaction();
}
- //endregion
+
- //region > helpers (local)
+ // -- helpers (local)
@Programmatic
String pathWith(final String subkey) {
return (getQualifiedName() != null? getQualifiedName() + PATH_SEPARATOR: "") + subkey;
}
- //endregion
+
- //region > injected services
+ // -- injected services
@javax.inject.Inject
protected FixtureScripts fixtureScripts;
@@ -1002,5 +1002,5 @@ public abstract class FixtureScript
protected SessionManagementService sessionManagementService;
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/clock/TickingClockFixture.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/clock/TickingClockFixture.java
index 8584f4e..b4909e5 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/clock/TickingClockFixture.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/clock/TickingClockFixture.java
@@ -35,7 +35,7 @@ public class TickingClockFixture
extends FixtureScript
implements FixtureScriptWithExecutionStrategy {
- //region > date property
+ // -- date property
private String date;
public String getDate() {
return date;
@@ -44,7 +44,7 @@ public class TickingClockFixture
this.date = date;
return this;
}
- //endregion
+
@Override
protected void execute(ExecutionContext ec) {
diff --git a/core/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java b/core/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java
index 489181f..15dcefe 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/security/UserMemento.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.MemberOrder;
*/
public final class UserMemento {
- //region > constructors
+ // -- constructors
/**
* Creates a new user with the specified name and no roles.
*/
@@ -56,16 +56,16 @@ public final class UserMemento {
this.name = name;
this.roles.addAll(roles);
}
- //endregion
+
- //region > title
+ // -- title
public String title() {
return name;
}
- //endregion
+
- //region > name, NameType
+ // -- name, NameType
// {{ (User) Name, isCurrentUser
private final String name;
@@ -92,9 +92,9 @@ public final class UserMemento {
}
- //endregion
+
- //region > isCurrentUser
+ // -- isCurrentUser
/**
* Determine if the specified name is this user.
*
@@ -109,9 +109,9 @@ public final class UserMemento {
return name.equals(userName);
}
- //endregion
+
- //region > roles
+ // -- roles
private final List<RoleMemento> roles = new ArrayList<RoleMemento>();
/**
@@ -144,9 +144,9 @@ public final class UserMemento {
return false;
}
- //endregion
+
- //region > toString
+ // -- toString
@Override
public String toString() {
final StringBuilder buf = new StringBuilder();
@@ -156,6 +156,6 @@ public final class UserMemento {
return "User [name=" + getName() + ",roles=" + buf.toString() + "]";
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index d3e1496..7044491 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -71,7 +71,7 @@ public interface Command extends HasTransactionId {
String ACTION_IDENTIFIER_FOR_EDIT = "(edit)";
- //region > user (property)
+ // -- user (property)
/**
* The user that created the command.
*/
@@ -84,9 +84,9 @@ public interface Command extends HasTransactionId {
* Implementation notes: set when the Isis PersistenceSession is opened.
*/
void setUser(String user);
- //endregion
+
- //region > timestamp (property)
+ // -- timestamp (property)
/**
* The date/time at which this command was created.
@@ -100,9 +100,9 @@ public interface Command extends HasTransactionId {
*/
void setTimestamp(Timestamp timestamp);
- //endregion
+
- //region > target (property)
+ // -- target (property)
/**
* {@link Bookmark} of the target object (entity or service) on which this action was performed.
@@ -119,9 +119,9 @@ public interface Command extends HasTransactionId {
*/
void setTarget(Bookmark target);
- //endregion
+
- //region > memberIdentifier (property)
+ // -- memberIdentifier (property)
/**
* Holds a string representation of the invoked action, or the edited property, equivalent to
@@ -138,9 +138,9 @@ public interface Command extends HasTransactionId {
*/
void setMemberIdentifier(String memberIdentifier);
- //endregion
+
- //region > targetClass (property)
+ // -- targetClass (property)
/**
* A human-friendly description of the class of the target object.
@@ -155,9 +155,9 @@ public interface Command extends HasTransactionId {
*/
void setTargetClass(String targetClass);
- //endregion
+
- //region > targetAction (property)
+ // -- targetAction (property)
/**
* The human-friendly name of the action invoked/property edited on the target object.
@@ -177,9 +177,9 @@ public interface Command extends HasTransactionId {
*/
void setTargetAction(String targetAction);
- //endregion
+
- //region > arguments (property)
+ // -- arguments (property)
/**
* A human-friendly description of the arguments with which the action was invoked.
@@ -194,9 +194,9 @@ public interface Command extends HasTransactionId {
*/
void setArguments(final String arguments);
- //endregion
+
- //region > memento (property)
+ // -- memento (property)
/**
* A formal (XML or similar) specification of the action to invoke/being invoked.
@@ -211,9 +211,9 @@ public interface Command extends HasTransactionId {
*/
void setMemento(final String memento);
- //endregion
+
- //region > executeIn (property)
+ // -- executeIn (property)
/**
* The mechanism by which this command is to be executed, either synchronously "in the
@@ -255,9 +255,9 @@ public interface Command extends HasTransactionId {
@Programmatic
List<ActionDomainEvent<?>> flushActionDomainEvents();
- //endregion
+
- //region > executor (property)
+ // -- executor (property)
enum Executor {
/**
@@ -301,9 +301,9 @@ public interface Command extends HasTransactionId {
*/
void setExecutor(final Executor executor);
- //endregion
+
- //region > startedAt (property)
+ // -- startedAt (property)
/**
* For an command that has actually been executed, holds the date/time at which the {@link Interaction} that
@@ -335,9 +335,9 @@ public interface Command extends HasTransactionId {
*/
void setStartedAt(Timestamp startedAt);
- //endregion
+
- //region > completedAt (property, deprecated)
+ // -- completedAt (property, deprecated)
/**
* For an command that has actually been executed, holds the date/time at which the {@link Interaction} that
@@ -368,9 +368,9 @@ public interface Command extends HasTransactionId {
*/
void setCompletedAt(Timestamp completedAt);
- //endregion
+
- //region > parent (property)
+ // -- parent (property)
/**
* For actions created through the {@link BackgroundService} and {@link BackgroundCommandService},
@@ -383,9 +383,9 @@ public interface Command extends HasTransactionId {
*/
void setParent(final Command parent);
- //endregion
+
- //region > exception (property, deprecated)
+ // -- exception (property, deprecated)
/**
* For an command that has actually been executed, holds the exception stack
@@ -406,9 +406,9 @@ public interface Command extends HasTransactionId {
*/
void setException(String stackTrace);
- //endregion
+
- //region > result (property, deprecated)
+ // -- result (property, deprecated)
/**
@@ -429,9 +429,9 @@ public interface Command extends HasTransactionId {
*/
void setResult(Bookmark resultBookmark);
- //endregion
+
- //region > persistence (property)
+ // -- persistence (property)
/**
* Whether this command should ultimately be persisted (if the configured {@link BackgroundCommandService} supports
@@ -462,9 +462,9 @@ public interface Command extends HasTransactionId {
* <b>NOT API</b>: intended to be called only by the framework.
*/
void setPersistence(final CommandPersistence persistence);
- //endregion
+
- //region > persistHint (programmatic)
+ // -- persistHint (programmatic)
/**
@@ -483,9 +483,9 @@ public interface Command extends HasTransactionId {
*/
@Programmatic
void setPersistHint(boolean persistHint);
- //endregion
+
- //region > next (programmatic, deprecated)
+ // -- next (programmatic, deprecated)
/**
* <b>NOT API</b>: intended to be called only by the framework.
@@ -496,6 +496,6 @@ public interface Command extends HasTransactionId {
@Programmatic
int next(final String sequenceAbbr);
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
index f612f2d..ddf332f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandDefault.java
@@ -36,15 +36,15 @@ import org.apache.isis.applib.util.ToString;
public class CommandDefault implements Command {
- //region > constructor
+ // -- constructor
public CommandDefault() {
setExecutor(Executor.OTHER);
}
- //endregion
+
- //region > actionIdentifier (property)
+ // -- actionIdentifier (property)
private String actionIdentifier;
public String getMemberIdentifier() {
@@ -56,9 +56,9 @@ public class CommandDefault implements Command {
this.actionIdentifier = actionIdentifier;
}
- //endregion
+
- //region > targetClass (property)
+ // -- targetClass (property)
private String targetClass;
public String getTargetClass() {
@@ -70,9 +70,9 @@ public class CommandDefault implements Command {
this.targetClass = targetClass;
}
- //endregion
+
- //region > targetAction (property)
+ // -- targetAction (property)
private String targetAction;
public String getTargetAction() {
@@ -84,9 +84,9 @@ public class CommandDefault implements Command {
this.targetAction = targetAction;
}
- //endregion
+
- //region > arguments (property)
+ // -- arguments (property)
private String arguments;
public String getArguments() {
@@ -98,9 +98,9 @@ public class CommandDefault implements Command {
this.arguments = arguments;
}
- //endregion
+
- //region > memento (property)
+ // -- memento (property)
private String memento;
@@ -113,9 +113,9 @@ public class CommandDefault implements Command {
this.memento = memento;
}
- //endregion
+
- //region > target (property)
+ // -- target (property)
private Bookmark target;
public Bookmark getTarget() {
@@ -126,9 +126,9 @@ public class CommandDefault implements Command {
this.target = target;
}
- //endregion
+
- //region > timestamp (property)
+ // -- timestamp (property)
private Timestamp timestamp;
public Timestamp getTimestamp() {
@@ -140,9 +140,9 @@ public class CommandDefault implements Command {
this.timestamp = timestamp;
}
- //endregion
+
- //region > startedAt (property)
+ // -- startedAt (property)
private Timestamp startedAt;
@Override
@@ -154,9 +154,9 @@ public class CommandDefault implements Command {
this.startedAt = startedAt;
}
- //endregion
+
- //region > completedAt (property)
+ // -- completedAt (property)
private Timestamp completedAt;
@@ -170,9 +170,9 @@ public class CommandDefault implements Command {
this.completedAt = completed;
}
- //endregion
+
- //region > user (property)
+ // -- user (property)
private String user;
public String getUser() {
@@ -184,9 +184,9 @@ public class CommandDefault implements Command {
this.user = user;
}
- //endregion
+
- //region > actionDomainEvent (peek/pop/flush)
+ // -- actionDomainEvent (peek/pop/flush)
private final LinkedList<ActionDomainEvent<?>> actionDomainEvents = _Lists.newLinkedList();
@@ -216,9 +216,9 @@ public class CommandDefault implements Command {
return events;
}
- //endregion
+
- //region > executor (property)
+ // -- executor (property)
private Executor executor;
@@ -235,9 +235,9 @@ public class CommandDefault implements Command {
this.executor = nature;
}
- //endregion
+
- //region > executionType (property)
+ // -- executionType (property)
private CommandExecuteIn executionType;
@@ -255,9 +255,9 @@ public class CommandDefault implements Command {
}
- //endregion
+
- //region > parent (property)
+ // -- parent (property)
private Command parent;
@@ -272,9 +272,9 @@ public class CommandDefault implements Command {
}
- //endregion
+
- //region > result (property)
+ // -- result (property)
private Bookmark result;
@@ -287,9 +287,9 @@ public class CommandDefault implements Command {
this.result = result;
}
- //endregion
+
- //region > exceptionStackTrace (property)
+ // -- exceptionStackTrace (property)
private String exceptionStackTrace;
@@ -302,9 +302,9 @@ public class CommandDefault implements Command {
this.exceptionStackTrace = exceptionStackTrace;
}
- //endregion
+
- //region > transactionId (property)
+ // -- transactionId (property)
private UUID transactionId;
@@ -318,9 +318,9 @@ public class CommandDefault implements Command {
}
- //endregion
+
- //region > persistence
+ // -- persistence
private CommandPersistence persistence;
@@ -334,9 +334,9 @@ public class CommandDefault implements Command {
this.persistence = persistence;
}
- //endregion
+
- //region > persistHint
+ // -- persistHint
private boolean persistHint;
@@ -349,9 +349,9 @@ public class CommandDefault implements Command {
}
- //endregion
+
- //region > next
+ // -- next
private final Map<String, AtomicInteger> sequenceByName = _Maps.newHashMap();
@@ -368,9 +368,9 @@ public class CommandDefault implements Command {
return next.get();
}
- //endregion
+
- //region > toString
+ // -- toString
private final static ToString<CommandDefault> toString = ObjectContracts
.toString("startedAt", CommandDefault::getStartedAt)
@@ -385,7 +385,7 @@ public class CommandDefault implements Command {
return toString.toString(this);
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
index 49757d4..cfd5e0b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent.java
@@ -55,7 +55,7 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
return source != null ? source : new Object();
}
- //region > Phase
+ // -- Phase
public enum Phase {
HIDE,
@@ -105,9 +105,9 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
public void setEventPhase(Phase phase) {
this.phase = phase;
}
- //endregion
+
- //region > source (downcast to S)
+ // -- source (downcast to S)
@Override
@SuppressWarnings("unchecked")
public S getSource() {
@@ -120,9 +120,9 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
public void setSource(S source) {
this.source = source;
}
- //endregion
+
- //region > identifier
+ // -- identifier
/**
* If the no-arg constructor is used, then the framework will populate this field reflectively.
*/
@@ -137,9 +137,9 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
public void setIdentifier(final Identifier identifier) {
this.identifier = identifier;
}
- //endregion
+
- //region > hide, isHidden
+ // -- hide, isHidden
private boolean hidden;
public boolean isHidden() {
return hidden;
@@ -151,9 +151,9 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
public void hide() {
this.hidden = true;
}
- //endregion
+
- //region > disable, isDisabled, getDisabledReason, getDisabledReasonTranslatable
+ // -- disable, isDisabled, getDisabledReason, getDisabledReasonTranslatable
private String disabledReason;
public boolean isDisabled() {
@@ -189,9 +189,9 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
public void disable(final TranslatableString reason) {
this.disabledReasonTranslatable = reason;
}
- //endregion
+
- //region > invalidate, isInvalid, getInvalidityReason, getInvalidityReasonTranslatable
+ // -- invalidate, isInvalid, getInvalidityReason, getInvalidityReasonTranslatable
private String invalidatedReason;
public boolean isInvalid() {
return invalidatedReason != null || invalidatedReasonTranslatable != null;
@@ -227,9 +227,9 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
this.invalidatedReasonTranslatable = reason;
}
- //endregion
+
- //region > veto
+ // -- veto
/**
* Use instead of {@link #hide()}, {@link #disable(String)} and {@link #invalidate(String)}; just delegates to
* appropriate vetoing method based upon the {@link #getEventPhase() phase}.
@@ -299,9 +299,9 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
throw _Exceptions.unmatchedCase(getEventPhase());
}
}
- //endregion
+
- //region > userData
+ // -- userData
/**
* Provides a mechanism to pass data to the next {@link #getEventPhase() phase}.
*/
@@ -319,7 +319,7 @@ public abstract class AbstractDomainEvent<S> extends java.util.EventObject {
public void put(Object key, Object value) {
userData.put(key, value);
}
- //endregion
+
private final static ToString<AbstractDomainEvent<?>> toString = ObjectContracts
//.toString("source", AbstractDomainEvent::getSource)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractLifecycleEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractLifecycleEvent.java
index 6e12889..b2e3321 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractLifecycleEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractLifecycleEvent.java
@@ -39,7 +39,7 @@ public abstract class AbstractLifecycleEvent<S> extends EventObject {
return source != null ? source : new Object();
}
- //region > source (downcast to S)
+ // -- source (downcast to S)
@Override
@SuppressWarnings("unchecked")
public S getSource() {
@@ -52,7 +52,7 @@ public abstract class AbstractLifecycleEvent<S> extends EventObject {
public void setSource(S source) {
this.source = source;
}
- //endregion
+
private final static ToString<AbstractLifecycleEvent<?>> toString = ObjectContracts
.toString("source", AbstractLifecycleEvent::getSource);
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractUiEvent.java
index 6259e67..6fa8626 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractUiEvent.java
@@ -29,7 +29,7 @@ public abstract class AbstractUiEvent<S> extends EventObject {
private static final long serialVersionUID = 1L;
- //region > constructors
+ // -- constructors
/**
* If used then the framework will set state via (non-API) setters.
*
@@ -48,9 +48,9 @@ public abstract class AbstractUiEvent<S> extends EventObject {
private static Object sourceElseDummy(final Object source) {
return source != null ? source : new Object();
}
- //endregion
+
- //region > source
+ // -- source
@Override
@SuppressWarnings("unchecked")
@@ -65,9 +65,9 @@ public abstract class AbstractUiEvent<S> extends EventObject {
this.source = source;
}
- //endregion
+
- //region > userData
+ // -- userData
/**
* Provides a mechanism to pass data around.
*/
@@ -85,7 +85,7 @@ public abstract class AbstractUiEvent<S> extends EventObject {
public void put(Object key, Object value) {
userData.put(key, value);
}
- //endregion
+
private final static ToString<AbstractUiEvent<?>> toString = ObjectContracts
.toString("source", AbstractUiEvent::getSource);
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
index ec87a6c..a70e0ff 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ActionDomainEvent.java
@@ -30,7 +30,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.Action#domainEvent()} annotation attribute. Whether this
@@ -40,9 +40,9 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public static class Default extends ActionDomainEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -51,9 +51,9 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public static class Noop extends ActionDomainEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -62,7 +62,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public static class Doop extends ActionDomainEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
/**
@@ -75,7 +75,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public ActionDomainEvent() {
}
- //region > command
+ // -- command
private Command command;
/**
@@ -95,9 +95,9 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public void setCommand(Command command) {
this.command = command;
}
- //endregion
+
- //region > actionSemantics
+ // -- actionSemantics
public SemanticsOf getSemantics() {
return actionSemantics;
}
@@ -119,9 +119,9 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
this.actionSemantics = actionSemantics;
}
- //endregion
+
- //region > parameterNames
+ // -- parameterNames
private List<String> parameterNames;
public List<String> getParameterNames() {
return parameterNames;
@@ -129,9 +129,9 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public void setParameterNames(final List<String> parameterNames) {
this.parameterNames = parameterNames;
}
- //endregion
+
- //region > parameterTypes
+ // -- parameterTypes
private List<Class<?>> parameterTypes;
public List<Class<?>> getParameterTypes() {
return parameterTypes;
@@ -140,7 +140,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public void setParameterTypes(final List<Class<?>> parameterTypes) {
this.parameterTypes = parameterTypes;
}
- //endregion
+
// region > mixedIn
@@ -160,7 +160,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
}
// endregion
- //region > arguments
+ // -- arguments
private List<Object> arguments;
/**
* The arguments being used to invoke the action; populated at {@link Phase#VALIDATE} and subsequent phases
@@ -176,9 +176,9 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public void setArguments(List<Object> arguments) {
this.arguments = arguments;
}
- //endregion
+
- //region > returnValue
+ // -- returnValue
/**
*
*/
@@ -202,7 +202,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
public void setReturnValue(final Object returnValue) {
this.returnValue = returnValue;
}
- //endregion
+
private final static ToString<ActionDomainEvent<?>> toString = ObjectContracts.<ActionDomainEvent<?>>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
index 69aafbb..eb24294 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CollectionDomainEvent.java
@@ -25,7 +25,7 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.Collection#domainEvent()} annotation attribute. Whether this
@@ -35,9 +35,9 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
public static class Default extends CollectionDomainEvent<Object, Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -46,9 +46,9 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
public static class Noop extends CollectionDomainEvent<Object, Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -57,10 +57,10 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
public static class Doop extends CollectionDomainEvent<Object, Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > constructor
+ // -- constructor
/**
* If used then the framework will set state via (non-API) setters.
@@ -72,9 +72,9 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
public CollectionDomainEvent() {
}
- //endregion
+
- //region > value
+ // -- value
private T value;
/**
@@ -90,9 +90,9 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
public void setValue(T value) {
this.value = value;
}
- //endregion
+
- //region > Of
+ // -- Of
public static enum Of {
/**
* The collection is being accessed
@@ -128,7 +128,7 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
this.of = of;
}
- //endregion
+
private final static ToString<CollectionDomainEvent<?,?>> toString =
ObjectContracts.<CollectionDomainEvent<?,?>>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
index 6b7cf3b..124e62f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/CssClassUiEvent.java
@@ -29,7 +29,7 @@ public abstract class CssClassUiEvent<S> extends AbstractUiEvent<S> {
private static final long serialVersionUID = 1L;
- //region > constructors
+ // -- constructors
/**
* If used then the framework will set state via (non-API) setters.
*
@@ -45,9 +45,9 @@ public abstract class CssClassUiEvent<S> extends AbstractUiEvent<S> {
super(source);
}
- //endregion
+
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObjectLayout#cssClassUiEvent()} annotation attribute. Whether this
@@ -57,9 +57,9 @@ public abstract class CssClassUiEvent<S> extends AbstractUiEvent<S> {
public static class Default extends CssClassUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -68,9 +68,9 @@ public abstract class CssClassUiEvent<S> extends AbstractUiEvent<S> {
public static class Noop extends CssClassUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -79,9 +79,9 @@ public abstract class CssClassUiEvent<S> extends AbstractUiEvent<S> {
public static class Doop extends CssClassUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > cssClass
+ // -- cssClass
private String cssClass;
/**
@@ -97,6 +97,6 @@ public abstract class CssClassUiEvent<S> extends AbstractUiEvent<S> {
public void setCssClass(final String cssClass) {
this.cssClass = cssClass;
}
- //endregion
+
}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
index 21d350d..6d59f82 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
@@ -65,7 +65,7 @@ public abstract class EventBusService {
public static final EventBusService NOOP = new Noop();
- //region > init, shutdown
+ // -- init, shutdown
/**
* Cannot do the setup of the event bus here (so this is asymmetric with <code>@PreDestroy</code>) because there is
@@ -92,9 +92,9 @@ public abstract class EventBusService {
teardownEventBus();
}
- //endregion
+
- //region > register, unregister
+ // -- register, unregister
/**
* Both singleton and request-scoped domain services can register on the event bus; this should be done in their
@@ -179,9 +179,9 @@ public abstract class EventBusService {
// intentionally no-op
}
- //endregion
+
- //region > subscribers
+ // -- subscribers
private final Set<Object> subscribers = _Sets.newConcurrentHashSet();
@@ -192,9 +192,9 @@ public abstract class EventBusService {
public Set<Object> getSubscribers() {
return Collections.unmodifiableSet(_Sets.newLinkedHashSet(subscribers));
}
- //endregion
+
- //region > post
+ // -- post
/**
* Post an event.
@@ -212,10 +212,10 @@ public abstract class EventBusService {
return this.eventBusImplementation != null;
}
- //endregion
+
- //region > getEventBus
+ // -- getEventBus
/**
* Lazily populated in {@link #getEventBusImplementation()} as result of the first {@link #post(Object)}.
@@ -279,9 +279,9 @@ public abstract class EventBusService {
this.eventBusImplementation = null;
}
- //endregion
+
- //region > hook methods (newEventBus, skip)
+ // -- hook methods (newEventBus, skip)
/**
* Mandatory hook method for subclass to instantiate an appropriately configured Guava event bus.
@@ -300,7 +300,7 @@ public abstract class EventBusService {
return false;
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
index 0bdee8b..4a36013 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/IconUiEvent.java
@@ -27,7 +27,7 @@ public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
private static final long serialVersionUID = 1L;
- //region > constructors
+ // -- constructors
/**
* If used then the framework will set state via (non-API) setters.
*
@@ -43,9 +43,9 @@ public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
super(source);
}
- //endregion
+
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObjectLayout#iconUiEvent()} annotation attribute. Whether this
@@ -55,9 +55,9 @@ public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
public static class Default extends IconUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -66,9 +66,9 @@ public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
public static class Noop extends IconUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -77,10 +77,10 @@ public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
public static class Doop extends IconUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > iconName
+ // -- iconName
private String iconName;
/**
@@ -96,6 +96,6 @@ public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
public void setIconName(final String iconName) {
this.iconName = iconName;
}
- //endregion
+
}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectCreatedEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectCreatedEvent.java
index df5e38f..42470e9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectCreatedEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectCreatedEvent.java
@@ -22,7 +22,7 @@ public abstract class ObjectCreatedEvent<S> extends AbstractLifecycleEvent<S> {
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObject#createdLifecycleEvent()} annotation attribute. Whether this
@@ -38,9 +38,9 @@ public abstract class ObjectCreatedEvent<S> extends AbstractLifecycleEvent<S> {
return "ObjectCreatedEvent$Default{source=" + getSource() + "}";
}
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -49,9 +49,9 @@ public abstract class ObjectCreatedEvent<S> extends AbstractLifecycleEvent<S> {
public static class Noop extends ObjectCreatedEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -60,7 +60,7 @@ public abstract class ObjectCreatedEvent<S> extends AbstractLifecycleEvent<S> {
public static class Doop extends ObjectCreatedEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
public ObjectCreatedEvent() {
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectLoadedEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectLoadedEvent.java
index 7ae28dc..6225ed8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectLoadedEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectLoadedEvent.java
@@ -22,7 +22,7 @@ public abstract class ObjectLoadedEvent<S> extends AbstractLifecycleEvent<S> {
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObject#loadedLifecycleEvent()} annotation attribute. Whether this
@@ -38,9 +38,9 @@ public abstract class ObjectLoadedEvent<S> extends AbstractLifecycleEvent<S> {
return "ObjectLoadedEvent$Default{source=" + getSource() + "}";
}
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -49,9 +49,9 @@ public abstract class ObjectLoadedEvent<S> extends AbstractLifecycleEvent<S> {
public static class Noop extends ObjectLoadedEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -60,7 +60,7 @@ public abstract class ObjectLoadedEvent<S> extends AbstractLifecycleEvent<S> {
public static class Doop extends ObjectLoadedEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistedEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistedEvent.java
index de2aa7c..91ce262 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistedEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistedEvent.java
@@ -22,7 +22,7 @@ public abstract class ObjectPersistedEvent<S> extends AbstractLifecycleEvent<S>
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObject#persistedLifecycleEvent()} annotation attribute. Whether this
@@ -38,9 +38,9 @@ public abstract class ObjectPersistedEvent<S> extends AbstractLifecycleEvent<S>
return "ObjectPersistedEvent$Default{source=" + getSource() + "}";
}
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -49,9 +49,9 @@ public abstract class ObjectPersistedEvent<S> extends AbstractLifecycleEvent<S>
public static class Noop extends ObjectPersistedEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -60,7 +60,7 @@ public abstract class ObjectPersistedEvent<S> extends AbstractLifecycleEvent<S>
public static class Doop extends ObjectPersistedEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
public ObjectPersistedEvent() {
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistingEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistingEvent.java
index 9d18165..aabbc4f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistingEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectPersistingEvent.java
@@ -22,7 +22,7 @@ public abstract class ObjectPersistingEvent<S> extends AbstractLifecycleEvent<S>
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObject#persistingLifecycleEvent()} annotation attribute. Whether this
@@ -38,9 +38,9 @@ public abstract class ObjectPersistingEvent<S> extends AbstractLifecycleEvent<S>
return "ObjectPersistingEvent$Default{source=" + getSource() + "}";
}
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -49,9 +49,9 @@ public abstract class ObjectPersistingEvent<S> extends AbstractLifecycleEvent<S>
public static class Noop extends ObjectPersistingEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -60,7 +60,7 @@ public abstract class ObjectPersistingEvent<S> extends AbstractLifecycleEvent<S>
public static class Doop extends ObjectPersistingEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
public ObjectPersistingEvent() {
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectRemovingEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectRemovingEvent.java
index b7f8186..4026100 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectRemovingEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectRemovingEvent.java
@@ -22,7 +22,7 @@ public abstract class ObjectRemovingEvent<S> extends AbstractLifecycleEvent<S> {
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObject#removingLifecycleEvent()} annotation attribute. Whether this
@@ -38,9 +38,9 @@ public abstract class ObjectRemovingEvent<S> extends AbstractLifecycleEvent<S> {
return "ObjectRemovingEvent$Default{source=" + getSource() + "}";
}
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -49,9 +49,9 @@ public abstract class ObjectRemovingEvent<S> extends AbstractLifecycleEvent<S> {
public static class Noop extends ObjectRemovingEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -60,7 +60,7 @@ public abstract class ObjectRemovingEvent<S> extends AbstractLifecycleEvent<S> {
public static class Doop extends ObjectRemovingEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
public ObjectRemovingEvent() {
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatedEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatedEvent.java
index 94e763b..280e5b0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatedEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatedEvent.java
@@ -22,7 +22,7 @@ public abstract class ObjectUpdatedEvent<S> extends AbstractLifecycleEvent<S> {
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObject#updatedLifecycleEvent()} annotation attribute. Whether this
@@ -38,9 +38,9 @@ public abstract class ObjectUpdatedEvent<S> extends AbstractLifecycleEvent<S> {
return "ObjectUpdatedEvent$Default{source=" + getSource() + "}";
}
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -49,9 +49,9 @@ public abstract class ObjectUpdatedEvent<S> extends AbstractLifecycleEvent<S> {
public static class Noop extends ObjectUpdatedEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -60,7 +60,7 @@ public abstract class ObjectUpdatedEvent<S> extends AbstractLifecycleEvent<S> {
public static class Doop extends ObjectUpdatedEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
public ObjectUpdatedEvent() {
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatingEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatingEvent.java
index a7d39b0..71fa3ae 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatingEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/ObjectUpdatingEvent.java
@@ -22,7 +22,7 @@ public abstract class ObjectUpdatingEvent<S> extends AbstractLifecycleEvent<S> {
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObject#updatingLifecycleEvent()} annotation attribute. Whether this
@@ -38,9 +38,9 @@ public abstract class ObjectUpdatingEvent<S> extends AbstractLifecycleEvent<S> {
return "ObjectUpdatingEvent$Default{source=" + getSource() + "}";
}
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -49,9 +49,9 @@ public abstract class ObjectUpdatingEvent<S> extends AbstractLifecycleEvent<S> {
public static class Noop extends ObjectUpdatingEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -60,7 +60,7 @@ public abstract class ObjectUpdatingEvent<S> extends AbstractLifecycleEvent<S> {
public static class Doop extends ObjectUpdatingEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
public ObjectUpdatingEvent() {
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
index a5878e5..0c83178 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/PropertyDomainEvent.java
@@ -25,7 +25,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.Property#domainEvent()} annotation attribute. Whether this
@@ -35,9 +35,9 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
public static class Default extends PropertyDomainEvent<Object, Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -46,9 +46,9 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
public static class Noop extends PropertyDomainEvent<Object, Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -57,9 +57,9 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
public static class Doop extends PropertyDomainEvent<Object, Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > constructors
+ // -- constructors
/**
* If used then the framework will set state via (non-API) setters.
@@ -72,7 +72,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
}
- //region > oldValue
+ // -- oldValue
private T oldValue;
/**
@@ -88,9 +88,9 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
public void setOldValue(T oldValue) {
this.oldValue = oldValue;
}
- //endregion
+
- //region > newValue
+ // -- newValue
private T newValue;
/**
* The proposed (post-modification) value of the property; populated at {@link org.apache.isis.applib.services.eventbus.AbstractDomainEvent.Phase#VALIDATE} and subsequent phases
@@ -105,7 +105,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
public void setNewValue(T newValue) {
this.newValue = newValue;
}
- //endregion
+
private final static ToString<PropertyDomainEvent<?,?>> toString =
ObjectContracts.<PropertyDomainEvent<?,?>>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
index e170077..e7a3bb8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/TitleUiEvent.java
@@ -29,7 +29,7 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
private static final long serialVersionUID = 1L;
- //region > Default class
+ // -- Default class
/**
* This class is the default for the
* {@link org.apache.isis.applib.annotation.DomainObjectLayout#titleUiEvent()} annotation attribute. Whether this
@@ -39,9 +39,9 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
public static class Default extends TitleUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Noop class
+ // -- Noop class
/**
* Convenience class to use indicating that an event should <i>not</i> be posted (irrespective of the configuration
@@ -50,9 +50,9 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
public static class Noop extends TitleUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > Doop class
+ // -- Doop class
/**
* Convenience class meaning that an event <i>should</i> be posted (irrespective of the configuration
@@ -61,9 +61,9 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
public static class Doop extends TitleUiEvent<Object> {
private static final long serialVersionUID = 1L;
}
- //endregion
+
- //region > constructors
+ // -- constructors
/**
* If used then the framework will set state via (non-API) setters.
*
@@ -79,9 +79,9 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
super(source);
}
- //endregion
+
- //region > title
+ // -- title
private String title;
/**
@@ -101,9 +101,9 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
public void setTitle(final String title) {
this.title = title;
}
- //endregion
+
- //region > translatableTitle
+ // -- translatableTitle
private TranslatableString translatableTitle;
/**
@@ -124,6 +124,6 @@ public abstract class TitleUiEvent<S> extends AbstractUiEvent<S> {
public void setTranslatableTitle(final TranslatableString translatableTitle) {
this.translatableTitle = translatableTitle;
}
- //endregion
+
}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
index ddc4c3d..61af728 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
@@ -72,7 +72,7 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
)
public class FixtureScriptsDefault extends FixtureScripts {
- //region > constructor, init
+ // -- constructor, init
/**
* The package prefix to search for fixture scripts. This default value will result in
* no fixture scripts being found. However, normally it will be overridden.
@@ -92,10 +92,10 @@ public class FixtureScriptsDefault extends FixtureScripts {
}
setSpecification(fixtureScriptsSpecificationProvider.getSpecification());
}
- //endregion
+
- //region > runFixtureScript (using choices as the drop-down policy)
+ // -- runFixtureScript (using choices as the drop-down policy)
@Action(
restrictTo = RestrictTo.PROTOTYPING
)
@@ -152,9 +152,9 @@ public class FixtureScriptsDefault extends FixtureScripts {
return super.validateRunFixtureScript(fixtureScript, parameters);
}
- //endregion
+
- //region > runFixtureScript (using autoComplete as drop-down policy)
+ // -- runFixtureScript (using autoComplete as drop-down policy)
@Action(
restrictTo = RestrictTo.PROTOTYPING
)
@@ -193,9 +193,9 @@ public class FixtureScriptsDefault extends FixtureScripts {
public String validateRunFixtureScriptWithAutoComplete(final FixtureScript fixtureScript, final String parameters) {
return super.validateRunFixtureScript(fixtureScript, parameters);
}
- //endregion
+
- //region > recreateObjectsAndReturnFirst
+ // -- recreateObjectsAndReturnFirst
@Action(
restrictTo = RestrictTo.PROTOTYPING
@@ -221,19 +221,19 @@ public class FixtureScriptsDefault extends FixtureScripts {
return getSpecification().getRecreateScriptClass() == null;
}
- //endregion
+
- //region > helpers
+ // -- helpers
private boolean hideIfPolicyNot(final FixtureScriptsSpecification.DropDownPolicy requiredPolicy) {
return fixtureScriptsSpecificationProvider == null || getSpecification().getRunScriptDropDownPolicy() != requiredPolicy;
}
- //endregion
+
- //region > injected services
+ // -- injected services
@javax.inject.Inject
FixtureScriptsSpecificationProvider fixtureScriptsSpecificationProvider;
@javax.inject.Inject
EventBusService eventBusService;
- //endregion
+
}
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
index f659b7f..9e2b7d0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.internal.collections._Lists;
@Value
public final class TranslatableString {
- //region > tr, trn (factory methods); constructor
+ // -- tr, trn (factory methods); constructor
/**
* A translatable string with a single pattern for both singular and plural forms.
@@ -105,9 +105,9 @@ public final class TranslatableString {
this.argumentsByParameterName = argumentsByParameterName;
}
- //endregion
+
- //region > singularText, pluralText, pluralForm
+ // -- singularText, pluralText, pluralForm
private final String singularText;
private final String pluralText;
@@ -159,9 +159,9 @@ public final class TranslatableString {
boolean isPluralForm() {
return type == Type.TRN;
}
- //endregion
+
- //region > argumentsByParameterName
+ // -- argumentsByParameterName
private final Map<String, Object> argumentsByParameterName;
/**
@@ -170,9 +170,9 @@ public final class TranslatableString {
Map<String, Object> getArgumentsByParameterName() {
return argumentsByParameterName;
}
- //endregion
+
- //region > translate
+ // -- translate
/**
* Translates this string using the provided {@link org.apache.isis.applib.services.i18n.TranslationService}, selecting
@@ -236,9 +236,9 @@ public final class TranslatableString {
return String.format(formatter.toString(), valueList.toArray());
}
- //endregion
+
- //region > equals, hashCode, toString
+ // -- equals, hashCode, toString
@Override
public boolean equals(final Object o) {
@@ -269,6 +269,6 @@ public final class TranslatableString {
return type.toString(this);
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index 32ae4fb..de1bf0c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -80,7 +80,7 @@ import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCal
@Value
public class Interaction implements HasTransactionId {
- //region > transactionId (property)
+ // -- transactionId (property)
private UUID transactionId;
@@ -95,9 +95,9 @@ public class Interaction implements HasTransactionId {
public void setTransactionId(final UUID transactionId) {
this.transactionId = transactionId;
}
- //endregion
+
- //region > push/pop/current/get/clear Execution(s)
+ // -- push/pop/current/get/clear Execution(s)
private final List<Execution<?,?>> executionGraphs = _Lists.newArrayList();
private Execution<?,?> currentExecution;
@@ -271,9 +271,9 @@ public class Interaction implements HasTransactionId {
public void clear() {
executionGraphs.clear();
}
- //endregion
+
- //region > next (programmatic)
+ // -- next (programmatic)
/**
* Enumerates the different reasons why multiple occurrences of a certain type might occur within a single
@@ -325,7 +325,7 @@ public class Interaction implements HasTransactionId {
return next.get();
}
- //endregion
+
/**
* Represents an action invocation/property edit as a node in a call-stack execution graph, with sub-interactions
@@ -333,7 +333,7 @@ public class Interaction implements HasTransactionId {
*/
public static abstract class Execution<T extends MemberExecutionDto, E extends AbstractDomainEvent<?>> {
- //region > fields, constructor
+ // -- fields, constructor
private final String memberIdentifier;
private final Object target;
@@ -356,9 +356,9 @@ public class Interaction implements HasTransactionId {
this.targetMember = targetMember;
this.targetClass = targetClass;
}
- //endregion
+
- //region > via constructor: interaction, interactionType, memberId, target, targetMember, targetClass
+ // -- via constructor: interaction, interactionType, memberId, target, targetMember, targetClass
@Programmatic
public Interaction getInteraction() {
@@ -400,9 +400,9 @@ public class Interaction implements HasTransactionId {
return targetMember;
}
- //endregion
+
- //region > parent, children
+ // -- parent, children
private final List<Execution<?,?>> children = _Lists.newArrayList();
private Execution<?,?> parent;
@@ -433,10 +433,10 @@ public class Interaction implements HasTransactionId {
public List<Execution<?,?>> getChildren() {
return Collections.unmodifiableList(children);
}
- //endregion
+
- //region > event
+ // -- event
private E event;
/**
@@ -461,9 +461,9 @@ public class Interaction implements HasTransactionId {
public void setEvent(final E event) {
this.event = event;
}
- //endregion
+
- //region > startedAt, completedAt
+ // -- startedAt, completedAt
private Timestamp startedAt;
private Timestamp completedAt;
@@ -497,9 +497,9 @@ public class Interaction implements HasTransactionId {
syncMetrics(When.AFTER, completedAt);
}
- //endregion
+
- //region > returned, threw (properties)
+ // -- returned, threw (properties)
private Object returned;
/**
@@ -541,9 +541,9 @@ public class Interaction implements HasTransactionId {
}
- //endregion
+
- //region > dto (property)
+ // -- dto (property)
private T dto;
@@ -569,9 +569,9 @@ public class Interaction implements HasTransactionId {
this.dto = executionDto;
}
- //endregion
+
- //region > helpers (syncMetrics)
+ // -- helpers (syncMetrics)
enum When {
BEFORE {
@@ -616,7 +616,7 @@ public class Interaction implements HasTransactionId {
};
- //region > helpers
+ // -- helpers
private static DifferenceDto numberObjectsDirtiedFor(final ObjectCountsDto objectCountsDto) {
return MemberExecutionDtoUtils.numberObjectsDirtiedFor(objectCountsDto);
@@ -637,7 +637,7 @@ public class Interaction implements HasTransactionId {
private static PeriodDto timingsFor(final MetricsDto metricsDto) {
return MemberExecutionDtoUtils.timingsFor(metricsDto);
}
- //endregion
+
abstract void syncMetrics(
final Execution<?, ?> teExecution,
@@ -654,7 +654,7 @@ public class Interaction implements HasTransactionId {
when.syncMetrics(this, timestamp, numberObjectsLoaded, numberObjectsDirtied);
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
new file mode 100644
index 0000000..8feb717
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.isis.applib.services.queryresultscache;
+
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+
+/**
+ * This service (API and implementation) provides a mechanism by which idempotent query results can be cached for the duration of an interaction.
+ * Most commonly this allows otherwise "naive" - eg that makes a repository call many times within a loop - to
+ * be performance tuned. The benefit is that the algorithm of the business logic can remain easy to understand.
+ *
+ * <p>
+ * This implementation has no UI and there is only one implementation (this class) in applib, it is annotated with
+ * {@link org.apache.isis.applib.annotation.DomainService}. This means that it is automatically registered and
+ * available for use; no further configuration is required.
+ */
+public interface QueryResultsCache {
+
+ // -- KEY
+
+ public static class Key {
+ private final Class<?> callingClass;
+ private final String methodName;
+ private final Object[] keys;
+
+ public Key(Class<?> callingClass, String methodName, Object... keys) {
+ this.callingClass = callingClass;
+ this.methodName = methodName;
+ this.keys = keys;
+ }
+
+ public Class<?> getCallingClass() {
+ return callingClass;
+ }
+ public String getMethodName() {
+ return methodName;
+ }
+ public Object[] getKeys() {
+ return keys;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Key other = (Key) obj;
+
+ // compare callingClass
+ if (callingClass == null) {
+ if (other.callingClass != null)
+ return false;
+ } else if (!callingClass.equals(other.callingClass))
+ return false;
+
+ // compare methodName
+ if (methodName == null) {
+ if (other.methodName != null)
+ return false;
+ } else if (!methodName.equals(other.methodName))
+ return false;
+
+ // compare keys
+ if (!Arrays.equals(keys, other.keys))
+ return false;
+
+ // ok, matches
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((callingClass == null) ? 0 : callingClass.hashCode());
+ result = prime * result + Arrays.hashCode(keys);
+ result = prime * result + ((methodName == null) ? 0 : methodName.hashCode());
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return callingClass.getName() + "#" + methodName + Arrays.toString(keys);
+ }
+ }
+
+ // -- VALUE
+
+ public static class Value<T> {
+ private T result;
+ public Value(T result) {
+ this.result = result;
+ }
+ public T getResult() {
+ return result;
+ }
+ }
+
+ // -- INTERFACE
+
+ public <T> T execute(Callable<T> callable, Class<?> callingClass, String methodName, Object... keys);
+
+ public void resetForNextTransaction();
+
+}
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
index 7dbcb4f..88c9275 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
@@ -42,7 +42,7 @@ public final class ChangesDtoUtils {
getJaxbContext();
}
- //region > marshalling
+ // -- marshalling
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
if(jaxbContext == null) {
@@ -88,15 +88,15 @@ public final class ChangesDtoUtils {
throw new RuntimeException(e);
}
}
- //endregion
+
- //region > debugging (dump)
+ // -- debugging (dump)
public static void dump(final ChangesDto changesDto, final PrintStream out) throws JAXBException {
out.println(toXml(changesDto));
}
- //endregion
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
index d3f8347..8139d68 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
@@ -45,7 +45,7 @@ public final class CommandDtoUtils {
getJaxbContext();
}
- //region > marshalling
+ // -- marshalling
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
if(jaxbContext == null) {
@@ -92,7 +92,7 @@ public final class CommandDtoUtils {
}
}
- //endregion
+
public static OidsDto targetsFor(final CommandDto dto) {
OidsDto targets = dto.getTargets();
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
index f6670b7..50854bd 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/CommonDtoUtils.java
@@ -107,9 +107,9 @@ public final class CommonDtoUtils {
// assume reference otherwise
return ValueType.REFERENCE;
}
- //endregion
+
- //region > newValueDto, setValueOn
+ // -- newValueDto, setValueOn
public static ValueDto newValueDto(
final ValueType valueType,
@@ -294,9 +294,9 @@ public final class CommonDtoUtils {
}
return collectionDto;
}
- //endregion
+
- //region > getValue (from valueDto)
+ // -- getValue (from valueDto)
public static <T> T getValue(
final ValueDto valueDto,
@@ -379,9 +379,9 @@ public final class CommonDtoUtils {
}
}
- //endregion
+
- //region > newValueWithTypeDto
+ // -- newValueWithTypeDto
public static ValueWithTypeDto newValueWithTypeDto(
@@ -397,9 +397,9 @@ public final class CommonDtoUtils {
return valueWithTypeDto;
}
- //endregion
+
- //region > getValue (from ValueWithTypeDto)
+ // -- getValue (from ValueWithTypeDto)
public static <T> T getValue(final ValueWithTypeDto valueWithTypeDto) {
if(valueWithTypeDto.isNull()) {
@@ -410,10 +410,10 @@ public final class CommonDtoUtils {
}
- //endregion
+
- //region > newParamDto
+ // -- newParamDto
public static ParamDto newParamDto(
final String parameterName,
@@ -438,9 +438,9 @@ public final class CommonDtoUtils {
return paramDto;
}
- //endregion
+
- //region > getValue (from ParamDto)
+ // -- getValue (from ParamDto)
public static <T> T getValue(final ParamDto paramDto) {
if(paramDto.isNull()) {
@@ -450,7 +450,7 @@ public final class CommonDtoUtils {
return CommonDtoUtils.getValue(paramDto, parameterType);
}
- //endregion
+
public static String getMapValue(final MapDto mapDto, final String key) {
if(mapDto == null) {
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
index 625060f..0c50997 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
@@ -61,7 +61,7 @@ public final class InteractionDtoUtils {
}
- //region > marshalling
+ // -- marshalling
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
if(jaxbContext == null) {
@@ -107,9 +107,9 @@ public final class InteractionDtoUtils {
throw new RuntimeException(e);
}
}
- //endregion
+
- //region > newInteractionDto
+ // -- newInteractionDto
/**
* Encapsulates the mechanism for obtaining a {@link MemberExecutionDto} DTO (XML memento) of the provided
@@ -149,7 +149,7 @@ public final class InteractionDtoUtils {
return MemberExecutionDtoUtils.clone(memberExecutionDto);
}
- //endregion
+
};
@@ -217,9 +217,9 @@ public final class InteractionDtoUtils {
- //endregion
+
- //region > newActionInvocation, newPropertyModification
+ // -- newActionInvocation, newPropertyModification
public static ActionInvocationDto newActionInvocation(
final int sequence,
@@ -297,9 +297,9 @@ public final class InteractionDtoUtils {
return objectType + "#" + localMemberId;
}
- //endregion
+
- //region > invocationFor, actionFor, timingsFor
+ // -- invocationFor, actionFor, timingsFor
private static ActionInvocationDto actionInvocationFor(final InteractionDto interactionDto) {
ActionInvocationDto invocation = (ActionInvocationDto) interactionDto.getExecution();
@@ -339,9 +339,9 @@ public final class InteractionDtoUtils {
return parametersFor(invocationDto).getParameter();
}
- //endregion
+
- //region > addParamArg
+ // -- addParamArg
public static void addParamArg(
final InteractionDto interactionDto,
@@ -354,9 +354,9 @@ public final class InteractionDtoUtils {
ParamDto paramDto = CommonDtoUtils.newParamDto(parameterName, parameterType, arg, bookmarkService);
params.add(paramDto);
}
- //endregion
+
- //region > addReturn
+ // -- addReturn
/**
*
@@ -372,9 +372,9 @@ public final class InteractionDtoUtils {
.newValueWithTypeDto(returnType, result, bookmarkService);
invocationDto.setReturned(returned);
}
- //endregion
+
- //region > getParameters, getParameterNames, getParameterTypes
+ // -- getParameters, getParameterNames, getParameterTypes
public static List<ParamDto> getParameters(final ActionInvocationDto ai) {
final List<ParamDto> params = parameterListFor(ai);
final int parameterNumber = getNumberOfParameters(ai);
@@ -406,9 +406,9 @@ public final class InteractionDtoUtils {
);
}
- //endregion
+
- //region > getParameter, getParameterName, getParameterType, getParameterArgument
+ // -- getParameter, getParameterName, getParameterType, getParameterArgument
public static ParamDto getParameter(final ActionInvocationDto ai, final int paramNum) {
final int parameterNumber = getNumberOfParameters(ai);
if(paramNum > parameterNumber) {
@@ -435,9 +435,9 @@ public final class InteractionDtoUtils {
final ParamDto paramDto = getParameter(ai, paramNum);
return paramDto.isNull();
}
- //endregion
+
- //region > getParameterArgValue
+ // -- getParameterArgValue
public static <T> T getParameterArgValue(final ActionInvocationDto ai, int paramNum, Class<T> inferClass) {
final ParamDto paramDto = getParameter(ai, paramNum);
return CommonDtoUtils.getValue(paramDto);
@@ -446,14 +446,14 @@ public final class InteractionDtoUtils {
final ParamDto paramDto = getParameter(ai, paramNum);
return CommonDtoUtils.getValue(paramDto);
}
- //endregion
+
- //region > debugging (dump)
+ // -- debugging (dump)
public static void dump(final InteractionDto ixnDto, final PrintStream out) throws JAXBException {
out.println(toXml(ixnDto));
}
- //endregion
+
}
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
index 7ec286c..d670ede 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
@@ -68,7 +68,7 @@ import static org.junit.Assert.fail;
@Deprecated
public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServiceProvider {
- //region > Listener, ListenerAdapter
+ // -- Listener, ListenerAdapter
public interface Listener {
void init(IsisConfiguration configuration) throws Exception;
@@ -122,7 +122,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > getElseNull, get, set
+ // -- getElseNull, get, set
private static ThreadLocal<IsisSystemForTest> ISFT = new ThreadLocal<>();
@@ -144,7 +144,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
//endregion
- //region > Builder
+ // -- Builder
public static class Builder {
@@ -231,7 +231,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > constructor, fields
+ // -- constructor, fields
// these fields 'xxxForComponentProvider' are used to initialize the IsisComponentProvider, but shouldn't be used thereafter.
private final AppManifest appManifestIfAny;
@@ -254,7 +254,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > level
+ // -- level
private org.apache.log4j.Level level = org.apache.log4j.Level.INFO;
/**
@@ -270,7 +270,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > setup (also componentProvider)
+ // -- setup (also componentProvider)
// populated at #setupSystem
private IsisComponentProvider componentProvider;
@@ -351,7 +351,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > isisSystem (populated during setup)
+ // -- isisSystem (populated during setup)
private IsisSessionFactory isisSessionFactory;
/**
@@ -370,7 +370,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > teardown
+ // -- teardown
private void closeSession(final FireListeners fireListeners) throws Exception {
if(fireListeners.shouldFire()) {
@@ -393,7 +393,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > openSession, closeSession
+ // -- openSession, closeSession
public void openSession() throws Exception {
openSession(authenticationSession);
@@ -409,7 +409,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > listeners
+ // -- listeners
private List <Listener> listeners;
@@ -464,7 +464,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
//endregion
- //region > JUnit @Rule integration
+ // -- JUnit @Rule integration
@Override
public Statement apply(final Statement base, final Description description) {
@@ -489,7 +489,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > beginTran, endTran, commitTran, abortTran
+ // -- beginTran, endTran, commitTran, abortTran
/**
* @deprecated - ought to be using regular domain services rather than reaching into the framework
@@ -623,7 +623,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > getService, replaceService
+ // -- getService, replaceService
/* (non-Javadoc)
* @see org.apache.isis.core.integtestsupport.ServiceProvider#getService(java.lang.Class)
@@ -643,7 +643,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > Fixture management (for each test, rather than at bootstrap)
+ // -- Fixture management (for each test, rather than at bootstrap)
/**
* @deprecated - use {@link org.apache.isis.applib.fixturescripts.FixtureScripts} domain service instead.
@@ -673,7 +673,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
- //region > Dependencies
+ // -- Dependencies
private IsisTransactionManager getTransactionManager() {
return getPersistenceSession().getTransactionManager();
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
index 8e82b0a..9b20c63 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
@@ -103,7 +103,7 @@ public abstract class IsisMojoAbstract extends AbstractMojo {
final IsisSessionFactory isisSessionFactory)
throws MojoFailureException, IOException;
- //region > Context
+ // -- Context
static class ContextForMojo implements MetaModelProcessor.Context {
private final MavenProject mavenProject;
diff --git a/core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceLegacyInternalDefault.java b/core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceLegacyInternalDefault.java
index 3d8cd06..ffca0b3 100644
--- a/core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceLegacyInternalDefault.java
+++ b/core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceLegacyInternalDefault.java
@@ -143,7 +143,7 @@ public class RepositoryServiceLegacyInternalDefault implements RepositoryService
// //////////////////////////////////////
- //region > allInstances, allMatches, uniqueMatch, firstMatch
+ // -- allInstances, allMatches, uniqueMatch, firstMatch
@Programmatic
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
index ef79758..3ccfc13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
@@ -41,7 +41,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
private static final long serialVersionUID = 1L;
- //region > Constructor, fields
+ // -- Constructor, fields
private final String name;
private final List<String> roles = new ArrayList<String>();
@@ -75,7 +75,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
//endregion
- //region > encode
+ // -- encode
@Override
public void encode(final DataOutputExtended output) throws IOException {
@@ -86,7 +86,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
//endregion
- //region > User Name
+ // -- User Name
@Override
public String getUserName() {
@@ -100,7 +100,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
//endregion
- //region > Roles
+ // -- Roles
/**
* Can be overridden.
@@ -112,7 +112,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
//endregion
- //region > Validation Code
+ // -- Validation Code
@Override
public String getValidationCode() {
@@ -121,7 +121,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
//endregion
- //region > Attributes
+ // -- Attributes
@Override
public Object getAttribute(final String attributeName) {
@@ -135,7 +135,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
//endregion
- //region > MessageBroker
+ // -- MessageBroker
@Override
public MessageBroker getMessageBroker() {
@@ -144,7 +144,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
//endregion
- //region > createUserMemento
+ // -- createUserMemento
@Override
public UserMemento createUserMemento() {
@@ -157,7 +157,7 @@ public abstract class AuthenticationSessionAbstract implements AuthenticationSes
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/MessageBroker.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/MessageBroker.java
index 830353e..c3559fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/MessageBroker.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/MessageBroker.java
@@ -30,7 +30,7 @@ public class MessageBroker implements Serializable {
private static final long serialVersionUID = 1L;
- //region > constructor, fields
+ // -- constructor, fields
private final List<String> messages = Lists.newArrayList();
private final List<String> warnings = Lists.newArrayList();
@@ -40,7 +40,7 @@ public class MessageBroker implements Serializable {
}
//endregion
- //region > reset
+ // -- reset
public void reset() {
warnings.clear();
@@ -50,7 +50,7 @@ public class MessageBroker implements Serializable {
//endregion
- //region > messages
+ // -- messages
public List<String> getMessages() {
return copyAndClear(messages);
@@ -62,7 +62,7 @@ public class MessageBroker implements Serializable {
//endregion
- //region > warnings
+ // -- warnings
public List<String> getWarnings() {
return copyAndClear(warnings);
@@ -78,7 +78,7 @@ public class MessageBroker implements Serializable {
//endregion
- //region > applicationError
+ // -- applicationError
public String getApplicationError() {
final String error = applicationError;
setApplicationError(null);
@@ -91,7 +91,7 @@ public class MessageBroker implements Serializable {
//endregion
- //region > helpers
+ // -- helpers
private List<String> copyAndClear(final List<String> messages) {
final List<String> copy = Collections.unmodifiableList(new ArrayList<>(messages));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
index e730cce..7b5c441 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
public abstract class InstallerAbstract implements Installer {
- //region > constructor, fields
+ // -- constructor, fields
private final String name;
private final IsisConfiguration isisConfiguration;
@@ -61,7 +61,7 @@ public abstract class InstallerAbstract implements Installer {
}
//endregion
- //region > init, shutdown
+ // -- init, shutdown
/**
* Default implementation does nothing.
@@ -79,7 +79,7 @@ public abstract class InstallerAbstract implements Installer {
//endregion
- //region > helpers (for subclasses)
+ // -- helpers (for subclasses)
/**
* Helper for subclasses implementing {@link #getTypes()}.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
index acd2d76..8483776 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
@@ -469,7 +469,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
}
- //region > ConfigurationService impl
+ // -- ConfigurationService impl
@Override
public String getProperty(final String name) {
initAppPropertiesIfRequired();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
index 725b646..1152983 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
@@ -69,7 +69,7 @@ public final class IsisConfigurationBuilder {
private static final Logger LOG = LoggerFactory.getLogger(IsisConfigurationBuilder.class);
- //region > constructor, fields
+ // -- constructor, fields
private final ResourceStreamSourceChainOfResponsibility resourceStreamSourceChain;
@@ -162,7 +162,7 @@ public final class IsisConfigurationBuilder {
//endregion
- //region > addResourceStreamSource, addResourceStreamSources
+ // -- addResourceStreamSource, addResourceStreamSources
public void addResourceStreamSource(final ResourceStreamSource resourceStreamSource) {
addResourceStreamSources(resourceStreamSource);
@@ -181,7 +181,7 @@ public final class IsisConfigurationBuilder {
//endregion
- //region > addConfigurationResource
+ // -- addConfigurationResource
/**
* Registers the configuration resource (usually, a file) with the specified
@@ -251,7 +251,7 @@ public final class IsisConfigurationBuilder {
//endregion
- //region > add, put
+ // -- add, put
/**
* Adds additional property; if already present then will _not_ be replaced.
@@ -272,7 +272,7 @@ public final class IsisConfigurationBuilder {
//endregion
- //region > parseAndPrimeWith, primeWith
+ // -- parseAndPrimeWith, primeWith
public boolean parseAndPrimeWith(final List<OptionHandler> optionHandlers, final String[] args) {
@@ -325,7 +325,7 @@ public final class IsisConfigurationBuilder {
//endregion
- //region > getConfiguration, peekConfiguration, isLocked
+ // -- getConfiguration, peekConfiguration, isLocked
/**
* Returns the {@link IsisConfiguration}; this will cause the configuration to be locked
@@ -369,7 +369,7 @@ public final class IsisConfigurationBuilder {
//endregion
- //region > dumpResourcesToLog, toString
+ // -- dumpResourcesToLog, toString
/**
* Log a summary of resources found or not found.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java
index 749e467..144dabe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java
@@ -87,12 +87,12 @@ public final class OidMarshaller {
private OidMarshaller(){}
- //region > public constants
+ // -- public constants
public static final String VIEWMODEL_INDICATOR =
Bookmark.ObjectState.VIEW_MODEL.getCode(); // "*"
//endregion
- //region > private constants
+ // -- private constants
private static final String TRANSIENT_INDICATOR =
Bookmark.ObjectState.TRANSIENT.getCode() ; // "!"
@@ -128,7 +128,7 @@ public final class OidMarshaller {
"$");
//endregion
- //region > join, split
+ // -- join, split
@Programmatic
public String joinAsOid(String domainType, String instanceId) {
return domainType + SEPARATOR + instanceId;
@@ -142,7 +142,7 @@ public final class OidMarshaller {
//endregion
- //region > unmarshal
+ // -- unmarshal
@Programmatic
@SuppressWarnings("unchecked")
@@ -242,7 +242,7 @@ public final class OidMarshaller {
//endregion
- //region > marshal
+ // -- marshal
@Programmatic
public final String marshal(RootOid rootOid) {
return marshalNoVersion(rootOid) + marshal(rootOid.getVersion());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
index 32215cb..5464e9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
@@ -38,7 +38,7 @@ import org.apache.isis.schema.common.v1.OidDto;
public class RootOid implements TypedOid, Serializable {
- //region > fields
+ // -- fields
private final static Logger LOG = LoggerFactory.getLogger(RootOid.class);
private static final long serialVersionUID = 1L;
@@ -56,7 +56,7 @@ public class RootOid implements TypedOid, Serializable {
private int cachedHashCode;
//endregion
- //region > Constructor, factory methods
+ // -- Constructor, factory methods
public static RootOid createTransient(final ObjectSpecId objectSpecId, final String identifier) {
return new RootOid(objectSpecId, identifier, State.TRANSIENT);
}
@@ -139,7 +139,7 @@ public class RootOid implements TypedOid, Serializable {
//endregion
- //region > Encodeable
+ // -- Encodeable
public RootOid(final DataInputExtended input) throws IOException {
final String oidStr = input.readUTF();
final RootOid oid = OID_MARSHALLER.unmarshal(oidStr, RootOid.class);
@@ -158,7 +158,7 @@ public class RootOid implements TypedOid, Serializable {
//endregion
- //region > deString'able, enString
+ // -- deString'able, enString
public static RootOid deStringEncoded(final String urlEncodedOidStr) {
final String oidStr = UrlDecoderUtil.urlDecode(urlEncodedOidStr);
return deString(oidStr);
@@ -179,7 +179,7 @@ public class RootOid implements TypedOid, Serializable {
}
//endregion
- //region > Properties
+ // -- Properties
public ObjectSpecId getObjectSpecId() {
return objectSpecId;
}
@@ -205,7 +205,7 @@ public class RootOid implements TypedOid, Serializable {
//endregion
- //region > Version
+ // -- Version
public Version getVersion() {
return version;
@@ -217,7 +217,7 @@ public class RootOid implements TypedOid, Serializable {
}
//endregion
- //region > asBookmark, asOidDto
+ // -- asBookmark, asOidDto
public Bookmark asBookmark() {
final String objectType = state.asBookmarkObjectState().getCode() + getObjectSpecId().asString();
final String identifier = getIdentifier();
@@ -242,7 +242,7 @@ public class RootOid implements TypedOid, Serializable {
//endregion
- //region > equals, hashCode
+ // -- equals, hashCode
private void cacheState() {
cachedHashCode = 17;
@@ -276,7 +276,7 @@ public class RootOid implements TypedOid, Serializable {
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
return enString();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
index 2eff19a..126cc9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
@@ -51,7 +51,7 @@ public class Version implements Serializable, Encodable {
private final static OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
- //region > factory methods
+ // -- factory methods
public static Version create(final Long sequence) {
return create(sequence, null, (Long)null);
@@ -77,7 +77,7 @@ public class Version implements Serializable, Encodable {
//endregion
- //region > constructor, fields
+ // -- constructor, fields
private final Long sequence;
private final String user;
private final Long utcTimestamp;
@@ -90,7 +90,7 @@ public class Version implements Serializable, Encodable {
//endregion
- //region > encodable
+ // -- encodable
public Version(final DataInputExtended input) throws IOException {
this(input.readLong(), input.readUTF(), input.readLong());
@@ -106,7 +106,7 @@ public class Version implements Serializable, Encodable {
//endregion
- //region > getters
+ // -- getters
/**
* The internal, strictly monotonically increasing, version number.
*
@@ -153,7 +153,7 @@ public class Version implements Serializable, Encodable {
//endregion
- //region > enString
+ // -- enString
public String enString() {
return OID_MARSHALLER.marshal(this);
@@ -161,7 +161,7 @@ public class Version implements Serializable, Encodable {
//endregion
- //region > equals, hashCode
+ // -- equals, hashCode
@Override
public int hashCode() {
@@ -202,7 +202,7 @@ public class Version implements Serializable, Encodable {
//endregion
- //region > sequence
+ // -- sequence
@Override
public String toString() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
index 351f025..139750c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
@@ -51,7 +51,7 @@ public class DomainEventHelper {
this.servicesInjector = servicesInjector;
}
- //region > postEventForAction, newActionDomainEvent
+ // -- postEventForAction, newActionDomainEvent
@SuppressWarnings({ "rawtypes" })
public ActionDomainEvent<?> postEventForAction(
final AbstractDomainEvent.Phase phase,
@@ -173,7 +173,7 @@ public class DomainEventHelper {
}
//endregion
- //region > postEventForProperty, newPropertyInteraction
+ // -- postEventForProperty, newPropertyInteraction
public PropertyDomainEvent<?, ?> postEventForProperty(
final AbstractDomainEvent.Phase phase,
final Class eventType,
@@ -262,7 +262,7 @@ public class DomainEventHelper {
}
//endregion
- //region > postEventForCollection, newCollectionDomainEvent
+ // -- postEventForCollection, newCollectionDomainEvent
public CollectionDomainEvent<?, ?> postEventForCollection(
AbstractDomainEvent.Phase phase,
@@ -393,7 +393,7 @@ public class DomainEventHelper {
//endregion
- //region > eventBusService
+ // -- eventBusService
private EventBusService getEventBusService() {
// previously this method used to cache, however it prevents integration tests
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
index 299086a..a4f2ea5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
@@ -57,7 +57,7 @@ public abstract class FacetFactoryAbstract implements FacetFactory, ServicesInje
public void processParams(final ProcessParameterContext processParameterContext) {
}
- //region > dependencies (injected)
+ // -- dependencies (injected)
protected ServicesInjector servicesInjector;
@@ -67,7 +67,7 @@ public abstract class FacetFactoryAbstract implements FacetFactory, ServicesInje
}
//endregion
- //region > dependencies (looked up from services injector)
+ // -- dependencies (looked up from services injector)
protected SpecificationLoader getSpecificationLoader() {
return servicesInjector.getSpecificationLoader();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
index 95baea3..bfd7c5a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
@@ -91,7 +91,7 @@ public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactor
FacetUtil.addFacet(cssClassFacet);
}
- //region > cssClassFromPattern
+ // -- cssClassFromPattern
private final static Pattern CSS_CLASS_REGEX_PATTERN = Pattern.compile("([^:]+):(.+)");
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
index 837f56a..feff156 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
@@ -72,7 +72,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
public static final String KEY_SET_PREFIX = "isis.services.injector.setPrefix";
public static final String KEY_INJECT_PREFIX = "isis.services.injector.injectPrefix";
- //region > constructor, fields
+ // -- constructor, fields
/**
* This is mutable internally, but only ever exposed (in {@link #getRegisteredServices()}) as immutable.
*/
@@ -130,7 +130,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
//endregion
- //region > replaceServices
+ // -- replaceServices
/**
* Update an individual service.
@@ -232,7 +232,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
//endregion
- //region > injectServicesInto
+ // -- injectServicesInto
/**
* Provided by the <tt>ServicesInjector</tt> when used by framework.
@@ -257,7 +257,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
//endregion
- //region > injectInto
+ // -- injectInto
/**
* That is, injecting this injector...
@@ -271,7 +271,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
//endregion
- //region > helpers
+ // -- helpers
private void injectServices(final Object object, final List<Object> services) {
@@ -427,7 +427,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
- //region > autoWire
+ // -- autoWire
@Programmatic
public void autowire() {
@@ -437,7 +437,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
//endregion
- //region > lookupService, lookupServices
+ // -- lookupService, lookupServices
/**
* Returns the first registered domain service implementing the requested type.
@@ -510,7 +510,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
//endregion
- //region > convenience lookups (singletons only, cached)
+ // -- convenience lookups (singletons only, cached)
private AuthenticationManager authenticationManager;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
index e7db7c3..e4e4f00 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
@@ -53,7 +53,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<ApplicationFeature> {}
- //region > constants
+ // -- constants
// using same value for all to neaten up rendering
public static final int TYPICAL_LENGTH_PKG_FQN = 50;
@@ -61,7 +61,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
public static final int TYPICAL_LENGTH_MEMBER_NAME = 50;
//endregion
- //region > constructors
+ // -- constructors
public ApplicationFeature() {
this(null);
}
@@ -70,7 +70,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > featureId
+ // -- featureId
private ApplicationFeatureId featureId;
@Programmatic
@@ -83,7 +83,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > memberType
+ // -- memberType
private ApplicationMemberType memberType;
/**
@@ -99,7 +99,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > returnTypeName (for: properties, collections, actions)
+ // -- returnTypeName (for: properties, collections, actions)
private String returnTypeName;
/**
@@ -115,7 +115,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > contributed (for: properties, collections, actions)
+ // -- contributed (for: properties, collections, actions)
private boolean contributed;
@Programmatic
@@ -128,7 +128,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > derived (properties and collections)
+ // -- derived (properties and collections)
private Boolean derived;
/**
@@ -144,7 +144,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > propertyMaxLength (properties only)
+ // -- propertyMaxLength (properties only)
private Integer propertyMaxLength;
/**
@@ -160,7 +160,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > propertyTypicalLength (properties only)
+ // -- propertyTypicalLength (properties only)
private Integer propertyTypicalLength;
/**
@@ -176,7 +176,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > actionSemantics (actions only)
+ // -- actionSemantics (actions only)
private SemanticsOf actionSemantics;
/**
@@ -192,7 +192,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > packages: Contents
+ // -- packages: Contents
private final SortedSet<ApplicationFeatureId> contents = Sets.newTreeSet();
@Programmatic
@@ -209,7 +209,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > classes: Properties, Collections, Actions
+ // -- classes: Properties, Collections, Actions
private final SortedSet<ApplicationFeatureId> properties = Sets.newTreeSet();
@Programmatic
@@ -257,7 +257,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- //region > Functions
+ // -- Functions
public static class Functions {
private Functions(){}
@@ -291,7 +291,7 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
//endregion
- //region > equals, hashCode, compareTo, toString
+ // -- equals, hashCode, compareTo, toString
private final static Comparator<ApplicationFeature> comparator =
Comparator.comparing(ApplicationFeature::getFeatureId);
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 76a81fc..6965878 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
@@ -57,7 +57,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > factory methods
+ // -- factory methods
public static ApplicationFeatureId newFeature(final ApplicationFeatureType featureType, final String fullyQualifiedName) {
switch (featureType) {
case PACKAGE:
@@ -125,7 +125,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > constructor
+ // -- constructor
private ApplicationFeatureId(final String asString) {
final Iterator<String> iterator = Splitter.on(":").split(asString).iterator();
@@ -149,7 +149,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > identification
+ // -- identification
/**
* having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use
* wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
@@ -163,7 +163,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > fullyQualifiedName (property)
+ // -- fullyQualifiedName (property)
@Programmatic
public String getFullyQualifiedName() {
@@ -180,7 +180,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
//endregion
- //region > objectSpecId (property)
+ // -- objectSpecId (property)
@Programmatic
public ObjectSpecId getObjectSpecId() {
@@ -201,7 +201,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > type (property)
+ // -- type (property)
ApplicationFeatureType type;
public ApplicationFeatureType getType() {
@@ -211,7 +211,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > packageName (property)
+ // -- packageName (property)
private String packageName;
@Programmatic
@@ -226,7 +226,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > className (property, optional)
+ // -- className (property, optional)
private String className;
@@ -242,7 +242,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > memberName (property, optional)
+ // -- memberName (property, optional)
private String memberName;
@Programmatic
@@ -257,7 +257,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > Package or Class: getParentPackageId
+ // -- Package or Class: getParentPackageId
/**
* The {@link ApplicationFeatureId id} of the parent package of this
@@ -290,7 +290,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > Member: getParentClassId
+ // -- Member: getParentClassId
/**
* The {@link ApplicationFeatureId id} of the member's class.
@@ -304,7 +304,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > asString, asEncodedString
+ // -- asString, asEncodedString
@Programmatic
public String asString() {
@@ -332,7 +332,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > Functions
+ // -- Functions
public static class Functions {
@@ -357,7 +357,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > Predicates
+ // -- Predicates
public static class Predicates {
private Predicates(){}
@@ -392,7 +392,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > Comparators
+ // -- Comparators
public static final class Comparators {
private Comparators(){}
public static Comparator<ApplicationFeatureId> natural() {
@@ -411,7 +411,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > pathIds, parentIds
+ // -- pathIds, parentIds
@Programmatic
public List<ApplicationFeatureId> getPathIds() {
@@ -443,7 +443,7 @@ public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, S
// //////////////////////////////////////
- //region > equals, hashCode, compareTo, toString
+ // -- equals, hashCode, compareTo, toString
private final static Ordering<ApplicationFeatureId> byType = Ordering.natural()
.nullsFirst().onResultOf(new Function<ApplicationFeatureId, ApplicationFeatureType>() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index e7c5417..c24d774 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -64,7 +64,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
)
public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRepository {
- //region > caches
+ // -- caches
SortedMap<ApplicationFeatureId, ApplicationFeature> packageFeatures = Maps.newTreeMap();
private final SortedMap<ApplicationFeatureId, ApplicationFeature> classFeatures = Maps.newTreeMap();
private final SortedMap<ApplicationFeatureId, ApplicationFeature> memberFeatures = Maps.newTreeMap();
@@ -74,7 +74,7 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
//endregion
- //region > init
+ // -- init
private static final String KEY = "isis.services.applicationFeatures.init";
@@ -95,7 +95,7 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
//endregion
- //region > initializeIfRequired
+ // -- initializeIfRequired
enum InitializationState {
NOT_INITIALIZED,
@@ -388,7 +388,7 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
}
//endregion
- //region > packageFeatures, classFeatures, memberFeatures
+ // -- packageFeatures, classFeatures, memberFeatures
@Programmatic
public ApplicationFeature findFeature(final ApplicationFeatureId featureId) {
initializeIfRequired();
@@ -423,7 +423,7 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
//endregion
- //region > allFeatures, allPackages, allClasses, allMembers
+ // -- allFeatures, allPackages, allClasses, allMembers
@Programmatic
public Collection<ApplicationFeature> allFeatures(final ApplicationFeatureType featureType) {
initializeIfRequired();
@@ -478,7 +478,7 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
}
//endregion
- //region > packageNames, packageNamesContainingClasses, classNamesContainedIn, memberNamesOf
+ // -- packageNames, packageNamesContainingClasses, classNamesContainedIn, memberNamesOf
@Override @Programmatic
public List<String> packageNames() {
initializeIfRequired();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 48f669a..244f538 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -54,7 +54,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public class DomainObjectContainerDefault implements DomainObjectContainer {
- //region > newViewModelInstance
+ // -- newViewModelInstance
@Programmatic
@SuppressWarnings("unchecked")
@@ -74,7 +74,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer {
//endregion
- //region > remove
+ // -- remove
@Programmatic
@Override
@@ -93,7 +93,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer {
//endregion
- //region > resolve, objectChanged (DEPRECATED)
+ // -- resolve, objectChanged (DEPRECATED)
/**
* Re-initialises the fields of an object, using the
@@ -142,7 +142,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer {
//endregion
- //region > commit (deprecated)
+ // -- commit (deprecated)
/**
* @deprecated
@@ -156,7 +156,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer {
//endregion
- //region > isValid, validate
+ // -- isValid, validate
@Programmatic
@Override
@@ -176,7 +176,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer {
//endregion
- //region > isViewModel
+ // -- isViewModel
@Programmatic
@Override
@@ -186,7 +186,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer {
}
//endregion
- //region > persistence
+ // -- persistence
/**
@@ -221,7 +221,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer {
- //region > helpers
+ // -- helpers
private Object unwrapped(Object domainObject) {
return wrapperFactory != null ? wrapperFactory.unwrap(domainObject) : domainObject;
@@ -229,7 +229,7 @@ public class DomainObjectContainerDefault implements DomainObjectContainer {
//endregion
- //region > service dependencies
+ // -- service dependencies
@javax.inject.Inject
SpecificationLoader specificationLoader;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
index ae01c84..7917755 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault.java
@@ -42,7 +42,7 @@ public class ExceptionRecognizerDocDefault
implements ExceptionRecognizer {
- //region > init, shutdown
+ // -- init, shutdown
@Programmatic
@PostConstruct
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 95cc52f..d97b208 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -226,7 +226,7 @@ public class GridLoaderServiceDefault implements GridLoaderService {
}
- //region > injected dependencies
+ // -- injected dependencies
@javax.inject.Inject
DeploymentCategoryProvider deploymentCategoryProvider;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
index bfcc89c..09d88f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
public interface PersistenceSessionServiceInternal extends AdapterManager {
- //region > instantiate
+ // -- instantiate
/**
* Provided by the <tt>PersistenceSession</tt> when used by framework.
@@ -48,7 +48,7 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
//endregion
- //region > retrieve
+ // -- retrieve
/**
* Provided by <tt>PersistenceSession</tt> when used by framework.
@@ -89,7 +89,7 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
//endregion
- //region > beginTran, flush, commit, currentTransaction
+ // -- beginTran, flush, commit, currentTransaction
@Programmatic
void beginTran();
@@ -127,7 +127,7 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
//endregion
- //region > makePersistent, remove
+ // -- makePersistent, remove
/**
* Provided by the <tt>PersistenceSession</tt> when used by framework.
@@ -151,7 +151,7 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
//endregion
- //region > allMatchingQuery, firstMatchingQuery
+ // -- allMatchingQuery, firstMatchingQuery
/**
* Provided by <tt>PersistenceSession</tt> when used by framework.
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
index 9152d6a..fe536d0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/repository/RepositoryServiceInternalDefault.java
@@ -139,7 +139,7 @@ public class RepositoryServiceInternalDefault implements RepositoryService {
// //////////////////////////////////////
- //region > allInstances, allMatches, uniqueMatch, firstMatch
+ // -- allInstances, allMatches, uniqueMatch, firstMatch
@Programmatic
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 7e8212c..50ef5e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -59,7 +59,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public interface ObjectAction extends ObjectMember {
- //region > getSemantics, getOnType
+ // -- getSemantics, getOnType
/**
* The semantics of this action.
*/
@@ -72,7 +72,7 @@ public interface ObjectAction extends ObjectMember {
ObjectSpecification getOnType();
//endregion
- //region > getType, isPrototype
+ // -- getType, isPrototype
ActionType getType();
@@ -80,7 +80,7 @@ public interface ObjectAction extends ObjectMember {
//endregion
- //region > ReturnType
+ // -- ReturnType
/**
* Returns the specifications for the return type.
*/
@@ -94,7 +94,7 @@ public interface ObjectAction extends ObjectMember {
//endregion
- //region > execute, executeWithRuleChecking
+ // -- execute, executeWithRuleChecking
/**
* Invokes the action's method on the target object given the specified set
@@ -123,7 +123,7 @@ public interface ObjectAction extends ObjectMember {
//endregion
- //region > isProposedArgumentSetValid
+ // -- isProposedArgumentSetValid
/**
* Whether the provided argument set is valid, represented as a {@link Consent}.
@@ -135,7 +135,7 @@ public interface ObjectAction extends ObjectMember {
//endregion
- //region > Parameters (declarative)
+ // -- Parameters (declarative)
/**
* Returns the number of parameters used by this method.
@@ -177,7 +177,7 @@ public interface ObjectAction extends ObjectMember {
//endregion
- //region > Parameters (per instance)
+ // -- Parameters (per instance)
/**
* Returns the defaults references/values to be used for the action.
@@ -194,7 +194,7 @@ public interface ObjectAction extends ObjectMember {
//endregion
- //region > setupBulkActionInvocationContext
+ // -- setupBulkActionInvocationContext
/**
* internal API, called by {@link ActionInvocationFacet} if the action is actually executed (ie in the foreground).
*/
@@ -204,7 +204,7 @@ public interface ObjectAction extends ObjectMember {
//endregion
- //region > Util
+ // -- Util
public static final class Util {
final static MemberOrderFacetComparator memberOrderFacetComparator = new MemberOrderFacetComparator(false);
@@ -372,7 +372,7 @@ public interface ObjectAction extends ObjectMember {
//endregion
- //region > Predicates
+ // -- Predicates
public static final class Predicates {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ServiceInitializer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ServiceInitializer.java
index bc40691..eef850a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ServiceInitializer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ServiceInitializer.java
@@ -45,7 +45,7 @@ public class ServiceInitializer {
this.services = services;
}
- //region > validate
+ // -- validate
public void validate() {
@@ -105,7 +105,7 @@ public class ServiceInitializer {
}
//endregion
- //region > postConstruct
+ // -- postConstruct
public void postConstruct() {
if(LOG.isInfoEnabled()) {
@@ -148,7 +148,7 @@ public class ServiceInitializer {
//endregion
- //region > preDestroy
+ // -- preDestroy
public void preDestroy() {
if(LOG.isInfoEnabled()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 32004bc..a8b56e0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -88,7 +88,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
private final static Logger LOG = LoggerFactory.getLogger(SpecificationLoader.class);
- //region > constructor, fields
+ // -- constructor, fields
private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
private final ProgrammingModel programmingModel;
@@ -127,7 +127,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > init
+ // -- init
private boolean initialized = false;
@@ -198,7 +198,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > shutdown
+ // -- shutdown
@Programmatic
public void shutdown() {
@@ -211,7 +211,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > invalidateCache
+ // -- invalidateCache
@Programmatic
public void invalidateCache(final Class<?> cls) {
@@ -247,7 +247,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > validation
+ // -- validation
private ValidationFailures validationFailures;
@@ -271,7 +271,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > loadSpecification, loadSpecifications
+ // -- loadSpecification, loadSpecifications
/**
* Return the specification for the specified class of object.
@@ -474,7 +474,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > allSpecifications
+ // -- allSpecifications
/**
* Returns (a new list holding a copy of) all the loaded specifications.
*
@@ -495,7 +495,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > getServiceClasses, isServiceClass
+ // -- getServiceClasses, isServiceClass
@Programmatic
public List<Class<?>> allServiceClasses() {
@@ -516,7 +516,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > loaded
+ // -- loaded
/**
* Whether this class has been loaded.
*/
@@ -535,7 +535,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//endregion
- //region > lookupBySpecId
+ // -- lookupBySpecId
@Programmatic
public ObjectSpecification lookupBySpecId(ObjectSpecId objectSpecId) {
final ObjectSpecification objectSpecification = cache.getByObjectType(objectSpecId);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java
index 2cb35d5..30650a4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.lang.ClassUtil;
*/
public class ClassSubstitutor {
- //region > constructor
+ // -- constructor
public ClassSubstitutor() {
ignore(DomainObjectContainer.class);
@@ -47,7 +47,7 @@ public class ClassSubstitutor {
}
//endregion
- //region > getClass(Class)
+ // -- getClass(Class)
public Class<?> getClass(final Class<?> cls) {
@@ -83,7 +83,7 @@ public class ClassSubstitutor {
//endregion
- //region > helpers
+ // -- helpers
private final Set<Class<?>> classesToIgnore = Sets.newHashSet();
private final Set<String> classNamesToIgnore = Sets.newHashSet();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
index ecc84dc..bb007b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
@@ -450,7 +450,7 @@ public class FacetProcessor implements ServicesInjectorAware {
}
- //region > dependencies
+ // -- dependencies
private ServicesInjector servicesInjector;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 2d617fb..c77545c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -85,7 +85,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
return type;
}
- //region > fields
+ // -- fields
/**
* Lazily initialized by {@link #getParameters()} (so don't use directly!)
@@ -94,7 +94,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > constructors
+ // -- constructors
public ObjectActionDefault(
final FacetedMethod facetedMethod,
@@ -104,7 +104,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > ReturnType, OnType, Actions (set)
+ // -- ReturnType, OnType, Actions (set)
/**
* Always returns <tt>null</tt>.
*/
@@ -147,7 +147,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > Type
+ // -- Type
@Override
public ActionType getType() {
return getType(this);
@@ -162,7 +162,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
}
//endregion
- //region > Parameters
+ // -- Parameters
@Override
public int getParameterCount() {
@@ -267,7 +267,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > visable, usable
+ // -- visable, usable
@Override
public VisibilityContext<?> createVisibleInteractionContext(
@@ -284,7 +284,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
}
//endregion
- //region > validate
+ // -- validate
@Override
public Consent isProposedArgumentSetValid(
@@ -340,7 +340,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > executeWithRuleChecking, execute
+ // -- executeWithRuleChecking, execute
@Override
public ObjectAdapter executeWithRuleChecking(
@@ -408,7 +408,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > defaults
+ // -- defaults
@Override
public ObjectAdapter[] getDefaults(final ObjectAdapter target) {
@@ -483,7 +483,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > choices
+ // -- choices
@Override
public ObjectAdapter[][] getChoices(
@@ -616,7 +616,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
@@ -640,7 +640,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
//endregion
- //region > services (lookup)
+ // -- services (lookup)
protected org.apache.isis.applib.services.actinvoc.ActionInvocationContext getActionInvocationContext() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index 5810596..46e5603 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -232,7 +232,7 @@ public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInM
interactionInitiatedBy);
}
- //region > facetHolder
+ // -- facetHolder
@Override
protected FacetHolder getFacetHolder() {
return facetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 7102976..f96d253 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -202,7 +202,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return Allow.DEFAULT;
}
- //region > FacetHolder
+ // -- FacetHolder
protected FacetHolder getFacetHolder() {
return peer;
@@ -280,7 +280,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
//endregion
- //region > AutoComplete
+ // -- AutoComplete
@Override
public boolean hasAutoComplete() {
@@ -322,7 +322,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
//endregion
- //region > Choices
+ // -- Choices
@Override
public boolean hasChoices() {
@@ -370,7 +370,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
//endregion
- //region > Defaults
+ // -- Defaults
@Override
public ObjectAdapter getDefault(final ObjectAdapter adapter) {
@@ -460,7 +460,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
//endregion
- //region > Validation
+ // -- Validation
@Override
public ActionArgValidityContext createProposedArgumentInteractionContext(
@@ -520,7 +520,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
//endregion
- //region > Dependencies (from parent)
+ // -- Dependencies (from parent)
protected SpecificationLoader getSpecificationLoader() {
return parentAction.getSpecificationLoader();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index 356fd23..33c9987 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -69,7 +69,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return type == null ? null : specificationLookup.loadSpecification(type);
}
- //region > fields
+ // -- fields
private final String id;
private final FacetedMethod facetedMethod;
private final FeatureType featureType;
@@ -96,7 +96,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
this.persistenceSessionServiceInternal = servicesInjector.getPersistenceSessionServiceInternal();
}
- //region > Identifiers
+ // -- Identifiers
@Override
public String getId() {
@@ -115,7 +115,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
//endregion
- //region > Facets
+ // -- Facets
public FacetedMethod getFacetedMethod() {
return facetedMethod;
@@ -177,7 +177,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
//endregion
- //region > Name, Description, Help (convenience for facets)
+ // -- Name, Description, Help (convenience for facets)
/**
* Return the default label for this member. This is based on the name of
* this member.
@@ -211,7 +211,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
//endregion
- //region > Hidden (or visible)
+ // -- Hidden (or visible)
/**
* Create an {@link InteractionContext} to represent an attempt to view this
* member (that is, to check if it is visible or not).
@@ -260,7 +260,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
}
//endregion
- //region > Disabled (or enabled)
+ // -- Disabled (or enabled)
/**
* Create an {@link InteractionContext} to represent an attempt to
* use this member (that is, to check if it is usable or not).
@@ -298,7 +298,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
//endregion
- //region > isAssociation, isAction
+ // -- isAssociation, isAction
@Override
public boolean isAction() {
return featureType.isAction();
@@ -320,7 +320,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
}
//endregion
- //region > mixinAdapterFor
+ // -- mixinAdapterFor
/**
* For mixins
*/
@@ -375,7 +375,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
@@ -384,7 +384,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
//endregion
- //region > Dependencies
+ // -- Dependencies
public SpecificationLoader getSpecificationLoader() {
return specificationLoader;
@@ -416,7 +416,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
//endregion
- //region > command (setup)
+ // -- command (setup)
protected void setupCommandTarget(final ObjectAdapter targetAdapter, final String arguments) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index ab0faa9..64bb350 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -119,7 +119,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
}
- //region > fields
+ // -- fields
protected final ServicesInjector servicesInjector;
@@ -169,7 +169,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
private IntrospectionState introspected = IntrospectionState.NOT_INTROSPECTED;
//endregion
- //region > Constructor
+ // -- Constructor
public ObjectSpecificationAbstract(
final Class<?> introspectedClass,
final String shortName,
@@ -193,7 +193,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Stuff immediately derivable from class
+ // -- Stuff immediately derivable from class
@Override
public FeatureType getFeatureType() {
return FeatureType.OBJECT;
@@ -262,7 +262,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Introspection (part 1)
+ // -- Introspection (part 1)
public abstract void introspectTypeHierarchyAndMembers();
@@ -344,7 +344,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Introspection (part 2)
+ // -- Introspection (part 2)
public void updateFromFacetValues() {
@@ -357,7 +357,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Title, Icon
+ // -- Title, Icon
@Override
public String getTitle(final ObjectAdapter targetAdapter) {
@@ -403,7 +403,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Hierarchical
+ // -- Hierarchical
/**
* Determines if this class represents the same class, or a subclass, of the
* specified class.
@@ -444,7 +444,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Name, Description, Persistability
+ // -- Name, Description, Persistability
/**
* The name according to any available {@link org.apache.isis.core.metamodel.facets.all.named.NamedFacet},
* but falling back to {@link #getFullIdentifier()} otherwise.
@@ -489,7 +489,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Facet Handling
+ // -- Facet Handling
@Override
public <Q extends Facet> Q getFacet(final Class<Q> facetType) {
@@ -535,7 +535,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > DefaultValue - unused
+ // -- DefaultValue - unused
/**
* @deprecated - never called.
* @return - always returns <tt>null</tt>
@@ -547,7 +547,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
//endregion
- //region > Identifier
+ // -- Identifier
@Override
public Identifier getIdentifier() {
return identifier;
@@ -555,7 +555,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > createTitleInteractionContext
+ // -- createTitleInteractionContext
@Override
public ObjectTitleContext createTitleInteractionContext(final AuthenticationSession session, final InteractionInitiatedBy interactionMethod, final ObjectAdapter targetObjectAdapter) {
return new ObjectTitleContext(targetObjectAdapter, getIdentifier(), targetObjectAdapter.titleString(null),
@@ -564,7 +564,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Superclass, Interfaces, Subclasses, isAbstract
+ // -- Superclass, Interfaces, Subclasses, isAbstract
@Override
public ObjectSpecification superclass() {
return superclassSpec;
@@ -626,7 +626,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Associations
+ // -- Associations
@Override
public List<ObjectAssociation> getAssociations(final Contributed contributed) {
// the "contributed.isIncluded()" guard is required because we cannot do this too early;
@@ -752,7 +752,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > getObjectActions
+ // -- getObjectActions
@Override
public List<ObjectAction> getObjectActions(
final List<ActionType> types,
@@ -812,7 +812,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > sorting
+ // -- sorting
protected List<ObjectAssociation> sortAssociations(final List<ObjectAssociation> associations) {
final DeweyOrderSet orderSet = DeweyOrderSet.createOrderSet(associations);
@@ -877,7 +877,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > contributee associations (properties and collections)
+ // -- contributee associations (properties and collections)
private List<ObjectAssociation> createContributeeAssociations() {
if (isService() || isValue()) {
@@ -967,7 +967,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > mixin associations (properties and collections)
+ // -- mixin associations (properties and collections)
private List<ObjectAssociation> createMixedInAssociations() {
if (isService() || isValue()) {
@@ -1061,7 +1061,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > contributee actions
+ // -- contributee actions
/**
* All contributee actions (each wrapping a service's contributed action) for this spec.
*
@@ -1139,7 +1139,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
//endregion
- //region > mixin actions
+ // -- mixin actions
/**
* All contributee actions (each wrapping a service's contributed action) for this spec.
*
@@ -1207,7 +1207,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > validity
+ // -- validity
@Override
public Consent isValid(final ObjectAdapter targetAdapter, final InteractionInitiatedBy interactionInitiatedBy) {
return isValidResult(targetAdapter, interactionInitiatedBy).createConsent();
@@ -1234,7 +1234,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
//endregion
- //region > convenience isXxx (looked up from facets)
+ // -- convenience isXxx (looked up from facets)
@Override
public boolean isImmutable() {
return containsFacet(ImmutableFacet.class);
@@ -1293,7 +1293,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
@@ -1304,7 +1304,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > Dependencies (injected in constructor)
+ // -- Dependencies (injected in constructor)
private ServicesInjector getServicesInjector() {
return servicesInjector;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 3460f5f..2346d10 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -159,7 +159,7 @@ public class OneToManyAssociationContributee extends OneToManyAssociationDefault
return InteractionUtils.isUsableResult(this, ic).createConsent();
}
- //region > FacetHolder
+ // -- FacetHolder
@Override
protected FacetHolder getFacetHolder() {
@@ -172,7 +172,7 @@ public class OneToManyAssociationContributee extends OneToManyAssociationDefault
return getPersistenceSessionService().adapterFor(servicePojo);
}
- //region > ContributeeMember2 impl (getServiceContributedBy)
+ // -- ContributeeMember2 impl (getServiceContributedBy)
@Override
public ObjectSpecification getServiceContributedBy() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
index 3a4dfae..cc5949a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
@@ -70,7 +70,7 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
}
- //region > visible, usable
+ // -- visible, usable
@Override
public VisibilityContext<?> createVisibleInteractionContext(
@@ -89,7 +89,7 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
//endregion
- //region > Validate Add
+ // -- Validate Add
// Not API
private ValidityContext<?> createValidateAddInteractionContext(
final InteractionInitiatedBy interactionInitiatedBy,
@@ -118,7 +118,7 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
//endregion
- //region > Validate Remove
+ // -- Validate Remove
private ValidityContext<?> createValidateRemoveInteractionContext(
final ObjectAdapter ownerAdapter,
final ObjectAdapter proposedToRemoveAdapter,
@@ -152,7 +152,7 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
//endregion
- //region > get, isEmpty, add, clear
+ // -- get, isEmpty, add, clear
@Override
public ObjectAdapter get(
@@ -179,7 +179,7 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
//endregion
- //region > add, clear
+ // -- add, clear
@Override
public void addElement(
@@ -227,7 +227,7 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
//endregion
- //region > defaults
+ // -- defaults
@Override
public ObjectAdapter getDefault(final ObjectAdapter ownerAdapter) {
return null;
@@ -239,7 +239,7 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
//endregion
- //region > choices & autoComplete
+ // -- choices & autoComplete
@Override
public ObjectAdapter[] getChoices(
@@ -274,7 +274,7 @@ public class OneToManyAssociationDefault extends ObjectAssociationAbstract imple
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index 87c2f8a..921e972 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -197,7 +197,7 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
return InteractionUtils.isUsableResult(this, ic).createConsent();
}
- //region > FacetHolder
+ // -- FacetHolder
@Override
protected FacetHolder getFacetHolder() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
index 13749fa..de9b6ab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
@@ -149,7 +149,7 @@ public class OneToOneAssociationContributee extends OneToOneAssociationDefault i
return getPersistenceSessionService().adapterFor(servicePojo);
}
- //region > Contributee2 impl - getServiceContributedBy()
+ // -- Contributee2 impl - getServiceContributedBy()
@Override
public ObjectSpecification getServiceContributedBy() {
return getServiceAdapter().getSpecification();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index e3fa626..283834c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -75,7 +75,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
super(facetedMethod, FeatureType.PROPERTY, objectSpec, servicesInjector);
}
- //region > visible, usable
+ // -- visible, usable
@Override
public VisibilityContext<?> createVisibleInteractionContext(
@@ -94,7 +94,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
//endregion
- //region > Validity
+ // -- Validity
private ValidityContext<?> createValidateInteractionContext(
final ObjectAdapter ownerAdapter,
final ObjectAdapter proposedToReferenceAdapter,
@@ -124,7 +124,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
//endregion
- //region > init
+ // -- init
@Override
public void initAssociation(final ObjectAdapter ownerAdapter, final ObjectAdapter referencedAdapter) {
final PropertyInitializationFacet initializerFacet = getFacet(PropertyInitializationFacet.class);
@@ -135,7 +135,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
//endregion
- //region > Access (get, isEmpty)
+ // -- Access (get, isEmpty)
@Override
public ObjectAdapter get(
@@ -169,7 +169,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
//endregion
- //region > Set
+ // -- Set
@Override
public void set(
final ObjectAdapter ownerAdapter,
@@ -234,7 +234,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
//endregion
- //region > defaults
+ // -- defaults
@Override
public ObjectAdapter getDefault(final ObjectAdapter ownerAdapter) {
PropertyDefaultFacet propertyDefaultFacet = getFacet(PropertyDefaultFacet.class);
@@ -266,7 +266,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
//endregion
- //region > choices and autoComplete
+ // -- choices and autoComplete
@Override
public boolean hasChoices() {
return getFacet(PropertyChoicesFacet.class) != null;
@@ -355,7 +355,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
}
- //region > toString
+ // -- toString
@Override
public String toString() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index ddcbd68..c04d226 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -77,7 +77,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
return name.substring(name.lastIndexOf('.') + 1);
}
- //region > constructor, fields
+ // -- constructor, fields
/**
* Lazily built by {@link #getMember(Method)}.
@@ -105,7 +105,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
//endregion
- //region > introspectTypeHierarchyAndMembers
+ // -- introspectTypeHierarchyAndMembers
@Override
public void introspectTypeHierarchyAndMembers() {
@@ -199,7 +199,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
//endregion
- //region > create associations and actions
+ // -- create associations and actions
private List<ObjectAssociation> createAssociations() {
final List<FacetedMethod> associationFacetedMethods = facetedMethodsBuilder.getAssociationFacetedMethods();
final List<ObjectAssociation> associations = Lists.newArrayList();
@@ -246,7 +246,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
//endregion
- //region > isXxx
+ // -- isXxx
@Override
public boolean isViewModel() {
@@ -280,7 +280,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
//endregion
- //region > getObjectAction
+ // -- getObjectAction
@Override
public ObjectAction getObjectAction(final ActionType type, final String id, final List<ObjectSpecification> parameters) {
@@ -349,7 +349,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
//endregion
- //region > getMember, catalog... (not API)
+ // -- getMember, catalog... (not API)
public ObjectMember getMember(final Method method) {
if (membersByMethod == null) {
@@ -396,7 +396,7 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
final ToString str = new ToString(this);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index c429804..e98756d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -45,7 +45,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
private static final String DESCRIBED_AS = "Typed instances";
private static final String ICON_NAME = "instances";
- //region > constructor
+ // -- constructor
public ObjectSpecificationOnStandaloneList(
final ServicesInjector servicesInjector,
@@ -56,7 +56,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
//endregion
- //region > Introspection
+ // -- Introspection
@Override
public void introspectTypeHierarchyAndMembers() {
@@ -76,7 +76,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
//endregion
- //region > isXxx
+ // -- isXxx
@Override
public boolean isService() {
@@ -104,7 +104,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
//endregion
- //region > Associations
+ // -- Associations
/**
* Review: is this ever called for an instance of this class? If not, then
* no need to override.
@@ -116,7 +116,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
//endregion
- //region > Title and Icon
+ // -- Title and Icon
@Override
public String getTitle(final ObjectAdapter object) {
@@ -130,7 +130,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
//endregion
- //region > Object Actions
+ // -- Object Actions
/**
* Review: is it necessary to override for this subclass?
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
index 0732e17..f7b4171 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
*/
public class ExplorationAuthenticator extends AuthenticatorAbstract {
- //region > Constructor, fields
+ // -- Constructor, fields
private final Set<SimpleSession> registeredSessions = new LinkedHashSet<SimpleSession>();;
private final String users;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
index a6a275d..8676057 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
public abstract class AuthenticatorAbstract implements Authenticator {
- //region > constructor, fields
+ // -- constructor, fields
private final IsisConfiguration configuration;
private DeploymentCategory deploymentCategory;
@@ -36,7 +36,7 @@ public abstract class AuthenticatorAbstract implements Authenticator {
//endregion
- //region > init, shutdown
+ // -- init, shutdown
@Override
public void init(final DeploymentCategory deploymentCategory) {
@@ -56,7 +56,7 @@ public abstract class AuthenticatorAbstract implements Authenticator {
//endregion
- //region > API
+ // -- API
/**
* Default implementation returns a {@link SimpleSession}; can be overridden
@@ -93,7 +93,7 @@ public abstract class AuthenticatorAbstract implements Authenticator {
//endregion
- //region > Injected (via constructor)
+ // -- Injected (via constructor)
public IsisConfiguration getConfiguration() {
return configuration;
diff --git a/core/plugins/eventbus-guava/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheUsingGuava.java b/core/plugins/eventbus-guava/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheUsingGuava.java
index 134555e..8ad6d25 100644
--- a/core/plugins/eventbus-guava/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheUsingGuava.java
+++ b/core/plugins/eventbus-guava/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheUsingGuava.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,7 +16,6 @@
*/
package org.apache.isis.applib.services.queryresultscache;
-import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.Callable;
@@ -50,97 +49,19 @@ import org.slf4j.LoggerFactory;
menuOrder = "" + Integer.MAX_VALUE
)
@RequestScoped
-public class QueryResultsCache implements WithTransactionScope {
-
- private static final Logger LOG = LoggerFactory.getLogger(QueryResultsCache.class);
-
-
- public static class Key {
- private final Class<?> callingClass;
- private final String methodName;
- private final Object[] keys;
-
- public Key(Class<?> callingClass, String methodName, Object... keys) {
- this.callingClass = callingClass;
- this.methodName = methodName;
- this.keys = keys;
- }
-
- public Class<?> getCallingClass() {
- return callingClass;
- }
- public String getMethodName() {
- return methodName;
- }
- public Object[] getKeys() {
- return keys;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Key other = (Key) obj;
-
- // compare callingClass
- if (callingClass == null) {
- if (other.callingClass != null)
- return false;
- } else if (!callingClass.equals(other.callingClass))
- return false;
-
- // compare methodName
- if (methodName == null) {
- if (other.methodName != null)
- return false;
- } else if (!methodName.equals(other.methodName))
- return false;
-
- // compare keys
- if (!Arrays.equals(keys, other.keys))
- return false;
-
- // ok, matches
- return true;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((callingClass == null) ? 0 : callingClass.hashCode());
- result = prime * result + Arrays.hashCode(keys);
- result = prime * result + ((methodName == null) ? 0 : methodName.hashCode());
- return result;
- }
-
- @Override
- public String toString() {
- return callingClass.getName() + "#" + methodName + Arrays.toString(keys);
- }
- }
-
- public static class Value<T> {
- private T result;
- public Value(T result) {
- this.result = result;
- }
- public T getResult() {
- return result;
- }
- }
-
- // //////////////////////////////////////
+public class QueryResultsCacheUsingGuava implements QueryResultsCache, WithTransactionScope {
+ private static final Logger LOG = LoggerFactory.getLogger(QueryResultsCacheUsingGuava.class);
private final Map<Key, Value<?>> cache = _Maps.newHashMap();
@Programmatic
- public <T> T execute(final Callable<T> callable, final Class<?> callingClass, final String methodName, final Object... keys) {
+ @Override
+ public <T> T execute(
+ final Callable<T> callable,
+ final Class<?> callingClass,
+ final String methodName,
+ final Object... keys) {
if(control.isFixturesInstalling()) {
try {
return callable.call();
@@ -153,7 +74,7 @@ public class QueryResultsCache implements WithTransactionScope {
}
@Programmatic
- public <T> T execute(final Callable<T> callable, final Key cacheKey) {
+ private <T> T execute(final Callable<T> callable, final Key cacheKey) {
if(control.isFixturesInstalling()) {
try {
return callable.call();
@@ -164,7 +85,7 @@ public class QueryResultsCache implements WithTransactionScope {
return executeWithCaching(callable, cacheKey);
}
- protected <T> T executeWithCaching(final Callable<T> callable, final Key cacheKey) {
+ private <T> T executeWithCaching(final Callable<T> callable, final Key cacheKey) {
try {
final Value<?> cacheValue = cache.get(cacheKey);
logHitOrMiss(cacheKey, cacheValue);
@@ -190,20 +111,20 @@ public class QueryResultsCache implements WithTransactionScope {
}
@Programmatic
- public <T> Value<T> get(final Class<?> callingClass, final String methodName, final Object... keys) {
+ private <T> Value<T> get(final Class<?> callingClass, final String methodName, final Object... keys) {
return get(new Key(callingClass, methodName, keys));
}
@Programmatic
@SuppressWarnings("unchecked")
- public <T> Value<T> get(final Key cacheKey) {
+ private <T> Value<T> get(final Key cacheKey) {
Value<T> value = (Value<T>) cache.get(cacheKey);
logHitOrMiss(cacheKey, value);
return value;
}
@Programmatic
- public <T> void put(final Key cacheKey, final T result) {
+ private <T> void put(final Key cacheKey, final T result) {
LOG.debug("PUT: {}", cacheKey);
cache.put(cacheKey, new Value<T>(result));
}
@@ -240,14 +161,14 @@ public class QueryResultsCache implements WithTransactionScope {
@Programmatic
@com.google.common.eventbus.Subscribe
- @org.axonframework.eventhandling.annotation.EventHandler
+ //@org.axonframework.eventhandling.annotation.EventHandler
public void on(FixturesInstallingEvent ev) {
fixturesInstalling = true;
}
@Programmatic
@com.google.common.eventbus.Subscribe
- @org.axonframework.eventhandling.annotation.EventHandler
+ //@org.axonframework.eventhandling.annotation.EventHandler
public void on(FixturesInstalledEvent ev) {
fixturesInstalling = false;
}
diff --git a/core/plugins/eventbus-guava/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java b/core/plugins/eventbus-guava/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
index 0076c3b..16508e5 100644
--- a/core/plugins/eventbus-guava/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
+++ b/core/plugins/eventbus-guava/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheTest.java
@@ -29,14 +29,14 @@ import static org.junit.Assert.assertThat;
public class QueryResultsCacheTest {
- private QueryResultsCache queryResultsCache;
+ private QueryResultsCacheUsingGuava queryResultsCache;
- QueryResultsCache.Control control;
+ QueryResultsCacheUsingGuava.Control control;
@Before
public void setUp() throws Exception {
- queryResultsCache = new QueryResultsCache();
- control = new QueryResultsCache.Control();
+ queryResultsCache = new QueryResultsCacheUsingGuava();
+ control = new QueryResultsCacheUsingGuava.Control();
queryResultsCache.control = control;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index 6a4e14c..12d8bae 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -46,7 +46,7 @@ public class FixturesInstallerDelegate {
private static final Logger LOG = LoggerFactory.getLogger(FixturesInstallerDelegate.class);
- //region > Constructor, fields
+ // -- Constructor, fields
private final IsisSessionFactory isisSessionFactory;
@@ -80,7 +80,7 @@ public class FixturesInstallerDelegate {
//endregion
- //region > installFixtures
+ // -- installFixtures
/**
* Installs all {{@link #addFixture(Object) added fixtures} fixtures (ie as
@@ -182,7 +182,7 @@ public class FixturesInstallerDelegate {
//endregion
- //region > logonFixture
+ // -- logonFixture
/**
* The requested {@link LogonFixture}, if any.
@@ -216,7 +216,7 @@ public class FixturesInstallerDelegate {
//endregion
- //region > dependencies (derived)
+ // -- dependencies (derived)
private ServicesInjector getServicesInjector() {
return isisSessionFactory.getServicesInjector();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
index 34a95e2..bfa9af3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
@@ -69,7 +69,7 @@ public class FixturesInstallerFromConfiguration extends FixturesInstallerAbstrac
private static class FixtureConfig {
- //region > fixtures
+ // -- fixtures
private String[] fixtures;
@@ -96,7 +96,7 @@ public class FixturesInstallerFromConfiguration extends FixturesInstallerAbstrac
}
//endregion
- //region > fixturePrefix
+ // -- fixturePrefix
private String fixturePrefix;
String getFixturePrefix() {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
index f6c8142..3fa47cb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
@@ -59,7 +59,7 @@ import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProvider;
*/
public class IsisSystem {
- //region > getElseNull, get, set
+ // -- getElseNull, get, set
protected static ThreadLocal<IsisSystem> ISFT = new ThreadLocal<>();
@@ -81,7 +81,7 @@ public class IsisSystem {
}
//endregion
- //region > Builder
+ // -- Builder
public static class Builder<T extends Builder<T, S>, S extends IsisSystem> {
@@ -158,7 +158,7 @@ public class IsisSystem {
//endregion
- //region > constructor, fields
+ // -- constructor, fields
// these fields 'xxxForComponentProvider' are used to initialize the IsisComponentProvider, but shouldn't be used thereafter.
protected final AppManifest appManifestIfAny;
@@ -179,7 +179,7 @@ public class IsisSystem {
//endregion
- //region > level
+ // -- level
private org.apache.log4j.Level level = org.apache.log4j.Level.INFO;
/**
@@ -195,7 +195,7 @@ public class IsisSystem {
//endregion
- //region > setup (also componentProvider)
+ // -- setup (also componentProvider)
// populated at #setupSystem
protected IsisComponentProvider componentProvider;
@@ -268,7 +268,7 @@ public class IsisSystem {
//endregion
- //region > isisSystem (populated during setup)
+ // -- isisSystem (populated during setup)
protected IsisSessionFactory isisSessionFactory;
/**
@@ -287,7 +287,7 @@ public class IsisSystem {
//endregion
- //region > openSession, closeSession, nextSession
+ // -- openSession, closeSession, nextSession
public void nextSession() throws Exception {
@@ -311,7 +311,7 @@ public class IsisSystem {
//endregion
- //region > beginTran, endTran, commitTran, abortTran
+ // -- beginTran, endTran, commitTran, abortTran
/**
* @deprecated - ought to be using regular domain services rather than reaching into the framework
@@ -437,7 +437,7 @@ public class IsisSystem {
//endregion
- //region > getService
+ // -- getService
@SuppressWarnings("unchecked")
public <C> C getService(Class<C> serviceClass) {
@@ -447,7 +447,7 @@ public class IsisSystem {
//endregion
- //region > Fixture management (for each test, rather than at bootstrap)
+ // -- Fixture management (for each test, rather than at bootstrap)
/**
* @deprecated - use {@link org.apache.isis.applib.fixturescripts.FixtureScripts} domain service instead.
@@ -477,7 +477,7 @@ public class IsisSystem {
//endregion
- //region > Dependencies
+ // -- Dependencies
private IsisTransactionManager getTransactionManager() {
return getPersistenceSession().getTransactionManager();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 56db2a3..2858197 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -51,7 +51,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
private final static Logger LOG = LoggerFactory.getLogger(PojoAdapter.class);
- //region > Constructor, fields, finalizer
+ // -- Constructor, fields, finalizer
private final AuthenticationSession authenticationSession;
private final SpecificationLoader specificationLoader;
@@ -90,7 +90,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
}
//endregion
- //region > getSpecification
+ // -- getSpecification
/**
* Downcasts {@link #getSpecification()}.
@@ -109,7 +109,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
//endregion
- //region > getObject, replacePojo
+ // -- getObject, replacePojo
@Override
public Object getObject() {
return pojo;
@@ -126,7 +126,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
}
//endregion
- //region > getOid, replaceOid
+ // -- getOid, replaceOid
@Override
public Oid getOid() {
return oid;
@@ -139,7 +139,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
}
//endregion
- //region > isParentedCollection, isValue
+ // -- isParentedCollection, isValue
@Override
public boolean isParentedCollection() {
@@ -153,7 +153,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
//endregion
- //region > isTransient, representsPersistent, isDestroyed
+ // -- isTransient, representsPersistent, isDestroyed
@Override
public boolean isTransient() {
@@ -207,7 +207,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
}
//endregion
- //region > getAggregateRoot
+ // -- getAggregateRoot
@Override
public ObjectAdapter getAggregateRoot() {
if(!isParentedCollection()) {
@@ -219,7 +219,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
//endregion
- //region > getVersion, setVersion, checkLock
+ // -- getVersion, setVersion, checkLock
@Override
public Version getVersion() {
@@ -275,7 +275,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
//endregion
- //region > titleString
+ // -- titleString
/**
* Returns the title from the underlying business object.
*
@@ -394,7 +394,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
}
//endregion
- //region > iconName
+ // -- iconName
/**
* Returns the name of the icon to use to represent this object.
@@ -406,7 +406,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
//endregion
- //region > elementSpecification
+ // -- elementSpecification
@Override
public ObjectSpecification getElementSpecification() {
@@ -430,7 +430,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
}
//endregion
- //region > getInstance (unsupported for this impl)
+ // -- getInstance (unsupported for this impl)
/**
* Not supported by this implementation.
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
index 06532b7..2f7231a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
public abstract class PersistenceQueryAbstract implements PersistenceQuery {
- //region > constructor, fields
+ // -- constructor, fields
protected final long start;
protected final long count;
@@ -63,7 +63,7 @@ public abstract class PersistenceQueryAbstract implements PersistenceQuery {
return specification;
}
- //region > equals, hashCode
+ // -- equals, hashCode
@Override
public boolean equals(final Object obj) {
if (this == obj) {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
index 36c19c8..0f811d8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
@@ -52,7 +52,7 @@ import com.google.common.collect.Maps;
public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
- //region > constants
+ // -- constants
private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromAnnotation.class);
@@ -74,7 +74,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
public final static String PACKAGE_PREFIX_STANDARD = Joiner.on(",").join(AppManifest.Registry.FRAMEWORK_PROVIDED_SERVICES);
//endregion
- //region > constructor, fields
+ // -- constructor, fields
private final ServiceInstantiator serviceInstantiator;
@@ -90,7 +90,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
}
//endregion
- //region > packagePrefixes
+ // -- packagePrefixes
private String packagePrefixes;
/**
@@ -105,7 +105,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
}
//endregion
- //region > init, shutdown
+ // -- init, shutdown
public void init() {
initIfRequired();
@@ -145,7 +145,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
//endregion
- //region > helpers
+ // -- helpers
private Predicate<Class<?>> instantiatable() {
return and(not(nullClass()), not(abstractClass()));
@@ -182,7 +182,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
//endregion
- //region > getServices (API)
+ // -- getServices (API)
private List<Object> services;
@@ -201,7 +201,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
}
//endregion
- //region > appendServices
+ // -- appendServices
public void appendServices(final SortedMap<String, SortedSet<String>> positionedServices) {
initIfRequired();
@@ -231,7 +231,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
//endregion
- //region > helpers: nameOf, asList
+ // -- helpers: nameOf, asList
private static String nameOf(final Class<?> cls) {
final DomainServiceLayout domainServiceLayout = cls.getAnnotation(DomainServiceLayout.class);
@@ -247,7 +247,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
}
//endregion
- //region > domain events
+ // -- domain events
public static abstract class PropertyDomainEvent<T>
extends org.apache.isis.applib.services.eventbus.PropertyDomainEvent<ServicesInstallerFromAnnotation, T> {
}
@@ -261,7 +261,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
}
//endregion
- //region > getTypes (API)
+ // -- getTypes (API)
@Override
public List<Class<?>> getTypes() {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index 781b67a..c3a3e8f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -217,7 +217,7 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
// //////////////////////////////////////
- //region > injected services
+ // -- injected services
@javax.inject.Inject
CommandContext commandContext;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
index 14d2e23..155056c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
@@ -42,7 +42,7 @@ public abstract class EventBusServiceDefault extends EventBusService {
public static final String KEY_ALLOW_LATE_REGISTRATION = "isis.services.eventbus.allowLateRegistration";
public static final String KEY_EVENT_BUS_IMPLEMENTATION = "isis.services.eventbus.implementation";
- //region > register
+ // -- register
/**
* {@inheritDoc}
*
@@ -75,7 +75,7 @@ public abstract class EventBusServiceDefault extends EventBusService {
//endregion
- //region > init, shutdown
+ // -- init, shutdown
@Programmatic
@PostConstruct
public void init(final Map<String, String> properties) {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoReader.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoReader.java
index 39f47ca..e57a7e5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoReader.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoReader.java
@@ -74,7 +74,7 @@ class PoReader extends PoAbstract {
localeProvider = translationServicePo.getLocaleProvider();
}
- //region > init, shutdown
+ // -- init, shutdown
/**
* Not API
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
index 562ac51..8bdd3cd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
@@ -48,7 +48,7 @@ class PoWriter extends PoAbstract {
super(translationServicePo, TranslationService.Mode.WRITE);
}
- //region > shutdown
+ // -- shutdown
@Override
void shutdown() {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index 24b60e9..247df59 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -55,7 +55,7 @@ public class TranslationServicePo implements TranslationService {
po = new PoWriter(this);
}
- //region > init, shutdown
+ // -- init, shutdown
@Programmatic
@PostConstruct
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
index 9784214..f91adda 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishedObjectsDefault.java
@@ -47,7 +47,7 @@ import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCal
*/
public class PublishedObjectsDefault implements PublishedObjects {
- //region > constructor, fields
+ // -- constructor, fields
private UUID transactionUuid;
private final int sequence;
private final String userName;
@@ -75,7 +75,7 @@ public class PublishedObjectsDefault implements PublishedObjects {
//endregion
- //region > transactionId, completedAt, user
+ // -- transactionId, completedAt, user
@Programmatic
@Override
public UUID getTransactionId() {
@@ -104,7 +104,7 @@ public class PublishedObjectsDefault implements PublishedObjects {
}
//endregion
- //region > dto
+ // -- dto
/**
* lazily computed
*/
@@ -116,7 +116,7 @@ public class PublishedObjectsDefault implements PublishedObjects {
}
//endregion
- //region > numberLoaded, numberCreated, numberUpdated, numberDeleted, numberObjectPropertiesModified
+ // -- numberLoaded, numberCreated, numberUpdated, numberDeleted, numberObjectPropertiesModified
@Override
public int getNumberLoaded() {
@@ -170,7 +170,7 @@ public class PublishedObjectsDefault implements PublishedObjects {
//endregion
- //region > newDto, newObjectsDto, newChangesDto
+ // -- newDto, newObjectsDto, newChangesDto
private ChangesDto newDto() {
final ObjectsDto objectsDto = newObjectsDto();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
index 2d2fd97..fd8e5b9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
@@ -172,7 +172,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
};
}
- //region > injected services
+ // -- injected services
@javax.inject.Inject
List<PublisherService> publisherServices;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
index 027d798..feaad4d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
@@ -56,7 +56,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
private static final Logger LOG = LoggerFactory.getLogger(EmailNotificationServiceDefault.class);
- //region > constants
+ // -- constants
private static final Pattern EMAIL_PATTERN = compile(quote("${email}"));
private static final Pattern CONFIRMATION_URL_PATTERN = compile(quote("${confirmationUrl}"));
@@ -66,7 +66,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
private String emailVerificationTemplate;
//endregion
- //region > init
+ // -- init
private boolean initialized;
@@ -98,7 +98,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
//endregion
- //region > isConfigured
+ // -- isConfigured
@Programmatic
@Override
@@ -108,7 +108,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
//endregion
- //region > send
+ // -- send
@Programmatic
@@ -129,7 +129,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
//endregion
- //region > helper methods for send(...)
+ // -- helper methods for send(...)
private void ensureConfigured() {
if(!isConfigured()) {
@@ -173,7 +173,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
//endregion
- //region > dependencies
+ // -- dependencies
@javax.inject.Inject
private EmailService emailService;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 53cb161..ccc935f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -151,7 +151,7 @@ public class PersistenceSession implements
AdapterManager,
IsisLifecycleListener2.PersistenceSessionLifecycleManagement {
- //region > constants
+ // -- constants
private static final Logger LOG = LoggerFactory.getLogger(PersistenceSession.class);
/**
@@ -171,7 +171,7 @@ public class PersistenceSession implements
//endregion
- //region > constructor, fields, finalize()
+ // -- constructor, fields, finalize()
private final FixturesInstalledFlag fixturesInstalledFlag;
@@ -272,7 +272,7 @@ public class PersistenceSession implements
//endregion
- //region > open
+ // -- open
/**
* Only populated once {@link #open()}'d
@@ -385,7 +385,7 @@ public class PersistenceSession implements
//endregion
- //region > close
+ // -- close
/**
* Closes the subcomponents.
@@ -515,7 +515,7 @@ public class PersistenceSession implements
//endregion
- //region > QuerySubmitter impl, findInstancesInTransaction
+ // -- QuerySubmitter impl, findInstancesInTransaction
public <T> List<ObjectAdapter> allMatchingQuery(final Query<T> query) {
final ObjectAdapter instances = findInstancesInTransaction(query, QueryCardinality.MULTIPLE);
@@ -604,7 +604,7 @@ public class PersistenceSession implements
//endregion
- //region > State
+ // -- State
private enum State {
NOT_INITIALIZED, OPEN, CLOSED
@@ -632,7 +632,7 @@ public class PersistenceSession implements
//endregion
- //region > createTransientInstance, createViewModelInstance
+ // -- createTransientInstance, createViewModelInstance
/**
* Create a root or standalone {@link ObjectAdapter adapter}.
@@ -767,7 +767,7 @@ public class PersistenceSession implements
//endregion
- //region > getServices, getService
+ // -- getServices, getService
public List<ObjectAdapter> getServices() {
final List<Object> services = servicesInjector.getRegisteredServices();
@@ -784,7 +784,7 @@ public class PersistenceSession implements
//endregion
- //region > helper: postEvent
+ // -- helper: postEvent
void postLifecycleEventIfRequired(
final ObjectAdapter adapter,
@@ -806,7 +806,7 @@ public class PersistenceSession implements
- //region > fixture installation
+ // -- fixture installation
/**
* Determine if the object store has been initialized with its set of start
@@ -859,7 +859,7 @@ public class PersistenceSession implements
//endregion
- //region > loadObject
+ // -- loadObject
/**
* Loads the object identified by the specified {@link RootOid}.
@@ -930,7 +930,7 @@ public class PersistenceSession implements
//endregion
- //region > loadPersistentPojo
+ // -- loadPersistentPojo
private Object loadPersistentPojo(final RootOid rootOid) {
@@ -1028,7 +1028,7 @@ public class PersistenceSession implements
//endregion
- //region > lazilyLoaded
+ // -- lazilyLoaded
public ObjectAdapter mapPersistent(final Persistable pojo) {
@@ -1043,7 +1043,7 @@ public class PersistenceSession implements
//endregion
- //region > refreshRootInTransaction, refreshRoot, resolve
+ // -- refreshRootInTransaction, refreshRoot, resolve
/**
* Re-initialises the fields of an object. If the object is unresolved then
@@ -1104,7 +1104,7 @@ public class PersistenceSession implements
//endregion
- //region > makePersistent
+ // -- makePersistent
/**
* Makes an {@link ObjectAdapter} persistent. The specified object should be
@@ -1185,7 +1185,7 @@ public class PersistenceSession implements
//endregion
- //region > ObjectPersistor impl
+ // -- ObjectPersistor impl
public void makePersistent(final ObjectAdapter adapter) {
makePersistentInTransaction(adapter);
}
@@ -1196,7 +1196,7 @@ public class PersistenceSession implements
//endregion
- //region > destroyObjectInTransaction
+ // -- destroyObjectInTransaction
/**
* Removes the specified object from the system. The specified object's data
@@ -1219,7 +1219,7 @@ public class PersistenceSession implements
//endregion
- //region > newXxxCommand
+ // -- newXxxCommand
/**
* Makes an {@link ObjectAdapter} persistent. The specified object should be
* stored away via this object store's persistence mechanism, and have an
@@ -1261,7 +1261,7 @@ public class PersistenceSession implements
}
//endregion
- //region > execute
+ // -- execute
public void execute(final List<PersistenceCommand> commands) {
// previously we used to check that there were some commands, and skip processing otherwise.
@@ -1280,7 +1280,7 @@ public class PersistenceSession implements
}
//endregion
- //region > getAggregateRoot, remappedFrom
+ // -- getAggregateRoot, remappedFrom
private Map<Oid, Oid> persistentByTransient = Maps.newHashMap();
@@ -1305,7 +1305,7 @@ public class PersistenceSession implements
//endregion
- //region > transactions
+ // -- transactions
public void startTransaction() {
final javax.jdo.Transaction transaction = persistenceManager.currentTransaction();
if (transaction.isActive()) {
@@ -1331,7 +1331,7 @@ public class PersistenceSession implements
//endregion
- //region > dependencies (from constructor)
+ // -- dependencies (from constructor)
protected SpecificationLoader getSpecificationLoader() {
return specificationLoader;
@@ -1350,7 +1350,7 @@ public class PersistenceSession implements
//endregion
- //region > transactionManager
+ // -- transactionManager
/**
@@ -1369,7 +1369,7 @@ public class PersistenceSession implements
//endregion
- //region > jdoPersistenceManager delegate methods
+ // -- jdoPersistenceManager delegate methods
public javax.jdo.Query newJdoQuery(Class<?> cls) {
return persistenceManager.newQuery(cls);
}
@@ -1383,7 +1383,7 @@ public class PersistenceSession implements
}
// endregion
- //region > AdapterManager implementation
+ // -- AdapterManager implementation
private final PojoAdapterHashMap pojoAdapterMap = new PojoAdapterHashMap();
private final OidAdapterHashMap oidAdapterMap = new OidAdapterHashMap();
@@ -2112,13 +2112,13 @@ public class PersistenceSession implements
//endregion
- //region > TransactionManager delegate methods
+ // -- TransactionManager delegate methods
protected IsisTransaction getCurrentTransaction() {
return transactionManager.getCurrentTransaction();
}
//endregion
- //region > FrameworkSynchronizer delegate methods
+ // -- FrameworkSynchronizer delegate methods
public void enlistDeletingAndInvokeIsisRemovingCallbackFacet(final Persistable pojo) {
ObjectAdapter adapter = adapterFor(pojo);
@@ -2190,7 +2190,7 @@ public class PersistenceSession implements
adapter.setVersion(datastoreVersion);
}
- //region > create...Oid (main API)
+ // -- create...Oid (main API)
/**
* Create a new {@link Oid#isTransient() transient} {@link Oid} for the
* supplied pojo, uniquely distinguishable from any other {@link Oid}.
@@ -2385,7 +2385,7 @@ public class PersistenceSession implements
//endregion
- //region > DomainObjectServices impl
+ // -- DomainObjectServices impl
public Object lookup(
@@ -2411,7 +2411,7 @@ public class PersistenceSession implements
//endregion
- //region > helpers: lookupService, lookupServices
+ // -- helpers: lookupService, lookupServices
private <T> T lookupService(Class<T> serviceType) {
T service = lookupServiceIfAny(serviceType);
@@ -2430,7 +2430,7 @@ public class PersistenceSession implements
}
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/OidAdapterHashMap.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/OidAdapterHashMap.java
index 2282922..fe94b10 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/OidAdapterHashMap.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/OidAdapterHashMap.java
@@ -41,7 +41,7 @@ public class OidAdapterHashMap implements Iterable<Oid>, SessionScopedComponent
private final Map<Oid, ObjectAdapter> adapterByOidMap = Maps.newHashMapWithExpectedSize(DEFAULT_OID_ADAPTER_MAP_SIZE);
- //region > open, close
+ // -- open, close
public void open() {
// nothing to do
@@ -56,7 +56,7 @@ public class OidAdapterHashMap implements Iterable<Oid>, SessionScopedComponent
//endregion
- //region > add, remove
+ // -- add, remove
/**
* Add an adapter for a given oid
*/
@@ -85,7 +85,7 @@ public class OidAdapterHashMap implements Iterable<Oid>, SessionScopedComponent
//endregion
- //region > getAdapter, iterator
+ // -- getAdapter, iterator
/**
* Get the adapter identified by the specified OID.
*/
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/PojoAdapterHashMap.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/PojoAdapterHashMap.java
index 75d7e5e..e880138 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/PojoAdapterHashMap.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/PojoAdapterHashMap.java
@@ -55,7 +55,7 @@ public class PojoAdapterHashMap implements Iterable<ObjectAdapter>, SessionScope
protected final Map<Object, ObjectAdapter> adapterByPojoMap;
- //region > Constructors, finalize
+ // -- Constructors, finalize
public PojoAdapterHashMap() {
this(DEFAULT_POJO_ADAPTER_MAP_SIZE);
}
@@ -73,7 +73,7 @@ public class PojoAdapterHashMap implements Iterable<ObjectAdapter>, SessionScope
}
//endregion
- //region > open, close
+ // -- open, close
public void open() {
// nothing to do
@@ -88,7 +88,7 @@ public class PojoAdapterHashMap implements Iterable<ObjectAdapter>, SessionScope
//endregion
- //region > add, remove
+ // -- add, remove
public void add(final Object pojo, final ObjectAdapter adapter) {
adapterByPojoMap.put(key(pojo), adapter);
@@ -106,7 +106,7 @@ public class PojoAdapterHashMap implements Iterable<ObjectAdapter>, SessionScope
//endregion
- //region > getAdapter, containsPojo
+ // -- getAdapter, containsPojo
public boolean containsPojo(final Object pojo) {
return adapterByPojoMap.containsKey(key(pojo));
@@ -118,7 +118,7 @@ public class PojoAdapterHashMap implements Iterable<ObjectAdapter>, SessionScope
//endregion
- //region > iterator, key
+ // -- iterator, key
@Override
public Iterator<ObjectAdapter> iterator() {
return adapterByPojoMap.values().iterator();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
index 80d3ebe..6548988 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
@@ -42,7 +42,7 @@ public class IsisSession implements SessionScopedComponent {
private static final Logger LOG = LoggerFactory.getLogger(IsisSession.class);
- //region > constructor, fields
+ // -- constructor, fields
private final AuthenticationSession authenticationSession;
private PersistenceSession persistenceSession; // only non-final so can be replaced in tests.
@@ -56,7 +56,7 @@ public class IsisSession implements SessionScopedComponent {
}
//endregion
- //region > open, close
+ // -- open, close
void open() {
persistenceSession.open();
}
@@ -73,7 +73,7 @@ public class IsisSession implements SessionScopedComponent {
//endregion
- //region > AuthenticationSession
+ // -- AuthenticationSession
/**
* Returns the {@link AuthenticationSession} representing this user for this
* {@link IsisSession}.
@@ -83,7 +83,7 @@ public class IsisSession implements SessionScopedComponent {
}
//endregion
- //region > Persistence Session
+ // -- Persistence Session
/**
* The {@link PersistenceSession} within this {@link IsisSession}.
*/
@@ -93,7 +93,7 @@ public class IsisSession implements SessionScopedComponent {
//endregion
- //region > transaction
+ // -- transaction
/**
* Convenience method that returns the {@link IsisTransaction} of the
@@ -105,7 +105,7 @@ public class IsisSession implements SessionScopedComponent {
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
final ToString asString = new ToString(this);
@@ -116,7 +116,7 @@ public class IsisSession implements SessionScopedComponent {
}
//endregion
- //region > Dependencies (from constructor)
+ // -- Dependencies (from constructor)
private IsisTransactionManager getTransactionManager() {
return getPersistenceSession().getTransactionManager();
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index f7b48cf..4500479 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -74,7 +74,7 @@ public class IsisSessionFactory
@SuppressWarnings("unused")
private final static Logger LOG = LoggerFactory.getLogger(IsisSessionFactory.class);
- //region > constructor, fields, accessors
+ // -- constructor, fields, accessors
private final DeploymentCategory deploymentCategory;
private final IsisConfiguration configuration;
@@ -108,7 +108,7 @@ public class IsisSessionFactory
//endregion
- //region > constructServices, destroyServicesAndShutdown
+ // -- constructServices, destroyServicesAndShutdown
private ServiceInitializer serviceInitializer;
@@ -232,7 +232,7 @@ public class IsisSessionFactory
//endregion
- //region > logonFixture
+ // -- logonFixture
private LogonFixture logonFixture;
@@ -252,7 +252,7 @@ public class IsisSessionFactory
//endregion
- //region > openSession, closeSession, currentSession, inSession
+ // -- openSession, closeSession, currentSession, inSession
private final ThreadLocal<IsisSession> currentSession = new ThreadLocal<>();
/**
@@ -375,7 +375,7 @@ public class IsisSessionFactory
//endregion
- //region > component accessors
+ // -- component accessors
/**
* The {@link ApplicationScopedComponent application-scoped}
* {@link DeploymentCategory}.
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
index 52df40e..4af6b05 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
@@ -59,7 +59,7 @@ public class IsisSessionFactoryBuilder {
private boolean initialized = false;
- //region > constructors, accessors
+ // -- constructors, accessors
private final IsisComponentProvider componentProvider;
private final DeploymentCategory deploymentCategory;
@@ -95,7 +95,7 @@ public class IsisSessionFactoryBuilder {
//endregion
- //region > buildSessionFactory
+ // -- buildSessionFactory
public IsisSessionFactory buildSessionFactory() {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index fb34606..01e1bc2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -159,7 +159,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
private static final Logger LOG = LoggerFactory.getLogger(IsisTransaction.class);
- //region > constructor, fields
+ // -- constructor, fields
private final UUID interactionId;
private final int sequence;
@@ -202,7 +202,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
//endregion
- //region > transactionId
+ // -- transactionId
@Programmatic
public final UUID getTransactionId() {
@@ -224,7 +224,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
//endregion
- //region > state
+ // -- state
private State state;
@@ -254,7 +254,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
//endregion
- //region > commands
+ // -- commands
/**
@@ -322,7 +322,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
//endregion
- //region > flush
+ // -- flush
public final void flush() {
@@ -402,7 +402,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
//endregion
- //region > preCommit, commit
+ // -- preCommit, commit
void preCommit() {
assert getState().canCommit();
@@ -449,7 +449,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
//endregion
- //region > abortCause, markAsAborted
+ // -- abortCause, markAsAborted
/**
* internal API called by IsisTransactionManager only
@@ -499,7 +499,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
//endregion
- //region > toString
+ // -- toString
@Override
public String toString() {
@@ -514,7 +514,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
//endregion
- //region > getMessageBroker
+ // -- getMessageBroker
/**
* The {@link org.apache.isis.core.commons.authentication.MessageBroker} for this transaction.
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 1792a5a..76739e0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -49,7 +49,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
*/
private IsisTransaction currentTransaction;
- //region > constructor, fields
+ // -- constructor, fields
private final PersistenceSession persistenceSession;
private final AuthenticationSession authenticationSession;
@@ -78,7 +78,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
//endregion
- //region > open, close
+ // -- open, close
public void open() {
assert session != null;
@@ -96,7 +96,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
}
//endregion
- //region > current transaction (if any)
+ // -- current transaction (if any)
/**
* The current transaction, if any.
*/
@@ -111,7 +111,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
//endregion
- //region > Transactional Execution
+ // -- Transactional Execution
/**
* Run the supplied {@link Runnable block of code (closure)} in a
* {@link IsisTransaction transaction}.
@@ -207,7 +207,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
//endregion
- //region > startTransaction
+ // -- startTransaction
public void startTransaction() {
startTransaction(null);
@@ -254,7 +254,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
//endregion
- //region > flushTransaction
+ // -- flushTransaction
public boolean flushTransaction() {
if (LOG.isDebugEnabled()) {
@@ -269,7 +269,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
//endregion
- //region > endTransaction, abortTransaction
+ // -- endTransaction, abortTransaction
/**
* Ends the transaction if nesting level is 0 (but will abort the transaction instead,
* even if nesting level is not 0, if an {@link IsisTransaction#getAbortCause() abort cause}
@@ -469,7 +469,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
//endregion
- //region > addCommand
+ // -- addCommand
public void addCommand(final PersistenceCommand command) {
getCurrentTransaction().addCommand(command);
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 140f337..61529ba 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -68,7 +68,7 @@ import com.google.common.collect.Sets;
*/
public abstract class IsisComponentProvider {
- //region > constructor, fields
+ // -- constructor, fields
private final AppManifest appManifest;
private final IsisConfigurationDefault configuration;
@@ -114,7 +114,7 @@ public abstract class IsisComponentProvider {
//endregion
- //region > helpers (appManifest)
+ // -- helpers (appManifest)
private void putAppManifestKey(final AppManifest appManifest) {
// required to prevent RegisterEntities validation from complaining
@@ -284,7 +284,7 @@ public abstract class IsisComponentProvider {
//endregion
- //region > provideAuth*
+ // -- provideAuth*
public AuthenticationManager provideAuthenticationManager() {
return authenticationManager;
@@ -296,7 +296,7 @@ public abstract class IsisComponentProvider {
//endregion
- //region > provideServiceInjector
+ // -- provideServiceInjector
public ServicesInjector provideServiceInjector(final IsisConfiguration configuration) {
return new ServicesInjector(services, configuration);
@@ -304,7 +304,7 @@ public abstract class IsisComponentProvider {
//endregion
- //region > provideSpecificationLoader
+ // -- provideSpecificationLoader
public SpecificationLoader provideSpecificationLoader(
final ServicesInjector servicesInjector,
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index a2c0ea9..57f6e7e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerS
public class IsisComponentProviderDefault2 extends IsisComponentProvider {
- //region > constructors
+ // -- constructors
public IsisComponentProviderDefault2(
final AppManifest appManifest,
@@ -60,7 +60,7 @@ public class IsisComponentProviderDefault2 extends IsisComponentProvider {
//endregion
- //region > constructor helpers (factories)
+ // -- constructor helpers (factories)
/**
* Default will read <tt>isis.properties</tt> (and other optional property files) from the "config"
* package on the current classpath.
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index a25ed7b..d79e3ec 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.runtime.system.SystemConstants;
public class IsisComponentProviderUsingInstallers extends IsisComponentProvider {
- //region > constructors
+ // -- constructors
public IsisComponentProviderUsingInstallers(
final AppManifest appManifest,
@@ -75,7 +75,7 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
//endregion
- //region > constructor helpers (factories)
+ // -- constructor helpers (factories)
private static AuthenticationManager lookupAuthenticationManager(
final AppManifest appManifest, final InstallerLookup installerLookup,
@@ -130,7 +130,7 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
private static final Logger LOG = LoggerFactory.getLogger(InstallerLookup.class);
- //region > constructor, fields
+ // -- constructor, fields
private final IsisConfiguration isisConfiguration;
private final List<Installer> installerList = Lists.newArrayList();
@@ -173,7 +173,7 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
//endregion
- //region > framework
+ // -- framework
public AuthenticationManagerInstaller authenticationManagerInstaller(final String requested) {
@@ -193,7 +193,7 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
//endregion
- //region > helpers
+ // -- helpers
@SuppressWarnings("unchecked")
private <T extends Installer> T getInstaller(final Class<T> cls, final String implName) {
Assert.assertNotNull("No name specified", implName);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
index edc38a1..257a6f9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
@@ -55,7 +55,7 @@ public abstract class AuthenticationSessionStrategyAbstract implements Authentic
}
- //region > Dependencies (from request)
+ // -- Dependencies (from request)
protected AuthenticationManager authenticationManagerFrom(final HttpServletRequest httpServletRequest) {
return isisSessionFactoryFrom(httpServletRequest).getAuthenticationManager();
}
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
index 465f19b..dcef16e 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
@@ -42,7 +42,7 @@ public class CreateSchemaObjectFromClassMetadata implements MetaDataListener, Da
private static final Logger LOG = LoggerFactory.getLogger(CreateSchemaObjectFromClassMetadata.class);
- //region > persistenceManagerFactory, properties
+ // -- persistenceManagerFactory, properties
private Map<String, String> properties;
protected Map<String, String> getProperties() {
@@ -50,7 +50,7 @@ public class CreateSchemaObjectFromClassMetadata implements MetaDataListener, Da
}
//endregion
- //region > loaded (API)
+ // -- loaded (API)
@Override
public void loaded(final AbstractClassMetaData cmd) {
@@ -94,7 +94,7 @@ public class CreateSchemaObjectFromClassMetadata implements MetaDataListener, Da
}
//endregion
- //region > skip, exec, schemaNameFor
+ // -- skip, exec, schemaNameFor
/**
* Whether to skip creating this schema.
@@ -166,7 +166,7 @@ public class CreateSchemaObjectFromClassMetadata implements MetaDataListener, Da
}
//endregion
- //region > helpers: closeSafely, getConnectionPassword
+ // -- helpers: closeSafely, getConnectionPassword
protected void closeSafely(final AutoCloseable connection) {
if(connection != null) {
try {
@@ -209,7 +209,7 @@ public class CreateSchemaObjectFromClassMetadata implements MetaDataListener, Da
}
//endregion
- //region > injected dependencies
+ // -- injected dependencies
@Override
public void setDataNucleusProperties(final Map<String, String> properties) {
this.properties = properties;
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
index 1908dfe..449b2b2 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
@@ -47,7 +47,7 @@ public class RegisterEntities {
// //////////////////////////////////////
- //region > entityTypes
+ // -- entityTypes
private final Set<String> entityTypes = Sets.newLinkedHashSet();
private final SpecificationLoader specificationLoader;
diff --git a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
index 5fa49a8..a1c25b3 100644
--- a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
+++ b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
@@ -74,7 +74,7 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
private static final String ISIS_AUTHENTICATION_SHIRO_AUTO_LOGOUT_KEY = "isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated";
private static final boolean ISIS_AUTHENTICATION_SHIRO_AUTO_LOGOUT_DEFAULT = false;
- //region > constructor and fields
+ // -- constructor and fields
private final IsisConfiguration configuration;
private final boolean autoLogout;
@@ -93,7 +93,7 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
//endregion
- //region > init, shutdown
+ // -- init, shutdown
@Override
public void init(final DeploymentCategory deploymentCategory) {
@@ -112,7 +112,7 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
//endregion
- //region > Authenticator API
+ // -- Authenticator API
@Override
public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
@@ -235,7 +235,7 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
}
//endregion
- //region > Authorizor API
+ // -- Authorizor API
@Override
public boolean isVisibleInAnyRole(Identifier identifier) {
@@ -301,7 +301,7 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
//endregion
- //region > Injected (via Shiro service locator)
+ // -- Injected (via Shiro service locator)
/**
* The {@link SecurityManager} is shared between both the {@link Authenticator} and the {@link Authorizor}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
index a8d8765..c258c6e 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
@@ -86,7 +86,7 @@ public abstract class ContentNegotiationServiceAbstract implements ContentNegoti
return null;
}
- //region > convenience methods for subclasses (possibly hooks)
+ // -- convenience methods for subclasses (possibly hooks)
/**
* Potential hook to allow a domain object to be mapped.
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index 415f243..37c450d 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -85,7 +85,7 @@ public class ResourceContext implements RendererContext6 {
private JsonRepresentation readQueryStringAsMap;
- //region > constructor and init
+ // -- constructor and init
public ResourceContext(
final RepresentationType representationType,
@@ -318,7 +318,7 @@ public class ResourceContext implements RendererContext6 {
return intent;
}
- //region > canEagerlyRender
+ // -- canEagerlyRender
private Set<Oid> rendered = Sets.newHashSet();
@Override
public boolean canEagerlyRender(ObjectAdapter objectAdapter) {
@@ -327,7 +327,7 @@ public class ResourceContext implements RendererContext6 {
}
//endregion
- //region > configuration settings
+ // -- configuration settings
private static final boolean HONOR_UI_HINTS_DEFAULT = false;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
index 68a1ff0..363314b 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKey.java
@@ -35,7 +35,7 @@ final class ImageResourceCacheKey implements Serializable {
this.toString = calcToString();
}
- //region > getResourceClass, getResourceName
+ // -- getResourceClass, getResourceName
private final Class<?> resourceClass;
private final String resourceName;
@@ -49,7 +49,7 @@ final class ImageResourceCacheKey implements Serializable {
}
//endregion
- //region > superKey
+ // -- superKey
ImageResourceCacheKey superKey() {
if(resourceClass == null) {
@@ -64,7 +64,7 @@ final class ImageResourceCacheKey implements Serializable {
//endregion
- //region > resourcePaths
+ // -- resourcePaths
List<ImageResourceCacheKey> resourcePaths(final String... suffices) {
return resourcePaths(Arrays.asList(suffices));
@@ -149,7 +149,7 @@ final class ImageResourceCacheKey implements Serializable {
//endregion
- //region > equals, hashCode
+ // -- equals, hashCode
@Override
public boolean equals(Object o) {
@@ -167,7 +167,7 @@ final class ImageResourceCacheKey implements Serializable {
//endregion
- //region > toString
+ // -- toString
private final String toString;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index bcb64f2..53366ac 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -350,7 +350,7 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
this.pageClassRegistry = pageClassRegistry;
}
- //region > Dependencies (from isis' context)
+ // -- Dependencies (from isis' context)
protected ServicesInjector getServicesInjector() {
return getIsisSessionFactory().getServicesInjector();
}
@@ -383,7 +383,7 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
//endregion
- //region > Dependencies (from wicket)
+ // -- Dependencies (from wicket)
protected AuthenticatedWebSession getWicketAuthenticationSession() {
return AuthenticatedWebSession.get();
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index e5724e4..ccab9f5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -115,7 +115,7 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
return this.label;
}
- //region > SelectorDropdownPanel (impl)
+ // -- SelectorDropdownPanel (impl)
private CollectionSelectorPanel selectorDropdownPanel;
@@ -129,7 +129,7 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
//endregion
- //region > BulkActionsProvider
+ // -- BulkActionsProvider
ObjectAdapterToggleboxColumn toggleboxColumn;
@Override
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
index 6106232..2484b06 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
@@ -105,7 +105,7 @@ public class CollectionSelectorHelper implements Serializable {
return initialFactory;
}
- //region > helpers
+ // -- helpers
/**
* return the index of {@link CollectionContentsHiddenPanelFactory unresolved panel} if present and not eager loading;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
index 8dde6ff..f4cb1d5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
@@ -53,7 +53,7 @@ public final class ObjectAdapterToggleboxColumn extends ColumnAbstract<ObjectAda
this.onConcurrencyExceptionHandler = onConcurrencyExceptionHandler;
}
- //region > OnSelectionHandler
+ // -- OnSelectionHandler
private OnSelectionHandler onSelectionHandler;
public OnSelectionHandler getOnSelectionHandler() {
return onSelectionHandler;
@@ -64,7 +64,7 @@ public final class ObjectAdapterToggleboxColumn extends ColumnAbstract<ObjectAda
}
//endregion
- //region > OnConcurrencyExceptionHandler
+ // -- OnConcurrencyExceptionHandler
private OnConcurrencyExceptionHandler onConcurrencyExceptionHandler;
public OnConcurrencyExceptionHandler getOnConcurrencyExceptionHandler() {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index eba0bb0..02d9b6c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -128,7 +128,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
bulkActionsHelper = new BulkActionsHelper(entityCollectionModel);
}
- //region > ActionPromptModalWindowProvider
+ // -- ActionPromptModalWindowProvider
public ActionPromptModalWindow getActionPrompt() {
return actionPromptModalWindow;
@@ -136,7 +136,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
//endregion
- //region > BulkActionsProvider
+ // -- BulkActionsProvider
ObjectAdapterToggleboxColumn toggleboxColumn;
@@ -200,7 +200,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
- //region > CollectionSelectorProvider
+ // -- CollectionSelectorProvider
@Override
public CollectionSelectorPanel getSelectorDropdownPanel() {
@@ -209,7 +209,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
//endregion
- //region > CollectionCountProvider
+ // -- CollectionCountProvider
@Override
public Integer getCount() {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
index e90474b..04e576d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
@@ -291,7 +291,7 @@ public abstract class ActionLinkFactoryAbstract implements ActionLinkFactory {
}
- //region > dependencies
+ // -- dependencies
protected ComponentFactoryRegistry getComponentFactoryRegistry() {
return ((ComponentFactoryRegistryAccessor) Application.get()).getComponentFactoryRegistry();
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 0be0dd7..f19eece 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -494,7 +494,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
- //region > getComponentFactoryRegistry (Convenience)
+ // -- getComponentFactoryRegistry (Convenience)
protected ComponentFactoryRegistry getComponentFactoryRegistry() {
final ComponentFactoryRegistryAccessor cfra = (ComponentFactoryRegistryAccessor) getApplication();
return cfra.getComponentFactoryRegistry();
@@ -502,7 +502,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
//endregion
- //region > injected (application-scope)
+ // -- injected (application-scope)
// REVIEW: can't inject because not serializable.
protected IsisSessionFactory getIsisSessionFactory() {
@@ -519,7 +519,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
//endregion
- //region > derived from injected components (session-scope)
+ // -- derived from injected components (session-scope)
protected PersistenceSession getPersistenceSession() {
return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
index f1aa71e..8c72a65 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormPanelAbstract.java
@@ -36,7 +36,7 @@ public abstract class PromptFormPanelAbstract<T extends IModel<?> & FormExecutor
super(id, model);
}
- //region > dependencies
+ // -- dependencies
@com.google.inject.Inject
WicketViewerSettings settings;
protected WicketViewerSettings getSettings() {
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index 8da92ba..c52a832 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -88,7 +88,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
- //region > toString, compareTo
+ // -- toString, compareTo
@Override
public String toString() {
return getName();
@@ -102,7 +102,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
//endregion
- //region > injected services
+ // -- injected services
@javax.inject.Inject
@javax.jdo.annotations.NotPersistent
@lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index 8e7a2c3..a8ba8f5 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -94,7 +94,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
- //region > toString, compareTo
+ // -- toString, compareTo
@Override
public String toString() {
return getName();
@@ -108,7 +108,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
//endregion
- //region > injected services
+ // -- injected services
@javax.inject.Inject
@javax.jdo.annotations.NotPersistent
@lombok.Getter(AccessLevel.NONE) @lombok.Setter(AccessLevel.NONE)
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.