You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/09/29 18:11:51 UTC
[isis] branch v2 updated: ISIS-1976: cleaning up,
removing lines that were commented out
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 8cffeff ISIS-1976: cleaning up, removing lines that were commented out
8cffeff is described below
commit 8cffeff7f819ed2e9b025a6eecd3ca387205f2e1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Sep 29 20:11:45 2018 +0200
ISIS-1976: cleaning up, removing lines that were commented out
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../isis/core/metamodel/adapter/ObjectAdapter.java | 81 ----------------
.../isis/core/metamodel/spec/ManagedObject.java | 6 +-
.../runtime/persistence/adapter/PojoAdapter.java | 107 ---------------------
3 files changed, 1 insertion(+), 193 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index f2f54f1..71e4acc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -43,7 +43,6 @@ import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.ObjectVisibilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -56,37 +55,6 @@ import org.apache.isis.core.metamodel.spec.Specification;
*/
public interface ObjectAdapter extends ManagedObject {
-// /**
-// * Refines {@link Instance#getSpecification()}.
-// */
-// @Override
-// ObjectSpecification getSpecification();
-//
-// /**
-// * Returns the adapted domain object, the POJO, that this adapter represents
-// * with the framework.
-// */
-// @Override
-// Object getObject();
-
-// /**
-// * Returns the title to display this object with, usually obtained from
-// * the wrapped {@link #getObject() domain object}.
-// *
-// * @deprecated - use {@link #titleString(ObjectAdapter)}
-// */
-// @Deprecated
-// String titleString();
-//
-// /**
-// * Returns the title to display this object with, rendered within the context
-// * of some other adapter.
-// *
-// * <p>
-// * @see TitleFacet#title(ObjectAdapter, ObjectAdapter)
-// */
-// String titleString(ObjectAdapter contextAdapter);
-
/**
* Return an {@link Instance} of the specified {@link Specification} with
* respect to this {@link ObjectAdapter}.
@@ -110,26 +78,6 @@ public interface ObjectAdapter extends ManagedObject {
*/
Instance getInstance(Specification specification);
-// /**
-// * For (stand-alone) collections, returns the element type.
-// *
-// * <p>
-// * For owned (aggregated) collections, the element type can be determined
-// * from the <tt>TypeOfFacet</tt> associated with the
-// * <tt>ObjectAssociation</tt> representing the collection.
-// *
-// * @see #setElementSpecificationProvider(ElementSpecificationProvider)
-// */
-// ObjectSpecification getElementSpecification();
-//
-// /**
-// * For (stand-alone) collections, returns the element type.
-// *
-// * @see #getElementSpecification()
-// */
-// void setElementSpecificationProvider(ElementSpecificationProvider elementSpecificationProvider);
-
-
/**
* Returns the name of an icon to use if this object is to be displayed
* graphically.
@@ -446,35 +394,6 @@ public interface ObjectAdapter extends ManagedObject {
}
}
-// /**
-// * Invokes the method, adjusting arguments as required.
-// *
-// * <p>
-// * That is:
-// * <ul>
-// * <li>if the method declares parameters but no arguments are provided, then will provide 'null' defaults for these.
-// * <li>if the method does not declare parameters but arguments were provided, then will ignore those arguments.
-// * </ul>
-// */
-// private static Object invokeWithDefaults(final Method method, final Instance adapter, final Instance[] argumentAdapters) {
-// final int numParams = method.getParameterTypes().length;
-// Instance[] adapters;
-//
-// if(argumentAdapters == null || argumentAdapters.length == 0) {
-// adapters = new Instance[numParams];
-// } else if(numParams == 0) {
-// // ignore any arguments, even if they were supplied.
-// // eg used by contributee actions, but
-// // underlying service 'default' action declares no params
-// adapters = new Instance[0];
-// } else if(argumentAdapters.length == numParams){
-// adapters = argumentAdapters;
-// } else {
-// throw new IllegalArgumentException("Method has " + numParams + " params but " + argumentAdapters.length + " arguments provided");
-// }
-//
-// return invoke(method, adapter, adapters);
-// }
}
public static class Functions {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
index 5f6c057..f824e3e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
@@ -26,12 +26,8 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
/**
- * Represents an instance of some element of the meta-model.
+ * Represents an instance of some element of the meta-model managed by the framework.
*
- * <p>
- * Currently the only sub-interface is {@link ObjectAdapter}. However, the
- * intention is for associations, actions and action parameters to also inherit
- * from this interface.
*/
public interface ManagedObject extends Instance {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index bcc114c..8bcf6e7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -34,12 +34,10 @@ import org.apache.isis.core.metamodel.adapter.oid.ParentedOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.InstanceAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Specification;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -56,11 +54,6 @@ public final class PojoAdapter extends InstanceAbstract implements ObjectAdapter
private final Object pojo;
private final Oid oid;
-// /**
-// * only for standalone or parented collections.
-// */
-// private ElementSpecificationProvider elementSpecificationProvider;
-
public static PojoAdapter of(
final Object pojo,
final Oid oid,
@@ -223,75 +216,6 @@ public final class PojoAdapter extends InstanceAbstract implements ObjectAdapter
return version == null || otherVersion == null || otherVersion.different(version);
}
-
-
- // -- titleString
-// /**
-// * Returns the title from the underlying business object.
-// *
-// * <p>
-// * If the object has not yet been resolved the specification will be asked
-// * for a unresolved title, which could of been persisted by the persistence
-// * mechanism. If either of the above provides null as the title then this
-// * method will return a title relating to the name of the object type, e.g.
-// * "A Customer", "A Product".
-// */
-// @Override
-// public String titleString() {
-// return titleString(null);
-// }
-
-// @Override
-// public String titleString(ObjectAdapter contextAdapterIfAny) {
-// if (getSpecification().isParentedOrFreeCollection()) {
-// final CollectionFacet facet = getSpecification().getFacet(CollectionFacet.class);
-// return collectionTitleString(facet);
-// } else {
-// return objectTitleString(contextAdapterIfAny);
-// }
-// }
-//
-// private String objectTitleString(ObjectAdapter contextAdapterIfAny) {
-// if (getObject() instanceof String) {
-// return (String) getObject();
-// }
-// final ObjectSpecification specification = getSpecification();
-// String title = specification.getTitle(contextAdapterIfAny, this);
-//
-// if (title == null) {
-// title = getDefaultTitle();
-// }
-// return title;
-// }
-//
-// private String collectionTitleString(final CollectionFacet facet) {
-// final int size = facet.size(this);
-// final ObjectSpecification elementSpecification = getElementSpecification();
-// if (elementSpecification == null || elementSpecification.getFullIdentifier().equals(Object.class.getName())) {
-// switch (size) {
-// case -1:
-// return "Objects";
-// case 0:
-// return "No objects";
-// case 1:
-// return "1 object";
-// default:
-// return size + " objects";
-// }
-// } else {
-// switch (size) {
-// case -1:
-// return elementSpecification.getPluralName();
-// case 0:
-// return "No " + elementSpecification.getPluralName();
-// case 1:
-// return "1 " + elementSpecification.getSingularName();
-// default:
-// return size + " " + elementSpecification.getPluralName();
-// }
-// }
-// }
-
@Override
public String toString() {
final ToString str = new ToString(this);
@@ -306,10 +230,6 @@ public final class PojoAdapter extends InstanceAbstract implements ObjectAdapter
return str.toString();
}
-// protected String getDefaultTitle() {
-// return "A" + (" " + getSpecification().getSingularName()).toLowerCase();
-// }
-
protected void toString(final ToString str) {
str.append(aggregateResolveStateCode());
final Oid oid = getOid();
@@ -343,7 +263,6 @@ public final class PojoAdapter extends InstanceAbstract implements ObjectAdapter
return "S"; // standalone adapter (value)
}
-
// -- iconName
/**
@@ -354,32 +273,6 @@ public final class PojoAdapter extends InstanceAbstract implements ObjectAdapter
return getSpecification().getIconName(this);
}
-
-
-// // -- elementSpecification
-//
-// @Override
-// public ObjectSpecification getElementSpecification() {
-// if (elementSpecificationProvider == null) {
-// return null;
-// }
-// return elementSpecificationProvider.getElementType();
-// }
-//
-// /**
-// * Called whenever there is a {@link org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet} present.
-// *
-// * <p>
-// * Specifically, if an action which has been annotated (is copied by {@link org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet action invocation facet}), and for a parented collection
-// * (is copied by the {@link PersistenceSession5} when {@link PersistenceSession5#adapterFor(Object, ObjectAdapter, OneToManyAssociation) creating} an adapter for a collection.
-// * </p>
-// */
-// @Override
-// public void setElementSpecificationProvider(final ElementSpecificationProvider elementSpecificationProvider) {
-// this.elementSpecificationProvider = elementSpecificationProvider;
-// }
-
-
// -- getInstance (unsupported for this impl)
/**