You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/07/09 23:38:16 UTC
svn commit: r1359414 [1/2] - in /incubator/isis/trunk/framework:
core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/
core/metamodel/src/main/java/org/apache/isis/core/...
Author: danhaywood
Date: Mon Jul 9 21:38:13 2012
New Revision: 1359414
URL: http://svn.apache.org/viewvc?rev=1359414&view=rev
Log:
ISIS-14: ResolveState refactorings
Renamed PojoAdapter#isPersistent -> #representsPersistent (to reflect intent)
Renamed ResolveState#representsTransient -> #isTransient (since there is now only one such state)
Working towards removing ResolveState from the ObjectAdapter API: Introduced aggregateResolveState as non-API method for PojoAdapter,
Removed ResolveState from Data hierarchy (memento), since apparently not required.
Modified:
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java
incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java
incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/ResolveStateUtil.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_persist.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaObjectStore.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/IsisLifecycleListener.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/spi/ResolveStateUtil.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaPersistenceMechanismInstallerTest_persist.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/CollectionData.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Data.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/StandaloneData.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorUtil.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierDefault.java
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java
incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java
incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SaveObject.java
incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java
incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Saved.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java
incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientRootAdapterMapping.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainObjectReprRenderer.java
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java
incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java
incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java Mon Jul 9 21:38:13 2012
@@ -166,40 +166,27 @@ public interface ObjectAdapter extends I
* Whether the object is persisted.
*
* <p>
- * Note: not necessarily the reciprocal of {@link #representsTransient()};
+ * Note: not necessarily the reciprocal of {@link #isTransient()};
* standalone adapters (with {@link ResolveState#VALUE}) report as neither
* persistent or transient.
*/
- boolean isPersistent();
+ boolean representsPersistent();
- /**
- * Whether the object is transient.
- *
- * <p>
- * Note: not necessarily the reciprocal of {@link #isPersistent()};
- * standalone adapters (with {@link ResolveState#VALUE}) report as neither
- * persistent or transient.
- */
- boolean representsTransient();
-
-
- boolean isResolved();
+ boolean isNew();
+ boolean isTransient();
boolean isGhost();
-
- boolean isTitleAvailable();
-
- void markAsResolvedIfPossible();
-
- boolean isDestroyed();
+ boolean isResolved();
boolean isResolving();
-
boolean isUpdating();
- boolean isNew();
+ boolean isDestroyed();
+
boolean canTransitionToResolving();
+ boolean isTitleAvailable();
+ void markAsResolvedIfPossible();
@@ -234,6 +221,8 @@ public interface ObjectAdapter extends I
*/
ObjectAdapter getAggregateRoot();
+ boolean respondToChangesInPersistentObjects();
+
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/When.java Mon Jul 9 21:38:13 2012
@@ -41,7 +41,7 @@ public final class When extends Enumerat
* this 'when'.
*/
public boolean isNowFor(final ObjectAdapter targetAdapter) {
- final boolean isTransient = targetAdapter.representsTransient();
+ final boolean isTransient = targetAdapter.isTransient();
return this == When.ALWAYS || this == When.ONCE_PERSISTED && !isTransient || this == When.UNTIL_PERSISTED && isTransient;
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java Mon Jul 9 21:38:13 2012
@@ -65,9 +65,9 @@ public abstract class ImmutableFacetAbst
}
if (value() == When.UNTIL_PERSISTED) {
- return targetAdapter.representsTransient() ? "Immutable until persisted" : null;
+ return targetAdapter.isTransient() ? "Immutable until persisted" : null;
} else if (value() == When.ONCE_PERSISTED) {
- return targetAdapter.isPersistent() ? "Immutable once persisted" : null;
+ return targetAdapter.representsPersistent() ? "Immutable once persisted" : null;
}
return null;
}
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java Mon Jul 9 21:38:13 2012
@@ -226,7 +226,7 @@ public class DomainObjectContainerDefaul
@Override
public boolean isPersistent(final Object domainObject) {
final ObjectAdapter adapter = getAdapterMap().adapterFor(domainObject);
- return adapter.isPersistent();
+ return adapter.representsPersistent();
}
@Override
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java Mon Jul 9 21:38:13 2012
@@ -161,7 +161,7 @@ public class OneToManyAssociationImpl ex
throw new IllegalArgumentException("Can't use null to add an item to a collection");
}
if (readWrite()) {
- if (ownerAdapter.isPersistent() && referencedAdapter.representsTransient()) {
+ if (ownerAdapter.representsPersistent() && referencedAdapter.isTransient()) {
throw new IsisException("can't set a reference to a transient object from a persistent one: " + ownerAdapter.titleString() + " (persistent) -> " + referencedAdapter.titleString() + " (transient)");
}
final CollectionAddToFacet facet = getFacet(CollectionAddToFacet.class);
Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java Mon Jul 9 21:38:13 2012
@@ -169,7 +169,7 @@ public class OneToOneAssociationImpl ext
if (setterFacet == null) {
return;
}
- if (ownerAdapter.isPersistent() && newReferencedAdapter != null && newReferencedAdapter.representsTransient() && !newReferencedAdapter.getSpecification().isParented()) {
+ if (ownerAdapter.representsPersistent() && newReferencedAdapter != null && newReferencedAdapter.isTransient() && !newReferencedAdapter.getSpecification().isParented()) {
// TODO: move to facet ?
throw new IsisException("can't set a reference to a transient object from a persistent one: " + newReferencedAdapter.titleString() + " (transient)");
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java Mon Jul 9 21:38:13 2012
@@ -43,9 +43,9 @@ public class DisabledFacetImpl extends D
}
if (value() == When.UNTIL_PERSISTED) {
- return targetAdapter.representsTransient() ? "Disabled until persisted" : null;
+ return targetAdapter.isTransient() ? "Disabled until persisted" : null;
} else if (value() == When.ONCE_PERSISTED) {
- return targetAdapter.isPersistent() ? "Disabled once persisted" : null;
+ return targetAdapter.representsPersistent() ? "Disabled once persisted" : null;
}
return null;
}
Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hide/HiddenFacetImpl.java Mon Jul 9 21:38:13 2012
@@ -43,9 +43,9 @@ public class HiddenFacetImpl extends Hid
}
if (value() == When.UNTIL_PERSISTED) {
- return targetAdapter.representsTransient() ? "Hidden until persisted" : null;
+ return targetAdapter.isTransient() ? "Hidden until persisted" : null;
} else if (value() == When.ONCE_PERSISTED) {
- return targetAdapter.isPersistent() ? "Hidden once persisted" : null;
+ return targetAdapter.representsPersistent() ? "Hidden once persisted" : null;
}
return null;
}
Modified: incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DomainObjectInvocationHandler.java Mon Jul 9 21:38:13 2012
@@ -292,7 +292,7 @@ public class DomainObjectInvocationHandl
notifyListenersAndVetoIfRequired(interactionResult);
if (getExecutionMode() == ExecutionMode.EXECUTE) {
- if (targetAdapter.representsTransient()) {
+ if (targetAdapter.isTransient()) {
getObjectPersistor().makePersistent(targetAdapter);
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java Mon Jul 9 21:38:13 2012
@@ -276,7 +276,7 @@ public class DataNucleusObjectStore impl
if (LOG.isDebugEnabled()) {
LOG.debug("create object - creating command for: " + adapter);
}
- if (adapter.isPersistent()) {
+ if (adapter.representsPersistent()) {
throw new IllegalArgumentException("Adapter is persistent; adapter: " + adapter);
}
return new DataNucleusCreateObjectCommand(adapter, getPersistenceManager());
@@ -286,7 +286,7 @@ public class DataNucleusObjectStore impl
ensureOpened();
ensureInSession();
- if (!adapter.isPersistent()) {
+ if (!adapter.representsPersistent()) {
throw new IllegalArgumentException("Adapter is not persistent; adapter: " + adapter);
}
if (LOG.isDebugEnabled()) {
@@ -302,7 +302,7 @@ public class DataNucleusObjectStore impl
if (LOG.isDebugEnabled()) {
LOG.debug("destroy object - creating command for: " + adapter);
}
- if (!adapter.isPersistent()) {
+ if (!adapter.representsPersistent()) {
throw new IllegalArgumentException("Adapter is not persistent; adapter: " + adapter);
}
return new DataNucleusDeleteObjectCommand(adapter, getPersistenceManager());
@@ -403,7 +403,7 @@ public class DataNucleusObjectStore impl
}
return;
}
- if (!adapter.isPersistent()) {
+ if (!adapter.representsPersistent()) {
if (LOG.isDebugEnabled()) {
LOG.debug("; not persistent - ignoring");
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/ResolveStateUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/ResolveStateUtil.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/ResolveStateUtil.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/ResolveStateUtil.java Mon Jul 9 21:38:13 2012
@@ -36,7 +36,7 @@ public final class ResolveStateUtil {
private static void moveUpToResolving(final ObjectAdapter adapter) {
// move these on so we can get to part_resolved or resolved.
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
adapter.changeState(ResolveState.RESOLVED);
adapter.changeState(ResolveState.GHOST);
adapter.changeState(ResolveState.RESOLVING);
@@ -59,7 +59,7 @@ public final class ResolveStateUtil {
// TODO: what should we do here? throw exception?
}
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
adapter.changeState(ResolveState.RESOLVED);
adapter.changeState(ResolveState.GHOST);
@@ -90,7 +90,7 @@ public final class ResolveStateUtil {
public static void markAsUpdating(final ObjectAdapter adapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
adapter.changeState(ResolveState.RESOLVED);
}
if (adapter.isResolved()) {
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_persist.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_persist.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_persist.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_persist.java Mon Jul 9 21:38:13 2012
@@ -71,7 +71,7 @@ public class DataNucleusPersistenceMecha
PrimitiveValuedEntity entity = repo.newEntity();
ObjectAdapter adapter = iswf.adapterFor(entity);
- assertThat(adapter.representsTransient(), is(true));
+ assertThat(adapter.isTransient(), is(true));
assertThat(adapter.getResolveState(), is(ResolveState.TRANSIENT));
assertThat(adapter.getOid().isTransient(), is(true));
@@ -86,7 +86,7 @@ public class DataNucleusPersistenceMecha
adapter = iswf.adapterFor(list.get(0));
assertThat(adapter.getResolveState(), is(ResolveState.GHOST));
- assertThat(adapter.representsTransient(), is(false));
+ assertThat(adapter.isTransient(), is(false));
assertThat(adapter.getOid().enString(), is("PRMV:1"));
iswf.commitTran();
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaObjectStore.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaObjectStore.java Mon Jul 9 21:38:13 2012
@@ -279,7 +279,7 @@ public class OpenJpaObjectStore implemen
if (LOG.isDebugEnabled()) {
LOG.debug("create object - creating command for: " + adapter);
}
- if (adapter.isPersistent()) {
+ if (adapter.representsPersistent()) {
throw new IllegalArgumentException("Adapter is persistent; adapter: " + adapter);
}
return new JpaCreateObjectCommand(adapter, getEntityManager());
@@ -289,7 +289,7 @@ public class OpenJpaObjectStore implemen
ensureOpened();
ensureInSession();
- if (!adapter.isPersistent()) {
+ if (!adapter.representsPersistent()) {
throw new IllegalArgumentException("Adapter is not persistent; adapter: " + adapter);
}
if (LOG.isDebugEnabled()) {
@@ -305,7 +305,7 @@ public class OpenJpaObjectStore implemen
if (LOG.isDebugEnabled()) {
LOG.debug("destroy object - creating command for: " + adapter);
}
- if (!adapter.isPersistent()) {
+ if (!adapter.representsPersistent()) {
throw new IllegalArgumentException("Adapter is not persistent; adapter: " + adapter);
}
return new JpaDeleteObjectCommand(adapter, getEntityManager());
@@ -406,7 +406,7 @@ public class OpenJpaObjectStore implemen
}
return;
}
- if (!adapter.isPersistent()) {
+ if (!adapter.representsPersistent()) {
if (LOG.isDebugEnabled()) {
LOG.debug("; not persistent - ignoring");
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/IsisLifecycleListener.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/IsisLifecycleListener.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/IsisLifecycleListener.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/IsisLifecycleListener.java Mon Jul 9 21:38:13 2012
@@ -44,7 +44,7 @@ public class IsisLifecycleListener exten
final Oid oid = adapter.getOid();
// make sure the adapter is transient
- if (!adapter.representsTransient()) {
+ if (!adapter.isTransient()) {
throw new IsisException(MessageFormat.format("adapter is in invalid state; should be {0} but is {1}", ResolveState.TRANSIENT, adapter.getResolveState()));
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/spi/ResolveStateUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/spi/ResolveStateUtil.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/spi/ResolveStateUtil.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/persistence/spi/ResolveStateUtil.java Mon Jul 9 21:38:13 2012
@@ -36,7 +36,7 @@ public final class ResolveStateUtil {
private static void moveUpToResolving(final ObjectAdapter adapter) {
// move these on so we can get to part_resolved or resolved.
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
adapter.changeState(ResolveState.RESOLVED);
adapter.changeState(ResolveState.GHOST);
adapter.changeState(ResolveState.RESOLVING);
@@ -59,7 +59,7 @@ public final class ResolveStateUtil {
// TODO: what should we do here? throw exception?
}
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
adapter.changeState(ResolveState.RESOLVED);
adapter.changeState(ResolveState.GHOST);
@@ -90,7 +90,7 @@ public final class ResolveStateUtil {
public static void markAsUpdating(final ObjectAdapter adapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
adapter.changeState(ResolveState.RESOLVED);
}
if (adapter.isResolved()) {
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaPersistenceMechanismInstallerTest_persist.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaPersistenceMechanismInstallerTest_persist.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaPersistenceMechanismInstallerTest_persist.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jpa/jpa-openjpa/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jpa/openjpa/OpenJpaPersistenceMechanismInstallerTest_persist.java Mon Jul 9 21:38:13 2012
@@ -71,7 +71,7 @@ public class OpenJpaPersistenceMechanism
PrimitiveValuedEntity entity = repo.newEntity();
ObjectAdapter adapter = iswf.adapterFor(entity);
- assertThat(adapter.representsTransient(), is(true));
+ assertThat(adapter.isTransient(), is(true));
assertThat(adapter.getResolveState(), is(ResolveState.TRANSIENT));
assertThat(adapter.getOid().isTransient(), is(true));
@@ -86,7 +86,7 @@ public class OpenJpaPersistenceMechanism
adapter = iswf.adapterFor(list.get(0));
assertThat(adapter.getResolveState(), is(ResolveState.GHOST));
- assertThat(adapter.representsTransient(), is(false));
+ assertThat(adapter.isTransient(), is(false));
assertThat(adapter.getOid().enString(), is("PRMV:1"));
iswf.commitTran();
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/src/main/java/org/apache/isis/runtimes/dflt/objectstores/nosql/ObjectReader.java Mon Jul 9 21:38:13 2012
@@ -55,8 +55,8 @@ public class ObjectReader {
final String oidStr = reader.readOid();
final RootOid rootOid = getOidMarshaller().unmarshal(oidStr, RootOid.class);
- final ObjectAdapter object = getAdapter(rootOid);
- if (object.getResolveState().isResolved()) {
+ final ObjectAdapter adapter = getAdapter(rootOid);
+ if (adapter.isResolved()) {
Version version = null;
final String versionString = reader.readVersion();
if (!versionString.equals("")) {
@@ -64,7 +64,7 @@ public class ObjectReader {
final String time = reader.readTime();
version = versionCreator.version(versionString, user, time);
}
- if (version.different(object.getVersion())) {
+ if (version.different(adapter.getVersion())) {
// TODO - do we need to CHECK version and update
throw new UnexpectedCallException();
}
@@ -73,10 +73,10 @@ public class ObjectReader {
// TODO move lock to common method
// object.setOptimisticLock(version);
- loadState(reader, versionCreator, dataEncrypters, object);
+ loadState(reader, versionCreator, dataEncrypters, adapter);
}
- return object;
+ return adapter;
}
public void update(final StateReader reader, final VersionCreator versionCreator, final Map<String, DataEncryption> dataEncrypters, final ObjectAdapter object) {
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java Mon Jul 9 21:38:13 2012
@@ -353,7 +353,7 @@ public class AutoMapper extends Abstract
final Oid oid = idMapping.recreateOid(rs, specification);
final ObjectAdapter adapter = getAdapter(cls, oid);
- if (adapter.getResolveState().isValidToChangeTo(ResolveState.RESOLVING)) {
+ if (adapter.canTransitionToResolving()) {
loadFields(adapter, rs);
loadCollections(connector, adapter); // KAM
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/src/main/java/org/apache/isis/runtimes/dflt/objectstores/xml/internal/data/ObjectData.java Mon Jul 9 21:38:13 2012
@@ -112,7 +112,7 @@ public class ObjectData extends Data {
}
public void addAssociation(final ObjectAdapter fieldContent, final String fieldId, final boolean ensurePersistent) {
- final boolean notAlreadyPersistent = fieldContent != null && fieldContent.representsTransient();
+ final boolean notAlreadyPersistent = fieldContent != null && fieldContent.isTransient();
if (ensurePersistent && notAlreadyPersistent) {
throw new IllegalStateException("Cannot save an object that is not persistent: " + fieldContent);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java Mon Jul 9 21:38:13 2012
@@ -65,14 +65,14 @@ public class ObjectFixtureFilePersistor
} else if (line.startsWith(" ")) {
loadFieldData(object, loaded, line);
} else {
- if (object != null && !object.isPersistent()) {
+ if (object != null && !object.representsPersistent()) {
getPersistenceSession().makePersistent(object);
}
object = loaded.get(line);
}
}
- if (object != null && !object.isPersistent()) {
+ if (object != null && !object.representsPersistent()) {
getPersistenceSession().makePersistent(object);
}
} catch (final Exception e) {
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/CollectionData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/CollectionData.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/CollectionData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/CollectionData.java Mon Jul 9 21:38:13 2012
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.encoding.DataInputExtended;
import org.apache.isis.core.commons.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
public class CollectionData extends Data {
@@ -32,8 +31,8 @@ public class CollectionData extends Data
private final static long serialVersionUID = 1L;
final Data[] elements;
- public CollectionData(final Oid oid, final ResolveState resolveState, final String className, final Data[] elements) {
- super(oid, resolveState.name(), className);
+ public CollectionData(final Oid oid, final String className, final Data[] elements) {
+ super(oid, className);
this.elements = elements;
initialized();
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Data.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Data.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Data.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Data.java Mon Jul 9 21:38:13 2012
@@ -34,20 +34,16 @@ public class Data implements Encodable,
private final static long serialVersionUID = 1L;
private final String className;
- private final String resolveState;
private final Oid oid;
- public Data(final Oid oid, final String resolveState, final String className) {
+ public Data(final Oid oid, final String className) {
this.className = className;
- this.resolveState = resolveState;
this.oid = oid;
initialized();
}
public Data(final DataInputExtended input) throws IOException {
this.className = input.readUTF();
- this.resolveState = input.readUTF(); // TODO: make ResolveState
- // encodable?
this.oid = input.readEncodable(Oid.class);
initialized();
}
@@ -55,7 +51,6 @@ public class Data implements Encodable,
@Override
public void encode(final DataOutputExtended output) throws IOException {
output.writeUTF(className);
- output.writeUTF(resolveState);
output.writeEncodable(oid);
}
@@ -79,14 +74,9 @@ public class Data implements Encodable,
return className;
}
- public String getResolveState() {
- return resolveState;
- }
-
public void debug(final DebugBuilder debug) {
debug.appendln(className);
debug.appendln(oid != null ? oid.toString() : "null");
- debug.appendln(resolveState);
}
@Override
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/Memento.java Mon Jul 9 21:38:13 2012
@@ -100,14 +100,14 @@ public class Memento implements Serializ
collData[i++] = createReferenceData(ref);
}
final String elementTypeSpecName = adapter.getSpecification().getFullIdentifier();
- return new CollectionData(adapter.getOid(), adapter.getResolveState(), elementTypeSpecName, collData);
+ return new CollectionData(adapter.getOid(), elementTypeSpecName, collData);
}
private ObjectData createObjectData(final ObjectAdapter adapter) {
transientObjects.add(adapter.getOid());
final ObjectSpecification cls = adapter.getSpecification();
final List<ObjectAssociation> associations = cls.getAssociations();
- final ObjectData data = new ObjectData(adapter.getOid(), adapter.getResolveState().name(), cls.getFullIdentifier());
+ final ObjectData data = new ObjectData(adapter.getOid(), cls.getFullIdentifier());
for (int i = 0; i < associations.size(); i++) {
if (associations.get(i).isNotPersisted()) {
if (associations.get(i).isOneToManyAssociation()) {
@@ -156,10 +156,8 @@ public class Memento implements Serializ
return createObjectData(referencedAdapter);
}
- final String resolvedState = referencedAdapter.getResolveState().name();
final String specification = referencedAdapter.getSpecification().getFullIdentifier();
- return new Data(refOid, resolvedState, specification);
-
+ return new Data(refOid, specification);
}
private Data createStandaloneData(final ObjectAdapter adapter) {
@@ -287,7 +285,7 @@ public class Memento implements Serializ
PersistorUtil.startStateTransition(objectAdapter, targetState);
updateFields(objectAdapter, data);
PersistorUtil.endStateTransition(objectAdapter);
- } else if (objectAdapter.representsTransient() && targetState == ResolveState.TRANSIENT) {
+ } else if (objectAdapter.isTransient() && targetState == ResolveState.TRANSIENT) {
updateFields(objectAdapter, data);
} else if (objectAdapter.isParented()) {
updateFields(objectAdapter, data);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/ObjectData.java Mon Jul 9 21:38:13 2012
@@ -62,8 +62,8 @@ public class ObjectData extends Data {
}
}
- public ObjectData(final Oid oid, final String resolveState, final String className) {
- super(oid, resolveState, className);
+ public ObjectData(final Oid oid, final String className) {
+ super(oid, className);
initialized();
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/StandaloneData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/StandaloneData.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/StandaloneData.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/memento/StandaloneData.java Mon Jul 9 21:38:13 2012
@@ -66,7 +66,7 @@ public class StandaloneData extends Data
private Serializable objectAsSerializable;
public StandaloneData(final ObjectAdapter adapter) {
- super(null, adapter.getResolveState().name(), adapter.getSpecification().getFullIdentifier());
+ super(null, adapter.getSpecification().getFullIdentifier());
final Object object = adapter.getObject();
if (object instanceof Serializable) {
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorUtil.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorUtil.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/PersistorUtil.java Mon Jul 9 21:38:13 2012
@@ -36,11 +36,11 @@ public class PersistorUtil {
// update resolve state
// //////////////////////////////////////////////////////////////////
- public static void startStateTransition(final ObjectAdapter object, final ResolveState state) {
+ public static void startStateTransition(final ObjectAdapter adapter, final ResolveState state) {
if (LOG.isTraceEnabled()) {
- LOG.trace("start " + object + " as " + state.name());
+ LOG.trace("start " + adapter + " as " + state.name());
}
- object.changeState(state);
+ adapter.changeState(state);
}
/**
@@ -48,13 +48,13 @@ public class PersistorUtil {
* as specified by the second parameter. Attempting to specify any other
* state throws a run time exception.
*/
- public static void endStateTransition(final ObjectAdapter object) {
- final ResolveState endState = object.getResolveState().getEndState();
+ public static void endStateTransition(final ObjectAdapter adapter) {
+ final ResolveState endState = adapter.getResolveState().getEndState();
Assert.assertNotNull("end state required", endState);
if (LOG.isTraceEnabled()) {
- LOG.trace("end " + object + " as " + endState.name());
+ LOG.trace("end " + adapter + " as " + endState.name());
}
- object.changeState(endState);
+ adapter.changeState(endState);
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java Mon Jul 9 21:38:13 2012
@@ -128,8 +128,13 @@ public class PojoAdapter extends Instanc
@Override
public ResolveState getResolveState() {
+ return aggregateResolveState();
+ }
+
+
+ private ResolveState aggregateResolveState() {
return isAggregated() ?
- getAggregateRoot().getResolveState() :
+ ((PojoAdapter)getAggregateRoot()).aggregateResolveState() :
resolveState;
}
@@ -137,7 +142,6 @@ public class PojoAdapter extends Instanc
@Override
public void changeState(final ResolveState newState) {
-
if(isAggregated()) {
return; // no-op for aggregated objects.
}
@@ -162,7 +166,7 @@ public class PojoAdapter extends Instanc
}
private boolean elementsLoaded() {
- return representsTransient() || this.isResolved();
+ return isTransient() || this.isResolved();
}
// ///////////////////////////////////////////////////////////////////
@@ -170,68 +174,68 @@ public class PojoAdapter extends Instanc
// ///////////////////////////////////////////////////////////////////
/**
- * Just delegates to {@link #getResolveState() resolve state}.
+ * Just delegates to {@link #aggregateResolveState() resolve state}.
*
* @see ResolveState#representsPersistent()
- * @see #representsTransient()
+ * @see #isTransient()
*/
@Override
- public boolean isPersistent() {
- return getResolveState().representsPersistent();
+ public boolean representsPersistent() {
+ return aggregateResolveState().representsPersistent();
}
/**
- * Just delegates to {@link #getResolveState() resolve state}.
+ * Just delegates to {@link #aggregateResolveState() resolve state}.
*
* @see ResolveState#isTransient()
- * @see #isPersistent()
+ * @see #representsPersistent()
*/
@Override
- public boolean representsTransient() {
- return getResolveState().isTransient();
+ public boolean isTransient() {
+ return aggregateResolveState().isTransient();
}
@Override
public boolean isNew() {
- return getResolveState().isNew();
+ return aggregateResolveState().isNew();
}
@Override
public boolean isResolving() {
- return getResolveState().isResolving();
+ return aggregateResolveState().isResolving();
}
@Override
public boolean isResolved() {
- return getResolveState().isResolved();
+ return aggregateResolveState().isResolved();
}
@Override
public boolean isGhost() {
- return getResolveState().isGhost();
+ return aggregateResolveState().isGhost();
}
@Override
public boolean isUpdating() {
- return getResolveState().isUpdating();
+ return aggregateResolveState().isUpdating();
}
@Override
public boolean isDestroyed() {
- return getResolveState().isDestroyed();
+ return aggregateResolveState().isDestroyed();
}
@Override
public boolean canTransitionToResolving() {
- return getResolveState().canTransitionToResolving();
+ return aggregateResolveState().canTransitionToResolving();
}
@Override
public boolean isTitleAvailable() {
- final ResolveState resolveState = getResolveState();
+ final ResolveState resolveState = aggregateResolveState();
return resolveState.isValue() || resolveState.isResolved();
}
@@ -276,7 +280,7 @@ public class PojoAdapter extends Instanc
@Override
public boolean isValue() {
- // equivalently: getResolveState().isValue();
+ // equivalently: aggregateResolveState().isValue();
return oid == null;
}
@@ -365,7 +369,7 @@ public class PojoAdapter extends Instanc
}
private String objectTitleString() {
- if (getResolveState().isNew()) {
+ if (isNew()) {
return "";
}
if (getObject() instanceof String) {
@@ -439,7 +443,7 @@ public class PojoAdapter extends Instanc
}
protected void toString(final ToString str) {
- str.append(getResolveState().code());
+ str.append(aggregateResolveState().code());
final Oid oid = getOid();
if (oid != null) {
str.append(":");
@@ -514,6 +518,12 @@ public class PojoAdapter extends Instanc
}
+ @Override
+ public boolean respondToChangesInPersistentObjects() {
+ return aggregateResolveState().respondToChangesInPersistentObjects();
+ }
+
+
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adaptermanager/AdapterManagerDefault.java Mon Jul 9 21:38:13 2012
@@ -376,7 +376,7 @@ public class AdapterManagerDefault exten
final ObjectAdapter rootAdapter = adapter.getAggregateRoot(); // REVIEW: think this is redundant; would seem this method is only ever called for roots anyway.
final RootOid transientRootOid = (RootOid) rootAdapter.getOid();
- Ensure.ensureThatArg(rootAdapter.representsTransient(), is(true), "root adapter should be transient; oid:" + transientRootOid);
+ Ensure.ensureThatArg(rootAdapter.isTransient(), is(true), "root adapter should be transient; oid:" + transientRootOid);
Ensure.ensureThatArg(transientRootOid.isTransient(), is(true), "root adapter's OID should be transient; oid:" + transientRootOid);
final RootAndCollectionAdapters rootAndCollectionAdapters = new RootAndCollectionAdapters(adapter, this);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java Mon Jul 9 21:38:13 2012
@@ -72,7 +72,7 @@ public abstract class PersistAlgorithmAb
* @see #alreadyPersistedOrNotPersistableOrServiceOrStandalone(ObjectAdapter)
*/
protected static boolean alreadyPersistedOrNotPersistable(final ObjectAdapter adapter) {
- return adapter.isPersistent() || objectSpecNotPersistable(adapter);
+ return adapter.representsPersistent() || objectSpecNotPersistable(adapter);
}
/**
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java Mon Jul 9 21:38:13 2012
@@ -53,7 +53,7 @@ public class DefaultPersistAlgorithm ext
if (adapter.isGhost()) {
adapter.changeState(ResolveState.RESOLVING);
adapter.changeState(ResolveState.RESOLVED);
- } else if (adapter.representsTransient()) {
+ } else if (adapter.isTransient()) {
adapter.changeState(ResolveState.RESOLVED);
}
final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(adapter);
@@ -66,46 +66,47 @@ public class DefaultPersistAlgorithm ext
}
}
- protected void persist(final ObjectAdapter object, final ToPersistObjectSet toPersistObjectSet) {
- if (alreadyPersistedOrNotPersistableOrServiceOrStandalone(object)) {
+ protected void persist(final ObjectAdapter adapter, final ToPersistObjectSet toPersistObjectSet) {
+ if (alreadyPersistedOrNotPersistableOrServiceOrStandalone(adapter)) {
return;
}
- final List<ObjectAssociation> fields = object.getSpecification().getAssociations();
- if (!object.getSpecification().isEncodeable() && fields.size() > 0) {
+ final List<ObjectAssociation> associations = adapter.getSpecification().getAssociations();
+ if (!adapter.getSpecification().isEncodeable() && associations.size() > 0) {
if(LOG.isDebugEnabled()) {
- LOG.debug("make persistent " + object);
+ LOG.debug("make persistent " + adapter);
}
- CallbackUtils.callCallback(object, PersistingCallbackFacet.class);
- toPersistObjectSet.remapAsPersistent(object);
+ CallbackUtils.callCallback(adapter, PersistingCallbackFacet.class);
+ toPersistObjectSet.remapAsPersistent(adapter);
- // was previously to SERIALIZING_RESOLVED, but after refactoring simplifications this is now equivalent to UPDATING
+ // was previously to SERIALIZING_RESOLVED, but
+ // after refactoring simplifications this is now equivalent to UPDATING
final ResolveState stateWhilePersisting = ResolveState.UPDATING;
- object.changeState(stateWhilePersisting);
+ adapter.changeState(stateWhilePersisting);
- for (int i = 0; i < fields.size(); i++) {
- final ObjectAssociation field = fields.get(i);
- if (field.isNotPersisted()) {
+ for (int i = 0; i < associations.size(); i++) {
+ final ObjectAssociation objectAssoc = associations.get(i);
+ if (objectAssoc.isNotPersisted()) {
continue;
}
- if (field.isOneToManyAssociation()) {
- final ObjectAdapter collection = field.get(object);
+ if (objectAssoc.isOneToManyAssociation()) {
+ final ObjectAdapter collection = objectAssoc.get(adapter);
if (collection == null) {
- throw new ObjectPersistenceException("Collection " + field.getName() + " does not exist in " + object.getSpecification().getFullIdentifier());
+ throw new ObjectPersistenceException("Collection " + objectAssoc.getName() + " does not exist in " + adapter.getSpecification().getFullIdentifier());
}
makePersistent(collection, toPersistObjectSet);
} else {
- final ObjectAdapter fieldValue = field.get(object);
+ final ObjectAdapter fieldValue = objectAssoc.get(adapter);
if (fieldValue == null) {
continue;
}
persist(fieldValue, toPersistObjectSet);
}
}
- toPersistObjectSet.addCreateObjectCommand(object);
- CallbackUtils.callCallback(object, PersistedCallbackFacet.class);
- object.changeState(stateWhilePersisting.getEndState());
+ toPersistObjectSet.addCreateObjectCommand(adapter);
+ CallbackUtils.callCallback(adapter, PersistedCallbackFacet.class);
+ adapter.changeState(stateWhilePersisting.getEndState());
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java Mon Jul 9 21:38:13 2012
@@ -87,7 +87,7 @@ public class TopDownPersistAlgorithm ext
private void makeCollectionPersistent(final ObjectAdapter collectionAdapter, final ToPersistObjectSet toPersistObjectSet) {
LOG.info("persist " + collectionAdapter);
- if (collectionAdapter.representsTransient()) {
+ if (collectionAdapter.isTransient()) {
collectionAdapter.changeState(ResolveState.RESOLVED);
}
final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collectionAdapter);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java Mon Jul 9 21:38:13 2012
@@ -114,7 +114,7 @@ public class TwoPassPersistAlgorithm ext
private void makeCollectionPersistent(final ObjectAdapter collection, final ToPersistObjectSet toPersistObjectSet) {
LOG.info("persist " + collection);
- if (collection.representsTransient()) {
+ if (collection.isTransient()) {
collection.changeState(ResolveState.RESOLVED);
}
final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/system/persistence/PersistenceSession.java Mon Jul 9 21:38:13 2012
@@ -391,11 +391,10 @@ public class PersistenceSession implemen
}
final Object pojo = objectSpec.createObject();
final ObjectAdapter adapter = getAdapterManager().adapterFor(pojo, parentAdapter);
+ // returned adapter's ResolveState will either be TRANSIENT or GHOST
objectSpec.initialize(adapter);
if (adapter.isGhost()) {
adapter.changeState(ResolveState.RESOLVING);
- }
- if (adapter.getResolveState().isValidToChangeTo(ResolveState.RESOLVED)) {
adapter.changeState(ResolveState.RESOLVED);
}
return adapter;
@@ -660,7 +659,7 @@ public class PersistenceSession implemen
protected boolean isImmutable(final ObjectAdapter adapter) {
final ObjectSpecification noSpec = adapter.getSpecification();
- return ImmutableFacetUtils.isAlwaysImmutable(noSpec) || (ImmutableFacetUtils.isImmutableOncePersisted(noSpec) && adapter.isPersistent());
+ return ImmutableFacetUtils.isAlwaysImmutable(noSpec) || (ImmutableFacetUtils.isImmutableOncePersisted(noSpec) && adapter.representsPersistent());
}
// ////////////////////////////////////////////////////////////////////
@@ -915,7 +914,7 @@ public class PersistenceSession implemen
return;
}
Assert.assertFalse("only resolve object that is not yet resolved", adapter, adapter.isResolved());
- Assert.assertTrue("only resolve object that is persistent", adapter, adapter.isPersistent());
+ Assert.assertTrue("only resolve object that is persistent", adapter, adapter.representsPersistent());
resolveImmediatelyFromPersistenceLayer(adapter);
if (LOG.isDebugEnabled()) {
// don't log object - its toString() may use the unresolved
@@ -967,7 +966,7 @@ public class PersistenceSession implemen
if (referenceAdapter == null || referenceAdapter.isResolved()) {
return;
}
- if (!referenceAdapter.isPersistent()) {
+ if (!referenceAdapter.representsPersistent()) {
return;
}
if (LOG.isInfoEnabled()) {
@@ -1011,7 +1010,7 @@ public class PersistenceSession implemen
*/
@Override
public void makePersistent(final ObjectAdapter adapter) {
- if (adapter.isPersistent()) {
+ if (adapter.representsPersistent()) {
throw new NotPersistableException("Object already persistent: " + adapter);
}
if (!adapter.getSpecification().persistability().isPersistable()) {
@@ -1059,12 +1058,12 @@ public class PersistenceSession implemen
@Override
public void objectChanged(final ObjectAdapter adapter) {
- if (adapter.representsTransient() || (adapter.isParented() && adapter.getAggregateRoot().representsTransient())) {
+ if (adapter.isTransient() || (adapter.isParented() && adapter.getAggregateRoot().isTransient())) {
addObjectChangedForPresentationLayer(adapter);
return;
}
- if (adapter.getResolveState().respondToChangesInPersistentObjects()) {
+ if (adapter.respondToChangesInPersistentObjects()) {
if (isImmutable(adapter)) {
// previously used to throw
// new
@@ -1079,7 +1078,7 @@ public class PersistenceSession implemen
addObjectChangedForPersistenceLayer(adapter);
addObjectChangedForPresentationLayer(adapter);
}
- if (adapter.getResolveState().respondToChangesInPersistentObjects() || adapter.representsTransient()) {
+ if (adapter.respondToChangesInPersistentObjects() || adapter.isTransient()) {
addObjectChangedForPresentationLayer(adapter);
}
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java Mon Jul 9 21:38:13 2012
@@ -44,7 +44,7 @@ public class CollectionAddToFacetWrapTra
@Override
public void add(final ObjectAdapter adapter, final ObjectAdapter referencedAdapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
// NOT !adapter.isPersistent();
// (value adapters are neither persistent or transient)
underlyingFacet.add(adapter, referencedAdapter);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java Mon Jul 9 21:38:13 2012
@@ -44,7 +44,7 @@ public class CollectionClearFacetWrapTra
@Override
public void clear(final ObjectAdapter adapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
// NOT !adapter.isPersistent();
// (value adapters are neither persistent or transient)
underlyingFacet.clear(adapter);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java Mon Jul 9 21:38:13 2012
@@ -44,7 +44,7 @@ public class CollectionRemoveFromFacetWr
@Override
public void remove(final ObjectAdapter adapter, final ObjectAdapter referencedAdapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
// NOT !adapter.isPersistent();
// (value adapters are neither persistent or transient)
underlyingFacet.remove(adapter, referencedAdapter);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java Mon Jul 9 21:38:13 2012
@@ -44,7 +44,7 @@ public class PropertyClearFacetWrapTrans
@Override
public void clearProperty(final ObjectAdapter adapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
// NOT !adapter.isPersistent();
// (value adapters are neither persistent or transient)
underlyingFacet.clearProperty(adapter);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java Mon Jul 9 21:38:13 2012
@@ -44,7 +44,7 @@ public class PropertySetterFacetWrapTran
@Override
public void setProperty(final ObjectAdapter adapter, final ObjectAdapter referencedAdapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
// NOT !adapter.isPersistent();
// (value adapters are neither persistent or transient)
underlyingFacet.setProperty(adapter, referencedAdapter);
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierDefault.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierDefault.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/transaction/updatenotifier/UpdateNotifierDefault.java Mon Jul 9 21:38:13 2012
@@ -52,7 +52,7 @@ public class UpdateNotifierDefault exten
@Override
public synchronized void addChangedObject(final ObjectAdapter adapter) {
- if (!adapter.isResolved() && !adapter.representsTransient()) {
+ if (!adapter.isResolved() && !adapter.isTransient()) {
return;
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java Mon Jul 9 21:38:13 2012
@@ -135,10 +135,10 @@ public class OneToManyAssociationImplTes
one(mockPeer).containsFacet(NotPersistedFacet.class);
will(returnValue(false));
- one(mockOwnerAdapter).isPersistent();
+ one(mockOwnerAdapter).representsPersistent();
will(returnValue(true));
- one(mockAssociatedAdapter).representsTransient();
+ one(mockAssociatedAdapter).isTransient();
will(returnValue(false));
one(mockPeer).getFacet(CollectionAddToFacet.class);
Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/runtime/memento/MementoTest_data.java Mon Jul 9 21:38:13 2012
@@ -78,17 +78,6 @@ public class MementoTest_data {
@Test
- public void data_getResolveState_whenTransient() throws Exception {
- assertEquals("Transient", data1.getResolveState());
- }
-
-
- @Test
- public void data_getResolveState_whenResolved() throws Exception {
- assertEquals("Resolved", data2.getResolveState());
- }
-
- @Test
public void data_getClassName() throws Exception {
assertEquals(WrapperValuedEntity.class.getName(), data1.getClassName());
}
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SaveObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SaveObject.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SaveObject.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/SaveObject.java Mon Jul 9 21:38:13 2012
@@ -45,7 +45,7 @@ public class SaveObject extends PerformA
throw ScenarioBoundValueException.current(performBinding, valid.getReason());
}
- if (onAdapter.isPersistent()) {
+ if (onAdapter.representsPersistent()) {
throw ScenarioBoundValueException.current(performBinding, "(already persistent)");
}
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/NotSaved.java Mon Jul 9 21:38:13 2012
@@ -36,7 +36,7 @@ public class NotSaved extends ThatSubcom
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final CellBinding thatItBinding = performContext.getPeer().getThatItBinding();
- if (onAdapter.isPersistent()) {
+ if (onAdapter.representsPersistent()) {
throw ScenarioBoundValueException.current(thatItBinding, "(saved)");
}