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 2011/04/27 00:03:55 UTC
svn commit: r1096928 [4/16] - in
/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel:
facetdecorators/help/ facetdecorators/help/file/
facetdecorators/help/file/internal/ facetdecorators/i18n/
facetdecorators/i18n/internal...
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedAnnotationForCollectionFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
* under the License.
*/
-
-package org.apache.isis.core.progmodel.facets.collections.notpersisted.annotation;
-
+package org.apache.isis.core.progmodel.facets.collections.notpersisted.annotation;
import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -27,22 +25,21 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.notpersisted.NotPersistedFacet;
-
-
-public class NotPersistedAnnotationForCollectionFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public NotPersistedAnnotationForCollectionFacetFactory() {
- super(FeatureType.COLLECTIONS_ONLY);
- }
-
- @Override
- public void process(ProcessMethodContext processMethodContext) {
- final NotPersisted annotation = getAnnotation(processMethodContext.getMethod(), NotPersisted.class);
- FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
- }
-
- private NotPersistedFacet create(final NotPersisted annotation, final FacetHolder holder) {
- return annotation == null ? null : new NotPersistedFacetAnnotationForCollection(holder);
- }
-
-}
+
+public class NotPersistedAnnotationForCollectionFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public NotPersistedAnnotationForCollectionFacetFactory() {
+ super(FeatureType.COLLECTIONS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+ final NotPersisted annotation = getAnnotation(processMethodContext.getMethod(), NotPersisted.class);
+ FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+ }
+
+ private NotPersistedFacet create(final NotPersisted annotation, final FacetHolder holder) {
+ return annotation == null ? null : new NotPersistedFacetAnnotationForCollection(holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedFacetAnnotationForCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedFacetAnnotationForCollection.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedFacetAnnotationForCollection.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/notpersisted/annotation/NotPersistedFacetAnnotationForCollection.java Tue Apr 26 22:03:43 2011
@@ -17,27 +17,25 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.collections.notpersisted.annotation;
-package org.apache.isis.core.progmodel.facets.collections.notpersisted.annotation;
-
import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.notpersisted.NotPersistedFacetAbstract;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-
-
-public class NotPersistedFacetAnnotationForCollection extends NotPersistedFacetAbstract {
-
- public NotPersistedFacetAnnotationForCollection(final FacetHolder holder) {
- super(holder);
- }
-
- /**
- * Always returns <i>Not Persisted</i>.
- */
- public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
- return "Not Persisted";
- }
-
-}
-
+
+public class NotPersistedFacetAnnotationForCollection extends NotPersistedFacetAbstract {
+
+ public NotPersistedFacetAnnotationForCollection(final FacetHolder holder) {
+ super(holder);
+ }
+
+ /**
+ * Always returns <i>Not Persisted</i>.
+ */
+ @Override
+ public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
+ return "Not Persisted";
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfAnnotationForCollectionsFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.collections.typeof;
-package org.apache.isis.core.progmodel.facets.collections.typeof;
-
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
@@ -32,66 +31,70 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacetInferredFromGenerics;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryAware;
-
-
-public class TypeOfAnnotationForCollectionsFacetFactory extends AnnotationBasedFacetFactoryAbstract implements CollectionTypeRegistryAware {
- private CollectionTypeRegistry collectionTypeRegistry;
-
- public TypeOfAnnotationForCollectionsFacetFactory() {
- super(FeatureType.COLLECTIONS_ONLY);
- }
-
- @Override
- public void process(ProcessMethodContext processMethodContext) {
-
- final TypeOf annotation = getAnnotation(processMethodContext.getMethod(), TypeOf.class);
-
- final Class<?> methodReturnType = processMethodContext.getMethod().getReturnType();
- if (!collectionTypeRegistry.isCollectionType(methodReturnType) && !collectionTypeRegistry.isArrayType(methodReturnType)) {
- return;
- }
-
- final Class<?> returnType = processMethodContext.getMethod().getReturnType();
- if (returnType.isArray()) {
- final Class<?> componentType = returnType.getComponentType();
- FacetUtil.addFacet(new TypeOfFacetInferredFromArray(componentType, processMethodContext.getFacetHolder(), getSpecificationLookup()));
- return;
- }
-
- if (annotation != null) {
- FacetUtil.addFacet(new TypeOfFacetAnnotationForCollection(annotation.value(), processMethodContext.getFacetHolder(), getSpecificationLookup()));
- return;
- }
-
- final Type type = processMethodContext.getMethod().getGenericReturnType();
- if (!(type instanceof ParameterizedType)) {
- return;
- }
-
- final ParameterizedType parameterizedType = (ParameterizedType) type;
- final Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
- if (actualTypeArguments.length == 0) {
- return;
- }
-
- final Object actualTypeArgument = actualTypeArguments[0];
- if (actualTypeArgument instanceof Class) {
- final Class<?> actualType = (Class<?>) actualTypeArgument;
- FacetUtil.addFacet(new TypeOfFacetInferredFromGenerics(actualType, processMethodContext.getFacetHolder(), getSpecificationLookup()));
- return;
- }
-
- if (actualTypeArgument instanceof TypeVariable) {
-
- // TODO: what to do here?
- return;
- }
-
- }
-
+
+public class TypeOfAnnotationForCollectionsFacetFactory extends AnnotationBasedFacetFactoryAbstract implements
+ CollectionTypeRegistryAware {
+ private CollectionTypeRegistry collectionTypeRegistry;
+
+ public TypeOfAnnotationForCollectionsFacetFactory() {
+ super(FeatureType.COLLECTIONS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+
+ final TypeOf annotation = getAnnotation(processMethodContext.getMethod(), TypeOf.class);
+
+ final Class<?> methodReturnType = processMethodContext.getMethod().getReturnType();
+ if (!collectionTypeRegistry.isCollectionType(methodReturnType)
+ && !collectionTypeRegistry.isArrayType(methodReturnType)) {
+ return;
+ }
+
+ final Class<?> returnType = processMethodContext.getMethod().getReturnType();
+ if (returnType.isArray()) {
+ final Class<?> componentType = returnType.getComponentType();
+ FacetUtil.addFacet(new TypeOfFacetInferredFromArray(componentType, processMethodContext.getFacetHolder(),
+ getSpecificationLookup()));
+ return;
+ }
+
+ if (annotation != null) {
+ FacetUtil.addFacet(new TypeOfFacetAnnotationForCollection(annotation.value(), processMethodContext
+ .getFacetHolder(), getSpecificationLookup()));
+ return;
+ }
+
+ final Type type = processMethodContext.getMethod().getGenericReturnType();
+ if (!(type instanceof ParameterizedType)) {
+ return;
+ }
+
+ final ParameterizedType parameterizedType = (ParameterizedType) type;
+ final Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
+ if (actualTypeArguments.length == 0) {
+ return;
+ }
+
+ final Object actualTypeArgument = actualTypeArguments[0];
+ if (actualTypeArgument instanceof Class) {
+ final Class<?> actualType = (Class<?>) actualTypeArgument;
+ FacetUtil.addFacet(new TypeOfFacetInferredFromGenerics(actualType, processMethodContext.getFacetHolder(),
+ getSpecificationLookup()));
+ return;
+ }
+
+ if (actualTypeArgument instanceof TypeVariable) {
+
+ // TODO: what to do here?
+ return;
+ }
+
+ }
+
@Override
- public void setCollectionTypeRegistry(final CollectionTypeRegistry collectionTypeRegistry) {
- this.collectionTypeRegistry = collectionTypeRegistry;
- }
-
-}
+ public void setCollectionTypeRegistry(final CollectionTypeRegistry collectionTypeRegistry) {
+ this.collectionTypeRegistry = collectionTypeRegistry;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfFacetAnnotationForCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfFacetAnnotationForCollection.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfFacetAnnotationForCollection.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/typeof/TypeOfFacetAnnotationForCollection.java Tue Apr 26 22:03:43 2011
@@ -17,22 +17,17 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.collections.typeof;
-package org.apache.isis.core.progmodel.facets.collections.typeof;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacetAbstract;
import org.apache.isis.core.metamodel.spec.SpecificationLookup;
-
-
-public class TypeOfFacetAnnotationForCollection extends TypeOfFacetAbstract {
-
- public TypeOfFacetAnnotationForCollection(
- final Class<?> type,
- final FacetHolder holder,
- final SpecificationLookup specificationLookup) {
- super(type, holder, specificationLookup);
- }
-
-}
-
+
+public class TypeOfFacetAnnotationForCollection extends TypeOfFacetAbstract {
+
+ public TypeOfFacetAnnotationForCollection(final Class<?> type, final FacetHolder holder,
+ final SpecificationLookup specificationLookup) {
+ super(type, holder, specificationLookup);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.collections.validate;
import org.apache.isis.applib.events.ValidityEvent;
@@ -27,8 +26,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.interactions.CollectionAddToContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-public abstract class CollectionValidateAddToFacetAbstract extends FacetAbstract implements CollectionValidateAddToFacet {
+public abstract class CollectionValidateAddToFacetAbstract extends FacetAbstract implements
+ CollectionValidateAddToFacet {
public static Class<? extends Facet> type() {
return CollectionValidateAddToFacet.class;
@@ -38,6 +37,7 @@ public abstract class CollectionValidate
super(type(), holder, false);
}
+ @Override
public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
if (!(context instanceof CollectionAddToContext)) {
return null;
@@ -47,4 +47,3 @@ public abstract class CollectionValidate
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateAddToFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.collections.validate;
import java.lang.reflect.Method;
@@ -29,33 +28,35 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-
-public class CollectionValidateAddToFacetViaMethod extends CollectionValidateAddToFacetAbstract implements ImperativeFacet {
+public class CollectionValidateAddToFacetViaMethod extends CollectionValidateAddToFacetAbstract implements
+ ImperativeFacet {
private final Method method;
- public CollectionValidateAddToFacetViaMethod(
- final Method method,
- final FacetHolder holder) {
+ public CollectionValidateAddToFacetViaMethod(final Method method, final FacetHolder holder) {
super(holder);
this.method = method;
}
/**
- * Returns a singleton list of the {@link Method} provided in the constructor.
+ * Returns a singleton list of the {@link Method} provided in the constructor.
*/
+ @Override
public List<Method> getMethods() {
- return Collections.singletonList(method);
+ return Collections.singletonList(method);
}
- public boolean impliesResolve() {
- return true;
- }
+ @Override
+ public boolean impliesResolve() {
+ return true;
+ }
- public boolean impliesObjectChanged() {
- return false;
- }
+ @Override
+ public boolean impliesObjectChanged() {
+ return false;
+ }
+ @Override
public String invalidReason(final ObjectAdapter owningAdapter, final ObjectAdapter proposedAdapter) {
return (String) AdapterInvokeUtils.invoke(method, owningAdapter, proposedAdapter);
}
@@ -66,4 +67,3 @@ public class CollectionValidateAddToFace
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.collections.validate;
import org.apache.isis.applib.events.ValidityEvent;
@@ -27,9 +26,8 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.interactions.CollectionRemoveFromContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
public abstract class CollectionValidateRemoveFromFacetAbstract extends FacetAbstract implements
- CollectionValidateRemoveFromFacet {
+ CollectionValidateRemoveFromFacet {
public static Class<? extends Facet> type() {
return CollectionValidateRemoveFromFacet.class;
@@ -39,6 +37,7 @@ public abstract class CollectionValidate
super(type(), holder, false);
}
+ @Override
public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
if (!(context instanceof CollectionRemoveFromContext)) {
return null;
@@ -47,4 +46,3 @@ public abstract class CollectionValidate
return invalidReason(context.getTarget(), collectionRemoveFromContext.getProposed());
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/collections/validate/CollectionValidateRemoveFromFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.collections.validate;
import java.lang.reflect.Method;
@@ -29,35 +28,36 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-
public class CollectionValidateRemoveFromFacetViaMethod extends CollectionValidateRemoveFromFacetAbstract implements
- ImperativeFacet {
+ ImperativeFacet {
private final Method method;
- public CollectionValidateRemoveFromFacetViaMethod(
- final Method method,
- final FacetHolder holder) {
+ public CollectionValidateRemoveFromFacetViaMethod(final Method method, final FacetHolder holder) {
super(holder);
this.method = method;
}
/**
- * Returns a singleton list of the {@link Method} provided in the constructor.
+ * Returns a singleton list of the {@link Method} provided in the constructor.
*/
+ @Override
public List<Method> getMethods() {
- return Collections.singletonList(method);
+ return Collections.singletonList(method);
}
- public boolean impliesResolve() {
- return true;
- }
+ @Override
+ public boolean impliesResolve() {
+ return true;
+ }
- public boolean impliesObjectChanged() {
- return false;
- }
+ @Override
+ public boolean impliesObjectChanged() {
+ return false;
+ }
- public String invalidReason(final ObjectAdapter owningAdapter, final ObjectAdapter proposedAdapter) {
+ @Override
+ public String invalidReason(final ObjectAdapter owningAdapter, final ObjectAdapter proposedAdapter) {
return (String) AdapterInvokeUtils.invoke(method, owningAdapter, proposedAdapter);
}
@@ -67,4 +67,3 @@ public class CollectionValidateRemoveFro
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ActionChoicesFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ActionChoicesFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ActionChoicesFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ActionChoicesFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.choices.ActionChoicesFacetAbstract;
-
-
-public class ActionChoicesFacetNone extends ActionChoicesFacetAbstract {
-
- public ActionChoicesFacetNone(final FacetHolder holder) {
- super(holder);
- }
-
- public Object[][] getChoices(final ObjectAdapter inObject) {
- return new ObjectAdapter[0][0];
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+public class ActionChoicesFacetNone extends ActionChoicesFacetAbstract {
+
+ public ActionChoicesFacetNone(final FacetHolder holder) {
+ super(holder);
+ }
+
+ @Override
+ public Object[][] getChoices(final ObjectAdapter inObject) {
+ return new ObjectAdapter[0][0];
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ActionDefaultsFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ActionDefaultsFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ActionDefaultsFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ActionDefaultsFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,28 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacetAbstract;
-
-
-public class ActionDefaultsFacetNone extends ActionDefaultsFacetAbstract {
-
- public ActionDefaultsFacetNone(final FacetHolder holder) {
- super(holder, false);
- }
-
- public Object[] getDefaults(final ObjectAdapter inObject) {
- return null;
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+public class ActionDefaultsFacetNone extends ActionDefaultsFacetAbstract {
+
+ public ActionDefaultsFacetNone(final FacetHolder holder) {
+ super(holder, false);
+ }
+
+ @Override
+ public Object[] getDefaults(final ObjectAdapter inObject) {
+ return null;
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/DescribedAsFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/DescribedAsFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/DescribedAsFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/DescribedAsFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,26 +17,23 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacetAbstract;
-
-
-/**
- * Has a description of the empty string.
- */
-public class DescribedAsFacetNone extends DescribedAsFacetAbstract {
-
- public DescribedAsFacetNone(final FacetHolder holder) {
- super("", holder);
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+/**
+ * Has a description of the empty string.
+ */
+public class DescribedAsFacetNone extends DescribedAsFacetAbstract {
+
+ public DescribedAsFacetNone(final FacetHolder holder) {
+ super("", holder);
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ExecutedFacetAtDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ExecutedFacetAtDefault.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ExecutedFacetAtDefault.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/ExecutedFacetAtDefault.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.executed.ExecutedFacetAbstract;
-
-
-public class ExecutedFacetAtDefault extends ExecutedFacetAbstract {
-
- public ExecutedFacetAtDefault(final FacetHolder holder) {
- super(Where.DEFAULT, holder);
- }
-
-}
-
+
+public class ExecutedFacetAtDefault extends ExecutedFacetAbstract {
+
+ public ExecutedFacetAtDefault(final FacetHolder holder) {
+ super(Where.DEFAULT, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/FallbackFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/FallbackFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/FallbackFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/FallbackFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -68,15 +68,14 @@ public class FallbackFacetFactory extend
}
@Override
- public void process(ProcessClassContext processClassContaxt) {
+ public void process(final ProcessClassContext processClassContaxt) {
final FacetHolder facetHolder = processClassContaxt.getFacetHolder();
-
+
final DescribedAsFacetNone describedAsFacet = new DescribedAsFacetNone(facetHolder);
final NotPersistableFacetNull notPersistableFacet = new NotPersistableFacetNull(facetHolder);
final TitleFacetNone titleFacet = new TitleFacetNone(facetHolder);
-
- final Facet[] facets = new Facet[] {
- describedAsFacet,
+
+ final Facet[] facets = new Facet[] { describedAsFacet,
// commenting these out, think this whole isNoop business is a little bogus
// new ImmutableFacetNever(holder),
notPersistableFacet, titleFacet, };
@@ -84,15 +83,15 @@ public class FallbackFacetFactory extend
}
@Override
- public void process(ProcessMethodContext processMethodContext) {
+ public void process(final ProcessMethodContext processMethodContext) {
final List<Facet> facets = new ArrayList<Facet>();
if (processMethodContext.getFacetHolder() instanceof FacetedMethod) {
facets.add(new NamedFacetNone(processMethodContext.getFacetHolder()));
facets.add(new DescribedAsFacetNone(processMethodContext.getFacetHolder()));
facets.add(new HelpFacetNone(processMethodContext.getFacetHolder()));
-
- FacetedMethod facetedMethod = processMethodContext.getFacetHolder();
+
+ final FacetedMethod facetedMethod = processMethodContext.getFacetHolder();
final FeatureType featureType = facetedMethod.getFeatureType();
if (featureType.isProperty()) {
facets.add(new MaxLengthFacetUnlimited(processMethodContext.getFacetHolder()));
@@ -109,18 +108,18 @@ public class FallbackFacetFactory extend
}
@Override
- public void processParams(ProcessParameterContext processParameterContext) {
+ public void processParams(final ProcessParameterContext processParameterContext) {
final List<Facet> facets = new ArrayList<Facet>();
if (processParameterContext.getFacetHolder() instanceof TypedHolder) {
- TypedHolder typedHolder = processParameterContext.getFacetHolder();
+ final TypedHolder typedHolder = processParameterContext.getFacetHolder();
if (typedHolder.getFeatureType().isActionParameter()) {
facets.add(new NamedFacetNone(processParameterContext.getFacetHolder()));
facets.add(new DescribedAsFacetNone(processParameterContext.getFacetHolder()));
facets.add(new HelpFacetNone(processParameterContext.getFacetHolder()));
facets.add(new MultiLineFacetNone(false, processParameterContext.getFacetHolder()));
-
+
facets.add(new MaxLengthFacetUnlimited(processParameterContext.getFacetHolder()));
}
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/HelpFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/HelpFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/HelpFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/HelpFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,28 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.help.HelpFacetAbstract;
-
-
-/**
- * Has a description of <tt>null</tt>.
- */
-public class HelpFacetNone extends HelpFacetAbstract {
-
- public HelpFacetNone(final FacetHolder holder) {
- super(null, holder);
- }
-
- @Override
- public String value() {
- return "No help available";
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+/**
+ * Has a description of <tt>null</tt>.
+ */
+public class HelpFacetNone extends HelpFacetAbstract {
+
+ public HelpFacetNone(final FacetHolder holder) {
+ super(null, holder);
+ }
+
+ @Override
+ public String value() {
+ return "No help available";
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MaxLengthFacetUnlimited.java Tue Apr 26 22:03:43 2011
@@ -17,33 +17,30 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.applib.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacetAbstract;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-
-public class MaxLengthFacetUnlimited extends MaxLengthFacetAbstract {
-
- public MaxLengthFacetUnlimited(final FacetHolder holder) {
- super(Integer.MAX_VALUE, holder);
- }
-
- /**
- * No limit to maximum length.
- */
- @Override
- public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
- return null;
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+public class MaxLengthFacetUnlimited extends MaxLengthFacetAbstract {
+
+ public MaxLengthFacetUnlimited(final FacetHolder holder) {
+ super(Integer.MAX_VALUE, holder);
+ }
+
+ /**
+ * No limit to maximum length.
+ */
+ @Override
+ public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
+ return null;
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MultiLineFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MultiLineFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MultiLineFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/MultiLineFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,23 +17,20 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacetAbstract;
-
-
-public class MultiLineFacetNone extends MultiLineFacetAbstract {
-
- public MultiLineFacetNone(final boolean preventWrapping, final FacetHolder holder) {
- super(1, preventWrapping, holder);
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+public class MultiLineFacetNone extends MultiLineFacetAbstract {
+
+ public MultiLineFacetNone(final boolean preventWrapping, final FacetHolder holder) {
+ super(1, preventWrapping, holder);
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/NamedFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/NamedFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/NamedFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/NamedFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,29 +17,26 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.named.NamedFacetAbstract;
-
-
-/**
- * Has a name of <tt>null</tt>.
- *
- * <p>
- * TODO: should this instead be the empty string?
- */
-public class NamedFacetNone extends NamedFacetAbstract {
-
- public NamedFacetNone(final FacetHolder holder) {
- super(null, holder);
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+/**
+ * Has a name of <tt>null</tt>.
+ *
+ * <p>
+ * TODO: should this instead be the empty string?
+ */
+public class NamedFacetNone extends NamedFacetAbstract {
+
+ public NamedFacetNone(final FacetHolder holder) {
+ super(null, holder);
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/NotPersistableFacetNull.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/NotPersistableFacetNull.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/NotPersistableFacetNull.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/NotPersistableFacetNull.java Tue Apr 26 22:03:43 2011
@@ -17,32 +17,30 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.fallback;
-package org.apache.isis.core.progmodel.facets.fallback;
-
import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacetAbstract;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-
-
-/**
- * Installed by the {@link FallbackFacetFactory}, and means that this class <i>is</i> persistable (ie not
- * {@link NotPersistableFacet not persistable}).
- */
-public class NotPersistableFacetNull extends NotPersistableFacetAbstract {
-
- public NotPersistableFacetNull(final FacetHolder holder) {
- super(null, holder);
- }
-
- /**
- * Always returns <tt>null</tt> (that is, does <i>not</i> disable).
- */
- public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
- return null;
- }
-
-}
-
+
+/**
+ * Installed by the {@link FallbackFacetFactory}, and means that this class <i>is</i> persistable (ie not
+ * {@link NotPersistableFacet not persistable}).
+ */
+public class NotPersistableFacetNull extends NotPersistableFacetAbstract {
+
+ public NotPersistableFacetNull(final FacetHolder holder) {
+ super(null, holder);
+ }
+
+ /**
+ * Always returns <tt>null</tt> (that is, does <i>not</i> disable).
+ */
+ @Override
+ public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
+ return null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/TitleFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/TitleFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/TitleFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/fallback/TitleFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.fallback;
import org.apache.isis.applib.adapters.Localization;
@@ -25,14 +24,14 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
-
public class TitleFacetNone extends TitleFacetAbstract {
public TitleFacetNone(final FacetHolder holder) {
super(holder);
}
- public String title(final ObjectAdapter object, Localization localization) {
+ @Override
+ public String title(final ObjectAdapter object, final Localization localization) {
return null;
}
@@ -42,4 +41,3 @@ public class TitleFacetNone extends Titl
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsAnnotationOnMemberFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.describedas.annotation;
-package org.apache.isis.core.progmodel.facets.members.describedas.annotation;
-
import org.apache.isis.applib.annotation.DescribedAs;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -27,41 +26,42 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-
-public class DescribedAsAnnotationOnMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public DescribedAsAnnotationOnMemberFacetFactory() {
- super(FeatureType.MEMBERS);
- }
-
- @Override
- public void process(ProcessMethodContext processMethodContext) {
-
- // look for annotation on the property
- final DescribedAs annotation = getAnnotation(processMethodContext.getMethod(), DescribedAs.class);
- DescribedAsFacet facet = create(annotation, processMethodContext.getFacetHolder());
- if (facet != null) {
+
+public class DescribedAsAnnotationOnMemberFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public DescribedAsAnnotationOnMemberFacetFactory() {
+ super(FeatureType.MEMBERS);
+ }
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+
+ // look for annotation on the property
+ final DescribedAs annotation = getAnnotation(processMethodContext.getMethod(), DescribedAs.class);
+ DescribedAsFacet facet = create(annotation, processMethodContext.getFacetHolder());
+ if (facet != null) {
FacetUtil.addFacet(facet);
- return;
- }
-
- // otherwise, look for annotation on the type
- final Class<?> returnType = processMethodContext.getMethod().getReturnType();
- final DescribedAsFacet returnTypeDescribedAsFacet = getDescribedAsFacet(returnType);
- if (returnTypeDescribedAsFacet != null) {
- facet = new DescribedAsFacetForMemberDerivedFromType(returnTypeDescribedAsFacet, processMethodContext.getFacetHolder());
- FacetUtil.addFacet(facet);
- }
- }
-
- private DescribedAsFacet create(final DescribedAs annotation, final FacetHolder holder) {
- return annotation == null ? null : new DescribedAsFacetAnnotationOnMember(annotation.value(), holder);
- }
-
- private DescribedAsFacet getDescribedAsFacet(final Class<?> type) {
- final ObjectSpecification paramTypeSpec = getSpecificationLookup().loadSpecification(type);
- return paramTypeSpec.getFacet(DescribedAsFacet.class);
- }
-
-}
+ return;
+ }
+
+ // otherwise, look for annotation on the type
+ final Class<?> returnType = processMethodContext.getMethod().getReturnType();
+ final DescribedAsFacet returnTypeDescribedAsFacet = getDescribedAsFacet(returnType);
+ if (returnTypeDescribedAsFacet != null) {
+ facet =
+ new DescribedAsFacetForMemberDerivedFromType(returnTypeDescribedAsFacet,
+ processMethodContext.getFacetHolder());
+ FacetUtil.addFacet(facet);
+ }
+ }
+
+ private DescribedAsFacet create(final DescribedAs annotation, final FacetHolder holder) {
+ return annotation == null ? null : new DescribedAsFacetAnnotationOnMember(annotation.value(), holder);
+ }
+
+ private DescribedAsFacet getDescribedAsFacet(final Class<?> type) {
+ final ObjectSpecification paramTypeSpec = getSpecificationLookup().loadSpecification(type);
+ return paramTypeSpec.getFacet(DescribedAsFacet.class);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsFacetAnnotationOnMember.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsFacetAnnotationOnMember.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsFacetAnnotationOnMember.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsFacetAnnotationOnMember.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.describedas.annotation;
-package org.apache.isis.core.progmodel.facets.members.describedas.annotation;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacetAbstract;
-
-
-public class DescribedAsFacetAnnotationOnMember extends DescribedAsFacetAbstract {
-
- public DescribedAsFacetAnnotationOnMember(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class DescribedAsFacetAnnotationOnMember extends DescribedAsFacetAbstract {
+
+ public DescribedAsFacetAnnotationOnMember(final String value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsFacetForMemberDerivedFromType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsFacetForMemberDerivedFromType.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsFacetForMemberDerivedFromType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/annotation/DescribedAsFacetForMemberDerivedFromType.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,16 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.describedas.annotation;
-package org.apache.isis.core.progmodel.facets.members.describedas.annotation;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacetAbstract;
-
-
-public class DescribedAsFacetForMemberDerivedFromType extends DescribedAsFacetAbstract {
-
- public DescribedAsFacetForMemberDerivedFromType(final DescribedAsFacet describedAsFacet, final FacetHolder holder) {
- super(describedAsFacet.value(), holder);
- }
-
-}
+
+public class DescribedAsFacetForMemberDerivedFromType extends DescribedAsFacetAbstract {
+
+ public DescribedAsFacetForMemberDerivedFromType(final DescribedAsFacet describedAsFacet, final FacetHolder holder) {
+ super(describedAsFacet.value(), holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/staticmethod/DescribedAsFacetViaDescriptionMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/staticmethod/DescribedAsFacetViaDescriptionMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/staticmethod/DescribedAsFacetViaDescriptionMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/staticmethod/DescribedAsFacetViaDescriptionMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -53,39 +53,38 @@ public class DescribedAsFacetViaDescript
// ///////////////////////////////////////////////////////
@Override
- public void process(ProcessMethodContext processMethodContext) {
+ public void process(final ProcessMethodContext processMethodContext) {
attachDescribedAsFacetIfDescriptionMethodIsFound(processMethodContext);
}
- public static void attachDescribedAsFacetIfDescriptionMethodIsFound(
- final ProcessMethodContext processMethodContext) {
+ public static void attachDescribedAsFacetIfDescriptionMethodIsFound(final ProcessMethodContext processMethodContext) {
final Method method = processMethodContext.getMethod();
final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(method.getName());
final Class<?> cls = processMethodContext.getCls();
- Method descriptionMethod =
- MethodFinderUtils.findMethod(cls, MethodScope.CLASS,
- MethodPrefixConstants.DESCRIPTION_PREFIX + capitalizedName, String.class, new Class[0]);
+ final Method descriptionMethod =
+ MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.DESCRIPTION_PREFIX
+ + capitalizedName, String.class, new Class[0]);
if (descriptionMethod == null) {
return;
}
processMethodContext.removeMethod(descriptionMethod);
- String description = invokeDescriptionMethod(descriptionMethod);
+ final String description = invokeDescriptionMethod(descriptionMethod);
final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
FacetUtil.addFacet(new DescribedAsFacetViaMethod(description, descriptionMethod, facetedMethod));
}
- private static String invokeDescriptionMethod(Method descriptionMethod) {
+ private static String invokeDescriptionMethod(final Method descriptionMethod) {
String description = null;
try {
description = (String) InvokeUtils.invokeStatic(descriptionMethod);
- } catch (ClassCastException ex) {
+ } catch (final ClassCastException ex) {
// ignore
}
- if(description == null) {
+ if (description == null) {
throw new MetaModelException("method " + descriptionMethod + "must return a string");
}
return description;
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/staticmethod/DescribedAsFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/staticmethod/DescribedAsFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/staticmethod/DescribedAsFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/describedas/staticmethod/DescribedAsFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.describedas.staticmethod;
-package org.apache.isis.core.progmodel.facets.members.describedas.staticmethod;
-
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
@@ -27,32 +26,29 @@ import java.util.List;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacetAbstract;
-
-
-public class DescribedAsFacetViaMethod extends DescribedAsFacetAbstract implements ImperativeFacet {
-
- private final Method method;
-
- public DescribedAsFacetViaMethod(
- final String value,
- final Method method,
- final FacetHolder holder) {
- super(value, holder);
- this.method = method;
- }
-
- public List<Method> getMethods() {
- return Collections.singletonList(method);
- }
-
-
- public boolean impliesResolve() {
- return false;
- }
-
- public boolean impliesObjectChanged() {
- return false;
- }
-
-}
-
+
+public class DescribedAsFacetViaMethod extends DescribedAsFacetAbstract implements ImperativeFacet {
+
+ private final Method method;
+
+ public DescribedAsFacetViaMethod(final String value, final Method method, final FacetHolder holder) {
+ super(value, holder);
+ this.method = method;
+ }
+
+ @Override
+ public List<Method> getMethods() {
+ return Collections.singletonList(method);
+ }
+
+ @Override
+ public boolean impliesResolve() {
+ return false;
+ }
+
+ @Override
+ public boolean impliesObjectChanged() {
+ return false;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForContextFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForContextFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForContextFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForContextFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.members.disable;
import org.apache.isis.applib.events.UsabilityEvent;
@@ -27,7 +26,6 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-
public abstract class DisableForContextFacetAbstract extends FacetAbstract implements DisableForContextFacet {
public static Class<? extends Facet> type() {
@@ -38,10 +36,10 @@ public abstract class DisableForContextF
super(type(), holder, false);
}
+ @Override
public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
final ObjectAdapter target = ic.getTarget();
return disabledReason(target);
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForContextFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForContextFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForContextFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForContextFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,30 +17,28 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.disable;
-package org.apache.isis.core.progmodel.facets.members.disable;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class DisableForContextFacetNone extends DisableForContextFacetAbstract {
-
- public DisableForContextFacetNone(final FacetHolder holder) {
- super(holder);
- }
-
- /**
- * Always returns <tt>null</tt>.
- */
- public String disabledReason(final ObjectAdapter target) {
- return null;
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+public class DisableForContextFacetNone extends DisableForContextFacetAbstract {
+
+ public DisableForContextFacetNone(final FacetHolder holder) {
+ super(holder);
+ }
+
+ /**
+ * Always returns <tt>null</tt>.
+ */
+ @Override
+ public String disabledReason(final ObjectAdapter target) {
+ return null;
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForSessionFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForSessionFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForSessionFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForSessionFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.members.disable;
import org.apache.isis.applib.events.UsabilityEvent;
@@ -27,7 +26,6 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-
public abstract class DisableForSessionFacetAbstract extends FacetAbstract implements DisableForSessionFacet {
public static Class<? extends Facet> type() {
@@ -38,10 +36,10 @@ public abstract class DisableForSessionF
super(type(), holder, false);
}
+ @Override
public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
final AuthenticationSession session = ic.getSession();
return disabledReason(session);
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForSessionFacetNone.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForSessionFacetNone.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForSessionFacetNone.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisableForSessionFacetNone.java Tue Apr 26 22:03:43 2011
@@ -17,27 +17,25 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.disable;
-package org.apache.isis.core.progmodel.facets.members.disable;
-
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class DisableForSessionFacetNone extends DisableForSessionFacetAbstract {
-
- public DisableForSessionFacetNone(final FacetHolder holder) {
- super(holder);
- }
-
- public String disabledReason(final AuthenticationSession session) {
- return null;
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+public class DisableForSessionFacetNone extends DisableForSessionFacetAbstract {
+
+ public DisableForSessionFacetNone(final FacetHolder holder) {
+ super(holder);
+ }
+
+ @Override
+ public String disabledReason(final AuthenticationSession session) {
+ return null;
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.disable;
-package org.apache.isis.core.progmodel.facets.members.disable;
-
import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -27,29 +26,29 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.SingleWhenValueFacetAbstract;
import org.apache.isis.core.metamodel.facets.When;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-
-
-public abstract class DisabledFacetAbstract extends SingleWhenValueFacetAbstract implements DisabledFacet {
-
- public static Class<? extends Facet> type() {
- return DisabledFacet.class;
- }
-
- public DisabledFacetAbstract(final When value, final FacetHolder holder) {
- super(type(), holder, value);
- }
-
- public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
- final ObjectAdapter target = ic.getTarget();
- String disabledReason = disabledReason(target);
- if (disabledReason != null) {
- return disabledReason;
- }
- if (getUnderlyingFacet() != null) {
- DisabledFacet underlyingFacet = (DisabledFacet) getUnderlyingFacet();
- return underlyingFacet.disabledReason(target);
- }
- return null;
- }
-
-}
+
+public abstract class DisabledFacetAbstract extends SingleWhenValueFacetAbstract implements DisabledFacet {
+
+ public static Class<? extends Facet> type() {
+ return DisabledFacet.class;
+ }
+
+ public DisabledFacetAbstract(final When value, final FacetHolder holder) {
+ super(type(), holder, value);
+ }
+
+ @Override
+ public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
+ final ObjectAdapter target = ic.getTarget();
+ final String disabledReason = disabledReason(target);
+ if (disabledReason != null) {
+ return disabledReason;
+ }
+ if (getUnderlyingFacet() != null) {
+ final DisabledFacet underlyingFacet = (DisabledFacet) getUnderlyingFacet();
+ return underlyingFacet.disabledReason(target);
+ }
+ return null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetImpl.java Tue Apr 26 22:03:43 2011
@@ -17,39 +17,37 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.disable;
-package org.apache.isis.core.progmodel.facets.members.disable;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.When;
-
-
-public class DisabledFacetImpl extends DisabledFacetAbstract {
-
- public DisabledFacetImpl(final When value, final FacetHolder holder) {
- super(value, holder);
- }
-
- public String disabledReason(final ObjectAdapter targetAdapter) {
- if (value() == When.ALWAYS) {
- return "Always disabled";
- } else if (value() == When.NEVER) {
- return null;
- }
-
- // remaining tests depend upon the actual target in question
- if (targetAdapter == null) {
- return null;
- }
-
- if (value() == When.UNTIL_PERSISTED) {
- return targetAdapter.isTransient() ? "Disabled until persisted" : null;
- } else if (value() == When.ONCE_PERSISTED) {
- return targetAdapter.isPersistent() ? "Disabled once persisted" : null;
- }
- return null;
- }
-
-}
-
+
+public class DisabledFacetImpl extends DisabledFacetAbstract {
+
+ public DisabledFacetImpl(final When value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+ @Override
+ public String disabledReason(final ObjectAdapter targetAdapter) {
+ if (value() == When.ALWAYS) {
+ return "Always disabled";
+ } else if (value() == When.NEVER) {
+ return null;
+ }
+
+ // remaining tests depend upon the actual target in question
+ if (targetAdapter == null) {
+ return null;
+ }
+
+ if (value() == When.UNTIL_PERSISTED) {
+ return targetAdapter.isTransient() ? "Disabled until persisted" : null;
+ } else if (value() == When.ONCE_PERSISTED) {
+ return targetAdapter.isPersistent() ? "Disabled once persisted" : null;
+ }
+ return null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetNever.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetNever.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetNever.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/DisabledFacetNever.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.disable;
-package org.apache.isis.core.progmodel.facets.members.disable;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.When;
-
-
-public class DisabledFacetNever extends DisabledFacetAbstract {
-
- public DisabledFacetNever(final FacetHolder holder) {
- super(When.NEVER, holder);
- }
-
- /**
- * Always returns <tt>null</tt>.
- */
- public String disabledReason(final ObjectAdapter target) {
- return null;
- }
-
- @Override
- public boolean isNoop() {
- return true;
- }
-
-}
-
+
+public class DisabledFacetNever extends DisabledFacetAbstract {
+
+ public DisabledFacetNever(final FacetHolder holder) {
+ super(When.NEVER, holder);
+ }
+
+ /**
+ * Always returns <tt>null</tt>.
+ */
+ @Override
+ public String disabledReason(final ObjectAdapter target) {
+ return null;
+ }
+
+ @Override
+ public boolean isNoop() {
+ return true;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/annotation/DisabledAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/annotation/DisabledAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/annotation/DisabledAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/annotation/DisabledAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
* under the License.
*/
-
-package org.apache.isis.core.progmodel.facets.members.disable.annotation;
-
+package org.apache.isis.core.progmodel.facets.members.disable.annotation;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,22 +26,21 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.When;
import org.apache.isis.core.progmodel.facets.members.disable.DisabledFacet;
-
-
-public class DisabledAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public DisabledAnnotationFacetFactory() {
- super(FeatureType.MEMBERS);
- }
-
- @Override
- public void process(ProcessMethodContext processMethodContext) {
- final Disabled annotation = getAnnotation(processMethodContext.getMethod(), Disabled.class);
- FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
- }
-
- private DisabledFacet create(final Disabled annotation, final FacetHolder holder) {
- return annotation == null ? null : new DisabledFacetAnnotation(When.decode(annotation.value()), holder);
- }
-
-}
+
+public class DisabledAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public DisabledAnnotationFacetFactory() {
+ super(FeatureType.MEMBERS);
+ }
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+ final Disabled annotation = getAnnotation(processMethodContext.getMethod(), Disabled.class);
+ FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+ }
+
+ private DisabledFacet create(final Disabled annotation, final FacetHolder holder) {
+ return annotation == null ? null : new DisabledFacetAnnotation(When.decode(annotation.value()), holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/annotation/DisabledFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/annotation/DisabledFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/annotation/DisabledFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/annotation/DisabledFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,19 +17,16 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.members.disable.annotation;
-package org.apache.isis.core.progmodel.facets.members.disable.annotation;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.When;
import org.apache.isis.core.progmodel.facets.members.disable.DisabledFacetImpl;
-
-
-public class DisabledFacetAnnotation extends DisabledFacetImpl {
-
- public DisabledFacetAnnotation(final When value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class DisabledFacetAnnotation extends DisabledFacetImpl {
+
+ public DisabledFacetAnnotation(final When value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/forsession/DisableForSessionFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/forsession/DisableForSessionFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/forsession/DisableForSessionFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/forsession/DisableForSessionFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.members.disable.forsession;
import java.lang.reflect.Method;
@@ -31,36 +30,37 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.progmodel.facets.members.disable.DisableForSessionFacetAbstract;
-
public class DisableForSessionFacetViaMethod extends DisableForSessionFacetAbstract implements ImperativeFacet {
private final Method method;
- public DisableForSessionFacetViaMethod(
- final Method method,
- final FacetHolder holder) {
+ public DisableForSessionFacetViaMethod(final Method method, final FacetHolder holder) {
super(holder);
this.method = method;
}
/**
- * Returns a singleton list of the {@link Method} provided in the constructor.
+ * Returns a singleton list of the {@link Method} provided in the constructor.
*/
+ @Override
public List<Method> getMethods() {
- return Collections.singletonList(method);
+ return Collections.singletonList(method);
}
- public boolean impliesResolve() {
- return true;
- }
+ @Override
+ public boolean impliesResolve() {
+ return true;
+ }
- public boolean impliesObjectChanged() {
- return false;
- }
+ @Override
+ public boolean impliesObjectChanged() {
+ return false;
+ }
/**
* Will only check provided that a {@link AuthenticationSession} has been provided.
*/
+ @Override
public String disabledReason(final AuthenticationSession session) {
if (session == null) {
return null;
@@ -78,4 +78,3 @@ public class DisableForSessionFacetViaMe
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/forsession/DisabledFacetViaDisableForSessionMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/forsession/DisabledFacetViaDisableForSessionMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/forsession/DisabledFacetViaDisableForSessionMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/forsession/DisabledFacetViaDisableForSessionMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -48,7 +48,7 @@ public class DisabledFacetViaDisableForS
// ///////////////////////////////////////////////////////
@Override
- public void process(ProcessMethodContext processMethodContext) {
+ public void process(final ProcessMethodContext processMethodContext) {
attachDisableFacetIfDisableMethodForSessionIsFound(processMethodContext);
}
@@ -58,11 +58,11 @@ public class DisabledFacetViaDisableForS
final Method method = processMethodContext.getMethod();
final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(method.getName());
- Class<?> cls = processMethodContext.getCls();
- Method disableForSessionMethod =
- MethodFinderUtils.findMethod(cls, MethodScope.CLASS,
- MethodPrefixConstants.DISABLE_PREFIX + capitalizedName, String.class,
- new Class[] { UserMemento.class });
+ final Class<?> cls = processMethodContext.getCls();
+ final Method disableForSessionMethod =
+ MethodFinderUtils
+ .findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.DISABLE_PREFIX + capitalizedName,
+ String.class, new Class[] { UserMemento.class });
if (disableForSessionMethod == null) {
return;
@@ -74,6 +74,4 @@ public class DisabledFacetViaDisableForS
FacetUtil.addFacet(new DisableForSessionFacetViaMethod(disableForSessionMethod, facetedMethod));
}
-
-
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/method/DisableForContextFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/method/DisableForContextFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/method/DisableForContextFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/method/DisableForContextFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.members.disable.method;
import java.lang.reflect.Method;
@@ -30,33 +29,34 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.progmodel.facets.members.disable.DisableForContextFacetAbstract;
-
public class DisableForContextFacetViaMethod extends DisableForContextFacetAbstract implements ImperativeFacet {
private final Method method;
- public DisableForContextFacetViaMethod(
- final Method method,
- final FacetHolder holder) {
+ public DisableForContextFacetViaMethod(final Method method, final FacetHolder holder) {
super(holder);
this.method = method;
}
/**
- * Returns a singleton list of the {@link Method} provided in the constructor.
+ * Returns a singleton list of the {@link Method} provided in the constructor.
*/
+ @Override
public List<Method> getMethods() {
- return Collections.singletonList(method);
+ return Collections.singletonList(method);
}
- public boolean impliesResolve() {
- return true;
- }
+ @Override
+ public boolean impliesResolve() {
+ return true;
+ }
- public boolean impliesObjectChanged() {
- return false;
- }
+ @Override
+ public boolean impliesObjectChanged() {
+ return false;
+ }
+ @Override
public String disabledReason(final ObjectAdapter owningAdapter) {
if (owningAdapter == null) {
return null;
@@ -70,4 +70,3 @@ public class DisableForContextFacetViaMe
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/method/DisabledFacetViaDisableMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/method/DisabledFacetViaDisableMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/method/DisabledFacetViaDisableMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disable/method/DisabledFacetViaDisableMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -33,7 +33,8 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.progmodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.progmodel.facets.MethodPrefixConstants;
-public class DisabledFacetViaDisableMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements AdapterMapAware {
+public class DisabledFacetViaDisableMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements
+ AdapterMapAware {
private static final String[] PREFIXES = { MethodPrefixConstants.DISABLE_PREFIX };
@@ -51,7 +52,7 @@ public class DisabledFacetViaDisableMeth
// ///////////////////////////////////////////////////////
@Override
- public void process(ProcessMethodContext processMethodContext) {
+ public void process(final ProcessMethodContext processMethodContext) {
attachDisabledFacetIfDisabledMethodIsFound(processMethodContext);
}
@@ -60,8 +61,8 @@ public class DisabledFacetViaDisableMeth
final Method method = processMethodContext.getMethod();
final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(method.getName());
- Class<?> cls = processMethodContext.getCls();
- Method disableMethod =
+ final Class<?> cls = processMethodContext.getCls();
+ final Method disableMethod =
MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.DISABLE_PREFIX
+ capitalizedName, String.class, new Class[] {});
if (disableMethod == null) {
@@ -69,19 +70,17 @@ public class DisabledFacetViaDisableMeth
}
processMethodContext.removeMethod(disableMethod);
-
+
final FacetHolder facetHolder = processMethodContext.getFacetHolder();
FacetUtil.addFacet(new DisableForContextFacetViaMethod(disableMethod, facetHolder));
}
-
-
// ///////////////////////////////////////////////////////////////
// Dependencies
// ///////////////////////////////////////////////////////////////
@Override
- public void setAdapterMap(AdapterMap adapterMap) {
+ public void setAdapterMap(final AdapterMap adapterMap) {
this.adapterMap = adapterMap;
}