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 [2/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/...
Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Saved.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/Saved.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/Saved.java (original)
+++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/checkthat/object/Saved.java Mon Jul 9 21:38:13 2012
@@ -36,7 +36,7 @@ public class Saved extends ThatSubcomman
final ObjectAdapter onAdapter = performContext.getOnAdapter();
final CellBinding thatItBinding = performContext.getPeer().getThatItBinding();
- if (!onAdapter.isPersistent()) {
+ if (!onAdapter.representsPersistent()) {
throw ScenarioBoundValueException.current(thatItBinding, "(not saved)");
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/service/ServiceObject.java Mon Jul 9 21:38:13 2012
@@ -108,7 +108,7 @@ public class ServiceObject extends Abstr
@Override
public boolean isTransient() {
- return adapter != null && adapter.representsTransient();
+ return adapter != null && adapter.isTransient();
}
public void setObject(final ObjectAdapter object) {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/ObjectParameterImpl.java Mon Jul 9 21:38:13 2012
@@ -122,7 +122,7 @@ public class ObjectParameterImpl extends
@Override
public boolean isTransient() {
- return adapter != null && adapter.representsTransient();
+ return adapter != null && adapter.isTransient();
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/action/OptionFactory.java Mon Jul 9 21:38:13 2012
@@ -56,7 +56,7 @@ public class OptionFactory {
return;
}
final Oid oid = adapter.getOid();
- if (oid != null && adapter.representsTransient()) {
+ if (oid != null && adapter.isTransient()) {
return;
}
if (noSpec.isService()) {
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java Mon Jul 9 21:38:13 2012
@@ -132,7 +132,7 @@ public abstract class AbstractCollection
options.add(new UserActionAbstract("Clear resolved", ActionType.DEBUG) {
@Override
public Consent disabled(final View component) {
- return ConsentAbstract.allowIf(collection == null || !(collection.representsTransient()) || collection.isGhost());
+ return ConsentAbstract.allowIf(collection == null || !(collection.isTransient()) || collection.isGhost());
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/CollectionElement.java Mon Jul 9 21:38:13 2012
@@ -96,7 +96,7 @@ public class CollectionElement extends A
@Override
public boolean isTransient() {
- return adapter.representsTransient();
+ return adapter.isTransient();
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/AbstractObjectContent.java Mon Jul 9 21:38:13 2012
@@ -118,7 +118,7 @@ public abstract class AbstractObjectCont
@Override
public Consent disabled(final View view) {
final ObjectAdapter object = view.getContent().getAdapter();
- return ConsentAbstract.allowIf(object == null || !object.representsTransient() || object.isGhost());
+ return ConsentAbstract.allowIf(object == null || !object.isTransient() || object.isGhost());
}
@Override
@@ -155,7 +155,7 @@ public abstract class AbstractObjectCont
}
private Consent setFieldOfMatchingType(final ObjectAdapter targetAdapter, final ObjectAdapter sourceAdapter) {
- if (targetAdapter.representsTransient() && sourceAdapter.isPersistent()) {
+ if (targetAdapter.isTransient() && sourceAdapter.representsPersistent()) {
// TODO: use Facet for this test instead.
return new Veto("Can't set field in persistent object with reference to non-persistent object");
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/content/RootObject.java Mon Jul 9 21:38:13 2012
@@ -106,7 +106,7 @@ public class RootObject extends Abstract
@Override
public boolean isTransient() {
- return adapter != null && adapter.representsTransient();
+ return adapter != null && adapter.isTransient();
}
@Override
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldImpl.java Mon Jul 9 21:38:13 2012
@@ -66,7 +66,7 @@ public class OneToManyFieldImpl extends
// TODO: move logic into Facet
return new Veto(String.format("Only objects of type %s are allowed in this collection", elementSpecification.getSingularName()));
}
- if (parentAdapter.isPersistent() && sourceAdapter.representsTransient()) {
+ if (parentAdapter.representsPersistent() && sourceAdapter.isTransient()) {
// TODO: move logic into Facet
return new Veto("Can't set field in persistent object with reference to non-persistent object");
}
Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToOneFieldImpl.java Mon Jul 9 21:38:13 2012
@@ -73,7 +73,7 @@ public class OneToOneFieldImpl extends A
return new Veto(String.format("Can only drop objects of type %s", targetType.getSingularName()));
}
- if (getParent().isPersistent() && adapter.representsTransient()) {
+ if (getParent().representsPersistent() && adapter.isTransient()) {
// TODO: move logic into Facet
return new Veto("Can't drop a non-persistent into this persistent object");
}
@@ -159,7 +159,7 @@ public class OneToOneFieldImpl extends A
@Override
public boolean isTransient() {
- return adapter != null && adapter.representsTransient();
+ return adapter != null && adapter.isTransient();
}
@Override
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/edit/EditObject.java Mon Jul 9 21:38:13 2012
@@ -38,7 +38,7 @@ public class EditObject implements Actio
throw new ActionException("Task no longer in progress");
}
final ObjectAdapter object = context.getMappedObject(idString);
- if (!(object.representsTransient())) {
+ if (!(object.isTransient())) {
context.setObjectCrumb(object);
}
final EditTask editTask = new EditTask(context, object);
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java Mon Jul 9 21:38:13 2012
@@ -275,7 +275,7 @@ public class Context implements Serializ
// ensure resolved if currently a ghost;
// start/end xactn if required
- if (adapter.isPersistent() && adapter.isGhost()) {
+ if (adapter.representsPersistent() && adapter.isGhost()) {
getPersistenceSession().resolveImmediately(adapter);
}
@@ -345,7 +345,7 @@ public class Context implements Serializ
}
private static RootAdapterMapping persistentOrTransientObjectMappingFor(final ObjectAdapter adapter) {
- return adapter.representsTransient() ? new TransientRootAdapterMapping(adapter) : new PersistentRootAdapterMapping(adapter);
+ return adapter.isTransient() ? new TransientRootAdapterMapping(adapter) : new PersistentRootAdapterMapping(adapter);
}
@@ -538,7 +538,7 @@ public class Context implements Serializ
public void updateVersion(final ObjectAdapter adapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
return;
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java Mon Jul 9 21:38:13 2012
@@ -37,7 +37,7 @@ public class PersistentRootAdapterMappin
public PersistentRootAdapterMapping(final ObjectAdapter adapter) {
super(adapter);
Assert.assertFalse("OID is for transient", adapter.getOid().isTransient());
- Assert.assertFalse("adapter is for transient", adapter.representsTransient());
+ Assert.assertFalse("adapter is for transient", adapter.isTransient());
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientRootAdapterMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientRootAdapterMapping.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientRootAdapterMapping.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientRootAdapterMapping.java Mon Jul 9 21:38:13 2012
@@ -33,7 +33,7 @@ public class TransientRootAdapterMapping
public TransientRootAdapterMapping(final ObjectAdapter adapter) {
super(adapter);
Assert.assertFalse("OID is for persistent", !adapter.getOid().isTransient());
- Assert.assertFalse("adapter is for persistent", !adapter.representsTransient());
+ Assert.assertFalse("adapter is for persistent", !adapter.isTransient());
memento = new Memento(adapter);
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java Mon Jul 9 21:38:13 2012
@@ -73,7 +73,7 @@ public class AddItemToCollectionTask ext
final ObjectAdapter[] parameterAdapters = getEntries(context);
field.addElement(targetAdapter, parameterAdapters[0]);
- if (targetAdapter.representsTransient()) {
+ if (targetAdapter.isTransient()) {
getPersistenceSession().makePersistent(targetAdapter);
}
return targetAdapter;
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java Mon Jul 9 21:38:13 2012
@@ -93,7 +93,7 @@ public class EditTask extends Task {
i++;
}
- final boolean isTransient = adapter.representsTransient();
+ final boolean isTransient = adapter.isTransient();
newType = isTransient ? getTarget(context).getSpecification().getSingularName() : null;
}
@@ -132,7 +132,7 @@ public class EditTask extends Task {
}
}
- if (target.representsTransient()) {
+ if (target.isTransient()) {
saveState(target, entries);
final Consent isValid = target.getSpecification().isValid(target);
error = isValid.isVetoed() ? isValid.getReason() : null;
@@ -144,7 +144,7 @@ public class EditTask extends Task {
final ObjectAdapter targetAdapter = getTarget(context);
final ObjectAdapter[] entryAdapters = getEntries(context);
- if (targetAdapter.representsTransient()) {
+ if (targetAdapter.isTransient()) {
final ObjectAction action = targetAdapter.getSpecification().getObjectAction(ActionType.USER, "save", ObjectSpecification.EMPTY_LIST);
if (action == null) {
getPersistenceSession().makePersistent(targetAdapter);
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java Mon Jul 9 21:38:13 2012
@@ -112,7 +112,7 @@ public final class InvokeMethod implemen
static void forwardObjectResult(final Request request, final Context context, final ObjectAdapter resultAdapter) {
final String objectId = context.mapObject(resultAdapter);
- if (resultAdapter.representsTransient() && resultAdapter.getSpecification().persistability() == Persistability.USER_PERSISTABLE) {
+ if (resultAdapter.isTransient() && resultAdapter.getSpecification().persistability() == Persistability.USER_PERSISTABLE) {
request.forward(ForwardRequest.editObject(objectId));
} else if (resultAdapter.getSpecification().isService()) {
request.forward(ForwardRequest.viewService(objectId));
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java Mon Jul 9 21:38:13 2012
@@ -98,7 +98,7 @@ public final class TaskStep implements A
final ViewPane content = page.getViewPane();
final ObjectAdapter targetAdapter = task.getTarget(context);
String titleString = targetAdapter.titleString();
- if (targetAdapter.representsTransient()) {
+ if (targetAdapter.isTransient()) {
titleString += " (Unsaved)";
}
content.setTitle(titleString, targetAdapter.getSpecification().getDescription());
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java Mon Jul 9 21:38:13 2012
@@ -200,7 +200,7 @@ public abstract class AbstractObjectMemb
}
private void addDetailsLinkIfPersistent() {
- if (!objectAdapter.isPersistent()) {
+ if (!objectAdapter.representsPersistent()) {
return;
}
final JsonRepresentation link = linkTo.memberBuilder(Rel.DETAILS, memberType, objectMember).build();
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainObjectReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainObjectReprRenderer.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainObjectReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/DomainObjectReprRenderer.java Mon Jul 9 21:38:13 2012
@@ -116,7 +116,7 @@ public class DomainObjectReprRenderer ex
// self, oid
if (!mode.isCutDown()) {
- if (objectAdapter.isPersistent()) {
+ if (objectAdapter.representsPersistent()) {
if (includesSelf) {
final JsonRepresentation self = linkToBuilder.with(objectAdapter).builder(Rel.SELF).build();
getLinks().arrayAdd(self);
@@ -156,7 +156,7 @@ public class DomainObjectReprRenderer ex
// extensions
final boolean isService = objectAdapter.getSpecification().isService();
getExtensions().mapPut("isService", isService);
- getExtensions().mapPut("isPersistent", objectAdapter.isPersistent());
+ getExtensions().mapPut("isPersistent", objectAdapter.representsPersistent());
}
return representation;
@@ -246,7 +246,7 @@ public class DomainObjectReprRenderer ex
}
private void addPersistLinkIfTransient() {
- if (objectAdapter.isPersistent()) {
+ if (objectAdapter.representsPersistent()) {
return;
}
final RendererFactory rendererFactory = getRendererFactoryRegistry().find(RepresentationType.DOMAIN_OBJECT);
@@ -268,7 +268,7 @@ public class DomainObjectReprRenderer ex
}
private void addUpdatePropertiesLinkIfPersistent() {
- if (!objectAdapter.isPersistent()) {
+ if (!objectAdapter.representsPersistent()) {
return;
}
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java Mon Jul 9 21:38:13 2012
@@ -60,7 +60,7 @@ public class ObjectCollectionReprRendere
// id and memberType are rendered eagerly
renderMemberContent();
- if (mode.isStandalone() || mode.isMutated() || !objectAdapter.isPersistent()) {
+ if (mode.isStandalone() || mode.isMutated() || !objectAdapter.representsPersistent()) {
addValue();
}
putDisabledReasonIfDisabled();
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java Mon Jul 9 21:38:13 2012
@@ -320,7 +320,7 @@ public class Dispatcher {
file = findFileForSpecification(context, facet2.valueSpec(), "collection", EXTENSION);
} else {
final ObjectAdapter mappedObject2 = mappedObject;
- if (mappedObject2.representsTransient()) {
+ if (mappedObject2.isTransient()) {
file = findFileForSpecification(context, mappedObject.getSpecification(), "edit", EXTENSION);
} else {
file = findFileForSpecification(context, mappedObject.getSpecification(), "object", EXTENSION);
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java Mon Jul 9 21:38:13 2012
@@ -132,7 +132,7 @@ public class DefaultOidObjectMapping imp
}
data.put(fieldName, collection);
} else {
- if (fieldValue.representsTransient() || fieldValue.isParented()) {
+ if (fieldValue.isTransient() || fieldValue.isParented()) {
final JSONObject saveData = encodeTransientData(fieldValue, adaptersToSave);
if (saveData == null) {
data.put(fieldName, mapObject(fieldValue, Scope.INTERACTION));
@@ -220,7 +220,7 @@ public class DefaultOidObjectMapping imp
final String transferableId = encodedOid;
// LOG.debug("encoded " + oid + " as " + transferableId + " ~ " + encodedOid);
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
// old TODO cache these in requests so that Mementos are only created once.
// old TODO if Transient/Interaction then return state; other store state in session an return OID string
final TransientRootAdapterMapping mapping = new TransientRootAdapterMapping(adapter);
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/IndirectObjectMapping.java Mon Jul 9 21:38:13 2012
@@ -114,7 +114,7 @@ public class IndirectObjectMapping imple
}
private Mapping createMapping(final ObjectAdapter adapter) {
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
return new TransientRootAdapterMapping(adapter);
} else {
return new PersistentRootAdapterMapping(adapter);
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java Mon Jul 9 21:38:13 2012
@@ -47,7 +47,7 @@ class TransientRootAdapterMapping implem
public TransientRootAdapterMapping(final ObjectAdapter adapter) {
oid = (RootOid) adapter.getOid();
Assert.assertTrue("OID is for persistent", oid.isTransient());
- Assert.assertTrue("adapter is for persistent", adapter.representsTransient());
+ Assert.assertTrue("adapter is for persistent", adapter.isTransient());
memento = new Memento(adapter);
}
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java Mon Jul 9 21:38:13 2012
@@ -739,7 +739,7 @@ public abstract class RequestContext {
public String mapObject(final ObjectAdapter object, final Scope scope) {
if (object.isValue()) {
return object.titleString();
- } else if (scope == Scope.INTERACTION && object.representsTransient()) {
+ } else if (scope == Scope.INTERACTION && object.isTransient()) {
return objectMapping.mapTransientObject(object);
} else if (object.getOid() != null) {
return objectMapping.mapObject(object, scope);
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/edit/EditAction.java Mon Jul 9 21:38:13 2012
@@ -97,7 +97,7 @@ public class EditAction implements Actio
} else if (entryState.isValid()) {
changeObject(context, adapter, entryState, fields);
- if (adapter.representsTransient()) {
+ if (adapter.isTransient()) {
IsisContext.getPersistenceSession().makePersistent(adapter);
context.unmapObject(adapter, Scope.REQUEST);
}
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java Mon Jul 9 21:38:13 2012
@@ -134,7 +134,7 @@ public class EditObject extends Abstract
hiddenFields.add(resultOverride == null ? null : new HiddenInputField("_" + RESULT_OVERRIDE, resultOverride));
hiddenFields.add(scope == null ? null : new HiddenInputField("_" + SCOPE, scope));
- if (!object.representsTransient()) {
+ if (!object.isTransient()) {
// ensure all booleans are included so the pass back TRUE if set.
final List<ObjectAssociation> fields2 = object.getSpecification().getAssociations();
for (int i = 0; i < fields2.size(); i++) {
@@ -292,7 +292,7 @@ public class EditObject extends Abstract
}
private String getValue(final RequestContext context, final ObjectAdapter field) {
- if (field == null || field.representsTransient()) {
+ if (field == null || field.isTransient()) {
return "";
}
final ObjectSpecification specification = field.getSpecification();
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/AbstractConditionalBlock.java Mon Jul 9 21:38:13 2012
@@ -263,7 +263,7 @@ public abstract class AbstractConditiona
if (persistent != null) {
final ObjectAdapter object = request.getContext().getMappedObjectOrResult(persistent);
checkMade = true;
- allConditionsMet &= object.isPersistent();
+ allConditionsMet &= object.representsPersistent();
}
/*
* String type = request.getOptionalProperty(TYPE); if (type != null) {
@@ -344,7 +344,7 @@ class TestObjectPersistent extends Test
@Override
boolean test(final Request request, final String attributeName, final String targetId) {
final ObjectAdapter object = request.getContext().getMappedObjectOrResult(attributeName);
- return object.isPersistent();
+ return object.representsPersistent();
}
}
Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/EditLink.java Mon Jul 9 21:38:13 2012
@@ -40,7 +40,7 @@ public class EditLink extends AbstractLi
final List<ObjectAssociation> visibleFields = specification.getAssociations(ObjectAssociationFilters.dynamicallyVisible(session, adapter));
final ImmutableFacet facet = specification.getFacet(ImmutableFacet.class);
final boolean isImmutable = facet != null && facet.value() == org.apache.isis.core.metamodel.facets.When.ALWAYS;
- final boolean isImmutableOncePersisted = facet != null && facet.value() == org.apache.isis.core.metamodel.facets.When.ONCE_PERSISTED && adapter.isPersistent();
+ final boolean isImmutableOncePersisted = facet != null && facet.value() == org.apache.isis.core.metamodel.facets.When.ONCE_PERSISTED && adapter.representsPersistent();
return visibleFields.size() > 0 && !isImmutable && !isImmutableOncePersisted;
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java Mon Jul 9 21:38:13 2012
@@ -60,7 +60,7 @@ public class EntityModel extends ModelAb
final PageParameters pageParameters = new PageParameters();
- final Boolean persistent = adapter.isPersistent();
+ final Boolean persistent = adapter.representsPersistent();
PageParameterNames.OBJECT_PERSISTENT.addTo(pageParameters, persistent.toString());
if (persistent) {
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java?rev=1359414&r1=1359413&r2=1359414&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java Mon Jul 9 21:38:13 2012
@@ -66,7 +66,7 @@ public final class EntityActionLinkFacto
}
private Link<?> createLink(final ObjectAdapterMemento adapterMemento, final ObjectAction action, final String linkId, final ObjectAdapter adapter) {
- final Boolean persistent = adapter.isPersistent();
+ final Boolean persistent = adapter.representsPersistent();
if (persistent) {
return createLinkForPersistent(linkId, adapterMemento, action);
} else {