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 2015/10/14 09:43:54 UTC
[04/14] isis git commit: ISIS-1194: deleting
Specification#getInstance() and implementations - never used.
ISIS-1194: deleting Specification#getInstance() and implementations - never used.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/49dc51be
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/49dc51be
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/49dc51be
Branch: refs/heads/master
Commit: 49dc51be61ea5d0690134bf1cee60f5752ab324d
Parents: 9961b39
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 12 23:55:39 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 12 23:55:39 2015 +0100
----------------------------------------------------------------------
.../isis/core/metamodel/spec/Specification.java | 27 +-------------------
.../specloader/specimpl/ObjectActionImpl.java | 9 -------
.../ObjectActionParameterParseable.java | 14 ++--------
.../specimpl/ObjectSpecificationAbstract.java | 12 ---------
.../specimpl/OneToManyAssociationImpl.java | 10 --------
.../specimpl/OneToOneActionParameterImpl.java | 10 --------
.../specimpl/OneToOneAssociationImpl.java | 10 --------
...ParameterAbstractTest_getId_and_getName.java | 5 ----
.../specimpl/ObjectAssociationAbstractTest.java | 5 ----
...ectAssociationAbstractTest_alwaysHidden.java | 5 ----
.../testspec/ObjectSpecificationStub.java | 14 ++++------
.../system/ObjectMemberAbstractTest.java | 12 +++------
12 files changed, 12 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java
index 07d82c1..88ee27d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/Specification.java
@@ -19,13 +19,11 @@
package org.apache.isis.core.metamodel.spec;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
/**
* Base interface for elements of the metamodel.
@@ -44,32 +42,9 @@ public interface Specification extends IdentifiedHolder {
FeatureType getFeatureType();
/**
- * Returns a description of how the member is used - this complements the
- * help text.
- *
- * @see #getHelp()
+ * Returns a description of how the member is used.
*/
String getDescription();
- /**
- * Return an {@link Instance} of this {@link Specification} with respect to
- * the provided {@link ObjectAdapter}.
- *
- * <p>
- * For example, if the {@link Specification} is a
- * {@link OneToOneAssociation}, then is an {@link Instance} implementation
- * representing the { {@link ObjectAdapter}/ {@link OneToOneAssociation}
- * tuple.
- *
- * <p>
- * Implementations are expected to use a double-dispatch back to the
- * provided {@link ObjectAdapter} (passing themselves as a parameter), using
- * {@link ObjectAdapter#getInstance(Specification)}.
- *
- * <p>
- * Note: this method may throw an {@link UnsupportedOperationException}; see
- * {@link ObjectAdapter#getInstance(Specification)} for details.
- */
- Instance getInstance(final ObjectAdapter adapter);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
index 4d6ac09..02e63a9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
@@ -137,15 +137,6 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
return facet != null? facet.value(): ActionSemantics.Of.NON_IDEMPOTENT;
}
- // /////////////////////////////////////////////////////////////
- // getInstance
- // /////////////////////////////////////////////////////////////
-
- @Override
- public Instance getInstance(final ObjectAdapter adapter) {
- final ObjectAction specification = this;
- return adapter.getInstance(specification);
- }
// /////////////////////////////////////////////////////////////
// Type, IsContributed
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
index 40318c2..4aa2c5e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseable.java
@@ -60,23 +60,13 @@ public class ObjectActionParameterParseable extends ObjectActionParameterAbstrac
}
- // /////////////////////////////////////////////////////////////
- // getInstance
- // /////////////////////////////////////////////////////////////
-
- @Override
- public Instance getInstance(final ObjectAdapter adapter) {
- final OneToOneActionParameter specification = this;
- return adapter.getInstance(specification);
- }
-
// //////////////////////////////////////////////////////////////////////
// get, set
// //////////////////////////////////////////////////////////////////////
/**
* Gets the proposed value of the {@link Instance} (downcast as a
- * {@link MutableProposed}, wrapping the proposed value into a
+ * {@link MutableProposedHolder}, wrapping the proposed value into a
* {@link ObjectAdapter}.
*/
@Override
@@ -88,7 +78,7 @@ public class ObjectActionParameterParseable extends ObjectActionParameterAbstrac
/**
* Sets the proposed value of the {@link Instance} (downcast as a
- * {@link MutableProposed}, unwrapped the proposed value from a
+ * {@link MutableProposedHolder}, unwrapped the proposed value from a
* {@link ObjectAdapter}.
*/
public void set(final ObjectAdapter owner, final ObjectAdapter newValue) {
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 0ee3b2b..548bf43 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -423,18 +423,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//endregion
- //region > getInstance (unused)
-
- /**
- * simply returns the input parameter.
- */
- @Deprecated
- @Override
- public Instance getInstance(final ObjectAdapter adapter) {
- return adapter;
- }
- //endregion
-
//region > Hierarchical
/**
* Determines if this class represents the same class, or a subclass, of the
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
index 093523d..41291a1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationImpl.java
@@ -280,16 +280,6 @@ public class OneToManyAssociationImpl extends ObjectAssociationAbstract implemen
}
// /////////////////////////////////////////////////////////////
- // getInstance
- // /////////////////////////////////////////////////////////////
-
- @Override
- public Instance getInstance(final ObjectAdapter adapter) {
- final OneToManyAssociation specification = this;
- return adapter.getInstance(specification);
- }
-
- // /////////////////////////////////////////////////////////////
// debug, toString
// /////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java
index 1cbf084..ece1864 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneActionParameterImpl.java
@@ -44,16 +44,6 @@ public class OneToOneActionParameterImpl extends ObjectActionParameterAbstract i
}
- // /////////////////////////////////////////////////////////////
- // getInstance
- // /////////////////////////////////////////////////////////////
-
- @Override
- public Instance getInstance(final ObjectAdapter adapter) {
- final OneToOneActionParameter specification = this;
- return adapter.getInstance(specification);
- }
-
// //////////////////////////////////////////////////////////////////////
// get, set
// //////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
index 955530a..94d70e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationImpl.java
@@ -326,16 +326,6 @@ public class OneToOneAssociationImpl extends ObjectAssociationAbstract implement
// /////////////////////////////////////////////////////////////
- // getInstance
- // /////////////////////////////////////////////////////////////
-
- @Override
- public Instance getInstance(final ObjectAdapter ownerAdapter) {
- final OneToOneAssociation specification = this;
- return ownerAdapter.getInstance(specification);
- }
-
- // /////////////////////////////////////////////////////////////
// debug, toString
// /////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 259c999..a115fda 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -76,11 +76,6 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
}
@Override
- public Instance getInstance(final ObjectAdapter adapter) {
- return null;
- }
-
- @Override
public FeatureType getFeatureType() {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index 80894f4..5ad8d26 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -122,11 +122,6 @@ public class ObjectAssociationAbstractTest {
}
@Override
- public Instance getInstance(final ObjectAdapter adapter) {
- return null;
- }
-
- @Override
public boolean containsDoOpFacet(final Class<? extends Facet> facetType) {
return false;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index ee765cd..1c8da27 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -117,11 +117,6 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
}
@Override
- public Instance getInstance(final ObjectAdapter adapter) {
- return null;
- }
-
- @Override
public boolean containsDoOpFacet(final Class<? extends Facet> facetType) {
return false;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index a56a549..7f405c0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -363,15 +363,11 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
return null;
}
- // /////////////////////////////////////////////////////////////
- // getInstance
- // /////////////////////////////////////////////////////////////
-
- @Override
- public ObjectAdapter getInstance(final ObjectAdapter adapter) {
- return adapter;
- }
-
+ /**
+ * @deprecated - unused ?
+ * @return
+ */
+ @Deprecated
public RuntimeContext getRuntimeContext() {
return runtimeContext;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/49dc51be/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 0f8b0f9..3af1e0e 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -280,6 +280,10 @@ class ObjectMemberAbstractImpl extends ObjectMemberAbstract {
return null;
}
+ /**
+ * @deprecated - unused ?
+ */
+ @Deprecated
public Consent isUsable(final ObjectAdapter target) {
return null;
}
@@ -304,13 +308,5 @@ class ObjectMemberAbstractImpl extends ObjectMemberAbstract {
where);
}
- // /////////////////////////////////////////////////////////////
- // getInstance
- // /////////////////////////////////////////////////////////////
-
- @Override
- public Instance getInstance(final ObjectAdapter adapter) {
- return null;
- }
}