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/01/17 19:23:18 UTC
svn commit: r1060035 [5/14] - in /incubator/isis/trunk:
alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/
alternatives/objectstore/nosql/src/test/java/org/apache/isis/alternatives/objectstore/nosql/
alternatives/objectstore/sql...
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/remove/RemoveCallbackViaDeleteMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/remove/RemoveCallbackViaDeleteMethodFacetFactory.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/remove/RemoveCallbackViaDeleteMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/remove/RemoveCallbackViaDeleteMethodFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -33,14 +33,12 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.methodutils.MethodScope;
import org.apache.isis.core.progmodel.facets.MethodFinderUtils;
import org.apache.isis.core.progmodel.facets.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.progmodel.facets.MethodPrefixConstants;
public class RemoveCallbackViaDeleteMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
- private static final String DELETED_PREFIX = "deleted";
- private static final String DELETING_PREFIX = "deleting";
-
- private static final String[] PREFIXES = { DELETED_PREFIX, DELETING_PREFIX, };
+ private static final String[] PREFIXES = { MethodPrefixConstants.DELETED_PREFIX, MethodPrefixConstants.DELETING_PREFIX, };
public RemoveCallbackViaDeleteMethodFacetFactory() {
super(FeatureType.OBJECTS_ONLY, PREFIXES);
@@ -55,7 +53,7 @@ public class RemoveCallbackViaDeleteMeth
final List<Method> methods = new ArrayList<Method>();
Method method = null;
- method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, DELETING_PREFIX, void.class, NO_PARAMETERS_TYPES);
+ method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.DELETING_PREFIX, void.class, NO_PARAMETERS_TYPES);
if (method != null) {
methods.add(method);
RemovingCallbackFacet facet = holder.getFacet(RemovingCallbackFacet.class);
@@ -66,7 +64,7 @@ public class RemoveCallbackViaDeleteMeth
}
}
- method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, DELETED_PREFIX, void.class, NO_PARAMETERS_TYPES);
+ method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.DELETED_PREFIX, void.class, NO_PARAMETERS_TYPES);
if (method != null) {
methods.add(method);
RemovedCallbackFacet facet = holder.getFacet(RemovedCallbackFacet.class);
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/update/UpdateCallbackFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/update/UpdateCallbackFacetFactory.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/update/UpdateCallbackFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/callbacks/update/UpdateCallbackFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -31,14 +31,12 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.methodutils.MethodScope;
import org.apache.isis.core.progmodel.facets.MethodFinderUtils;
import org.apache.isis.core.progmodel.facets.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.progmodel.facets.MethodPrefixConstants;
public class UpdateCallbackFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
- private static final String UPDATED_PREFIX = "updated";
- private static final String UPDATING_PREFIX = "updating";
-
- private static final String[] PREFIXES = { UPDATED_PREFIX, UPDATING_PREFIX, };
+ private static final String[] PREFIXES = { MethodPrefixConstants.UPDATED_PREFIX, MethodPrefixConstants.UPDATING_PREFIX, };
public UpdateCallbackFacetFactory() {
super(FeatureType.OBJECTS_ONLY, PREFIXES);
@@ -53,13 +51,13 @@ public class UpdateCallbackFacetFactory
final List<Method> methods = new ArrayList<Method>();
Method method = null;
- method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, UPDATING_PREFIX, void.class, NO_PARAMETERS_TYPES);
+ method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.UPDATING_PREFIX, void.class, NO_PARAMETERS_TYPES);
if (method != null) {
methods.add(method);
facets.add(new UpdatingCallbackFacetViaMethod(method, facetHolder));
}
- method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, UPDATED_PREFIX, void.class, NO_PARAMETERS_TYPES);
+ method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.UPDATED_PREFIX, void.class, NO_PARAMETERS_TYPES);
if (method != null) {
methods.add(method);
facets.add(new UpdatedCallbackFacetViaMethod(method, facetHolder));
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/ChoicesFacetEnum.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacetEnum.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/ChoicesFacetEnum.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/ChoicesFacetEnum.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacetEnum.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/ChoicesFacetEnum.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/ChoicesFacetEnum.java Mon Jan 17 18:22:58 2011
@@ -18,10 +18,11 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.enums;
+package org.apache.isis.core.progmodel.facets.object.choices.enums;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.choices.ChoicesFacetAbstract;
public class ChoicesFacetEnum extends ChoicesFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumFacet.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumFacet.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.enums;
+package org.apache.isis.core.progmodel.facets.object.choices.enums;
import org.apache.isis.core.metamodel.facetapi.Facet;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -17,12 +17,13 @@
* under the License.
*/
-package org.apache.isis.core.progmodel.facets.propparam.enums;
+package org.apache.isis.core.progmodel.facets.object.choices.enums;
import org.apache.isis.core.commons.lang.CastUtils;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.progmodel.facets.value.ValueUsingValueSemanticsProviderFacetFactory;
+import org.apache.isis.core.metamodel.facets.choices.ChoicesFacet;
+import org.apache.isis.core.progmodel.facets.object.value.ValueUsingValueSemanticsProviderFacetFactory;
public class EnumFacetFactory<T extends Enum<T>> extends ValueUsingValueSemanticsProviderFacetFactory<T> {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumValueSemanticsProvider.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumValueSemanticsProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumValueSemanticsProvider.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumValueSemanticsProvider.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumValueSemanticsProvider.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/enums/EnumValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/choices/enums/EnumValueSemanticsProvider.java Mon Jan 17 18:22:58 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.progmodel.facets.propparam.enums;
+package org.apache.isis.core.progmodel.facets.object.choices.enums;
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
@@ -27,8 +27,8 @@ import org.apache.isis.core.commons.conf
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
+import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-import org.apache.isis.core.progmodel.facets.value.ValueSemanticsProviderAndFacetAbstract;
public class EnumValueSemanticsProvider<T extends Enum<T>> extends ValueSemanticsProviderAndFacetAbstract<T> implements EnumFacet {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacet.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacet.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.defaults;
+package org.apache.isis.core.progmodel.facets.object.defaults;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.SingleValueFacet;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.core.progmodel.facets.defaults;
+package org.apache.isis.core.progmodel.facets.object.defaults;
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.adapters.EncoderDecoder;
+import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-import org.apache.isis.core.progmodel.util.ClassUtil;
public abstract class DefaultedFacetAbstract extends FacetAbstract implements DefaultedFacet {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetUsingDefaultsProvider.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetUsingDefaultsProvider.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetUsingDefaultsProvider.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultedFacetUsingDefaultsProvider.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.defaults;
+package org.apache.isis.core.progmodel.facets.object.defaults;
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
@@ -28,10 +28,10 @@ import org.apache.isis.core.metamodel.ru
public class DefaultedFacetUsingDefaultsProvider extends FacetAbstract implements DefaultedFacet {
- private final DefaultsProvider defaultsProvider;
+ private final DefaultsProvider<?> defaultsProvider;
private final DependencyInjector dependencyInjector;
- public DefaultedFacetUsingDefaultsProvider(final DefaultsProvider parser, final FacetHolder holder, final DependencyInjector dependencyInjector) {
+ public DefaultedFacetUsingDefaultsProvider(final DefaultsProvider<?> parser, final FacetHolder holder, final DependencyInjector dependencyInjector) {
super(DefaultedFacet.class, holder, false);
this.defaultsProvider = parser;
this.dependencyInjector = dependencyInjector;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultsProviderUtil.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultsProviderUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultsProviderUtil.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultsProviderUtil.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultsProviderUtil.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultsProviderUtil.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/DefaultsProviderUtil.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.defaults;
+package org.apache.isis.core.progmodel.facets.object.defaults;
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -34,7 +34,7 @@ public final class DefaultsProviderUtil
public static final String DEFAULTS_PROVIDER_NAME_KEY_PREFIX = "isis.reflector.java.facets.defaulted.";
public static final String DEFAULTS_PROVIDER_NAME_KEY_SUFFIX = ".providerName";
- static String defaultsProviderNameFromConfiguration(final Class<?> type, final IsisConfiguration configuration) {
+ public static String defaultsProviderNameFromConfiguration(final Class<?> type, final IsisConfiguration configuration) {
final String key = DEFAULTS_PROVIDER_NAME_KEY_PREFIX + type.getCanonicalName() + DEFAULTS_PROVIDER_NAME_KEY_SUFFIX;
final String defaultsProviderName = configuration.getString(key);
return !StringUtils.isNullOrEmpty(defaultsProviderName) ? defaultsProviderName : null;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedAnnotationFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedAnnotationFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -18,39 +18,35 @@
*/
-package org.apache.isis.core.progmodel.facets.defaults;
+package org.apache.isis.core.progmodel.facets.object.defaults.annotation;
import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.StringUtils;
-import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
-import org.apache.isis.core.metamodel.adapter.map.AdapterMapAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
-import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjectorAware;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.progmodel.facets.object.defaults.DefaultedFacetAbstract;
+import org.apache.isis.core.progmodel.facets.object.defaults.DefaultsProviderUtil;
-public class DefaultedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware, DependencyInjectorAware, AdapterMapAware {
+public class DefaultedAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware, DependencyInjectorAware {
private IsisConfiguration configuration;
private DependencyInjector dependencyInjector;
- private AdapterMap adapterMap;
public DefaultedAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_PROPERTIES_AND_PARAMETERS);
+ super(FeatureType.OBJECTS_ONLY);
}
@Override
- public void process(ProcessClassContext processClassContaxt) {
- FacetUtil.addFacet(create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder()));
+ public void process(ProcessClassContext processClassContext) {
+ FacetUtil.addFacet(create(processClassContext.getCls(), processClassContext.getFacetHolder()));
}
private DefaultedFacetAbstract create(final Class<?> cls, final FacetHolder holder) {
@@ -58,7 +54,7 @@ public class DefaultedAnnotationFacetFac
// create from annotation, if present
if (annotation != null) {
- final DefaultedFacetAbstract facet = new DefaultedFacetAnnotation(cls, getIsisConfiguration(), holder, dependencyInjector);
+ final DefaultedFacetAbstract facet = new DefaultedFacetAnnotation(cls, getIsisConfiguration(), holder, getDependencyInjector());
if (facet.isValid()) {
return facet;
}
@@ -68,7 +64,7 @@ public class DefaultedAnnotationFacetFac
final String providerName = DefaultsProviderUtil.defaultsProviderNameFromConfiguration(cls,
getIsisConfiguration());
if (!StringUtils.isNullOrEmpty(providerName)) {
- final DefaultedFacetFromConfiguration facet = new DefaultedFacetFromConfiguration(providerName, holder, dependencyInjector);
+ final DefaultedFacetFromConfiguration facet = new DefaultedFacetFromConfiguration(providerName, holder, getDependencyInjector());
if (facet.isValid()) {
return facet;
}
@@ -77,58 +73,6 @@ public class DefaultedAnnotationFacetFac
return null;
}
- /**
- * If there is a {@link DefaultedFacet} on the properties return type, then installs a
- * {@link PropertyDefaultFacet} for the property with the same default.
- */
- @Override
- public void process(ProcessMethodContext processMethodContext) {
- // don't overwrite any defaults that might already picked up
- final PropertyDefaultFacet existingDefaultFacet = processMethodContext.getFacetHolder().getFacet(PropertyDefaultFacet.class);
- if (existingDefaultFacet != null && !existingDefaultFacet.isNoop()) {
- return;
- }
-
- // try to infer defaults from the underlying return type
- final Class<?> returnType = processMethodContext.getMethod().getReturnType();
- final DefaultedFacet returnTypeDefaultedFacet = getDefaultedFacet(returnType);
- if (returnTypeDefaultedFacet != null) {
- final PropertyDefaultFacetDerivedFromDefaultedFacet propertyFacet = new PropertyDefaultFacetDerivedFromDefaultedFacet(
- returnTypeDefaultedFacet, processMethodContext.getFacetHolder(), getAdapterMap());
- FacetUtil.addFacet(propertyFacet);
- }
- }
-
- /**
- * If there is a {@link DefaultedFacet} on any of the action's parameter types, then installs a
- * {@link ActionDefaultsFacet} for the action.
- */
- @Override
- public void processParams(ProcessParameterContext processParameterContext) {
- // don't overwrite any defaults already picked up
- if (processParameterContext.getFacetHolder().getFacet(ActionDefaultsFacet.class) != null) {
- return;
- }
-
- // try to infer defaults from any of the parameter's underlying types
- final Class<?>[] parameterTypes = processParameterContext.getMethod().getParameterTypes();
- final DefaultedFacet[] parameterTypeDefaultedFacets = new DefaultedFacet[parameterTypes.length];
- boolean hasAtLeastOneDefault = false;
- for (int i = 0; i < parameterTypes.length; i++) {
- final Class<?> paramType = parameterTypes[i];
- parameterTypeDefaultedFacets[i] = getDefaultedFacet(paramType);
- hasAtLeastOneDefault = hasAtLeastOneDefault | (parameterTypeDefaultedFacets[i] != null);
- }
- if (hasAtLeastOneDefault) {
- FacetUtil.addFacet(new ActionDefaultsFacetDerivedFromDefaultedFacets(parameterTypeDefaultedFacets, processParameterContext.getFacetHolder()));
- }
- }
-
- private DefaultedFacet getDefaultedFacet(final Class<?> paramType) {
- final ObjectSpecification paramTypeSpec =
- getSpecificationLookup().loadSpecification(paramType);
- return paramTypeSpec.getFacet(DefaultedFacet.class);
- }
// ////////////////////////////////////////////////////////////////////
// Injected
@@ -142,22 +86,12 @@ public class DefaultedAnnotationFacetFac
this.configuration = configuration;
}
- public DependencyInjector getDependencyInjector() {
+ private DependencyInjector getDependencyInjector() {
return dependencyInjector;
}
-
@Override
public void setDependencyInjector(DependencyInjector dependencyInjector) {
this.dependencyInjector = dependencyInjector;
- }
-
- public AdapterMap getAdapterMap() {
- return adapterMap;
}
-
- @Override
- public void setAdapterMap(AdapterMap adapterMap) {
- this.adapterMap = adapterMap;
- }
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedFacetAnnotation.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetAnnotation.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedFacetAnnotation.java Mon Jan 17 18:22:58 2011
@@ -18,13 +18,15 @@
*/
-package org.apache.isis.core.progmodel.facets.defaults;
+package org.apache.isis.core.progmodel.facets.object.defaults.annotation;
import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
+import org.apache.isis.core.progmodel.facets.object.defaults.DefaultedFacetAbstract;
+import org.apache.isis.core.progmodel.facets.object.defaults.DefaultsProviderUtil;
public class DefaultedFacetAnnotation extends DefaultedFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedFacetFromConfiguration.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetFromConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedFacetFromConfiguration.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedFacetFromConfiguration.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetFromConfiguration.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/defaults/DefaultedFacetFromConfiguration.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/defaults/annotation/DefaultedFacetFromConfiguration.java Mon Jan 17 18:22:58 2011
@@ -18,10 +18,11 @@
*/
-package org.apache.isis.core.progmodel.facets.defaults;
+package org.apache.isis.core.progmodel.facets.object.defaults.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
+import org.apache.isis.core.progmodel.facets.object.defaults.DefaultedFacetAbstract;
public class DefaultedFacetFromConfiguration extends DefaultedFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/describedas/annotation/DescribedAsAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/describedas/annotation/DescribedAsAnnotationFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/describedas/annotation/DescribedAsAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsAnnotationOnTypeFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -18,23 +18,20 @@
*/
-package org.apache.isis.core.progmodel.facets.describedas.annotation;
+package org.apache.isis.core.progmodel.facets.object.describedas.annotation;
-import java.lang.annotation.Annotation;
-
import org.apache.isis.applib.annotation.DescribedAs;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacet;
-public class DescribedAsAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class DescribedAsAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
- public DescribedAsAnnotationFacetFactory() {
- super(FeatureType.EVERYTHING);
+ public DescribedAsAnnotationOnTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
}
@Override
@@ -43,55 +40,9 @@ public class DescribedAsAnnotationFacetF
FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
}
- @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) {
- 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 DescribedAsFacetDerivedFromType(returnTypeDescribedAsFacet, processMethodContext.getFacetHolder());
- FacetUtil.addFacet(facet);
- }
- }
-
- @Override
- public void processParams(ProcessParameterContext processParameterContext) {
-
- final int paramNum = processParameterContext.getParamNum();
- final Class<?> parameterType = processParameterContext.getMethod().getParameterTypes()[paramNum];
- final Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[paramNum];
- for (int j = 0; j < parameterAnnotations.length; j++) {
- if (parameterAnnotations[j] instanceof DescribedAs) {
- FacetUtil.addFacet(create((DescribedAs) parameterAnnotations[j], processParameterContext.getFacetHolder()));
- return;
- }
- }
-
- // otherwise, fall back to a description on the parameter's type, if available
- final DescribedAsFacet parameterTypeDescribedAsFacet = getDescribedAsFacet(parameterType);
- if (parameterTypeDescribedAsFacet != null) {
- FacetUtil.addFacet(new DescribedAsFacetDerivedFromType(parameterTypeDescribedAsFacet, processParameterContext.getFacetHolder()));
- return;
- }
-
- }
private DescribedAsFacet create(final DescribedAs annotation, final FacetHolder holder) {
- return annotation == null ? null : new DescribedAsFacetAnnotation(annotation.value(), holder);
- }
-
- private DescribedAsFacet getDescribedAsFacet(final Class<?> type) {
- final ObjectSpecification paramTypeSpec = getSpecificationLookup().loadSpecification(type);
- return paramTypeSpec.getFacet(DescribedAsFacet.class);
+ return annotation == null ? null : new DescribedAsFacetAnnotationOnType(annotation.value(), holder);
}
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsFacetAnnotationOnType.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/describedas/annotation/DescribedAsFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsFacetAnnotationOnType.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsFacetAnnotationOnType.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/describedas/annotation/DescribedAsFacetAnnotation.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/describedas/annotation/DescribedAsFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/describedas/annotation/DescribedAsFacetAnnotationOnType.java Mon Jan 17 18:22:58 2011
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.core.progmodel.facets.describedas.annotation;
+package org.apache.isis.core.progmodel.facets.object.describedas.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacetAbstract;
+import org.apache.isis.core.metamodel.facets.describedas.DescribedAsFacetAbstract;
-public class DescribedAsFacetAnnotation extends DescribedAsFacetAbstract {
+public class DescribedAsFacetAnnotationOnType extends DescribedAsFacetAbstract {
- public DescribedAsFacetAnnotation(final String value, final FacetHolder holder) {
+ public DescribedAsFacetAnnotationOnType(final String value, final FacetHolder holder) {
super(value, holder);
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableAnnotationFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableAnnotationFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.encodeable;
+package org.apache.isis.core.progmodel.facets.object.encodeable;
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.commons.config.IsisConfiguration;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.core.progmodel.facets.encodeable;
+package org.apache.isis.core.progmodel.facets.object.encodeable;
import org.apache.isis.applib.adapters.EncoderDecoder;
+import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-import org.apache.isis.core.progmodel.util.ClassUtil;
public abstract class EncodableFacetAbstract extends FacetAbstract implements EncodableFacet {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetAnnotation.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetAnnotation.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetAnnotation.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.encodeable;
+package org.apache.isis.core.progmodel.facets.object.encodeable;
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.commons.config.IsisConfiguration;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetFromConfiguration.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetFromConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetFromConfiguration.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetFromConfiguration.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetFromConfiguration.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetFromConfiguration.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetFromConfiguration.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.encodeable;
+package org.apache.isis.core.progmodel.facets.object.encodeable;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetUsingEncoderDecoder.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetUsingEncoderDecoder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetUsingEncoderDecoder.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetUsingEncoderDecoder.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetUsingEncoderDecoder.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncodableFacetUsingEncoderDecoder.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncodableFacetUsingEncoderDecoder.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.encodeable;
+package org.apache.isis.core.progmodel.facets.object.encodeable;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.core.commons.ensure.Assert;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncoderDecoderUtil.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncoderDecoderUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncoderDecoderUtil.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncoderDecoderUtil.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncoderDecoderUtil.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/encodeable/EncoderDecoderUtil.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/encodeable/EncoderDecoderUtil.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.encodeable;
+package org.apache.isis.core.progmodel.facets.object.encodeable;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.core.commons.config.IsisConfiguration;
Added: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java?rev=1060035&view=auto
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java (added)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenAnnotationForTypeFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.isis.core.progmodel.facets.object.hidden;
+
+
+import org.apache.isis.applib.annotation.Hidden;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
+
+
+public class HiddenAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public HiddenAnnotationForTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(ProcessClassContext processClassContaxt) {
+ final Hidden annotation = getAnnotation(processClassContaxt.getCls(), Hidden.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private static HiddenFacet create(final Hidden annotation, final FacetHolder holder) {
+ return annotation == null ? null : new HiddenFacetForTypeAnnotation(When.decode(annotation.value()), holder);
+ }
+
+}
Added: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenFacetForTypeAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenFacetForTypeAnnotation.java?rev=1060035&view=auto
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenFacetForTypeAnnotation.java (added)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/hidden/HiddenFacetForTypeAnnotation.java Mon Jan 17 18:22:58 2011
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.isis.core.progmodel.facets.object.hidden;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.progmodel.facets.members.hide.HiddenFacetImpl;
+
+
+public class HiddenFacetForTypeAnnotation extends HiddenFacetImpl {
+
+ public HiddenFacetForTypeAnnotation(final When value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
+
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/icon/method/IconFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/icon/method/IconFacetViaMethod.java?rev=1060035&r1=1060034&r2=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/icon/method/IconFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/icon/method/IconFacetViaMethod.java Mon Jan 17 18:22:58 2011
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.progmodel.facets.object.icon.IconFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.icon.IconFacetAbstract;
public class IconFacetViaMethod extends IconFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableAnnotationFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableAnnotationFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.object.immutable;
+package org.apache.isis.core.progmodel.facets.object.immutable.annotation;
import org.apache.isis.applib.annotation.Immutable;
@@ -28,13 +28,12 @@ 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.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class ImmutableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
public ImmutableAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_PROPERTIES_AND_COLLECTIONS);
+ super(FeatureType.OBJECTS_ONLY);
}
@Override
@@ -43,15 +42,6 @@ public class ImmutableAnnotationFacetFac
FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
}
- @Override
- public void process(ProcessMethodContext processMethodContext) {
- ObjectSpecification spec = getSpecificationLookup().loadSpecification(processMethodContext.getMethod().getDeclaringClass());
- final ImmutableFacet immutableFacet = spec.getFacet(ImmutableFacet.class);
- if (immutableFacet != null && !immutableFacet.isNoop()) {
- FacetUtil.addFacet(new DisabledFacetDerivedFromImmutable(immutableFacet, processMethodContext.getFacetHolder()));
- }
- }
-
private ImmutableFacet create(final Immutable annotation, final FacetHolder holder) {
return annotation == null ? null : new ImmutableFacetAnnotation(When.decode(annotation.value()), holder);
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableFacetAnnotation.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableFacetAnnotation.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableFacetAnnotation.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetAnnotation.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableFacetAnnotation.java Mon Jan 17 18:22:58 2011
@@ -18,13 +18,14 @@
*/
-package org.apache.isis.core.progmodel.facets.object.immutable;
+package org.apache.isis.core.progmodel.facets.object.immutable.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacetAbstract;
-public class ImmutableFacetAnnotation extends ImmutableFacetImpl {
+public class ImmutableFacetAnnotation extends ImmutableFacetAbstract {
public ImmutableFacetAnnotation(final When value, final FacetHolder holder) {
super(value, holder);
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableFacetMarkerInterface.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetMarkerInterface.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableFacetMarkerInterface.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableFacetMarkerInterface.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetMarkerInterface.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableFacetMarkerInterface.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableFacetMarkerInterface.java Mon Jan 17 18:22:58 2011
@@ -18,13 +18,14 @@
*/
-package org.apache.isis.core.progmodel.facets.object.immutable;
+package org.apache.isis.core.progmodel.facets.object.immutable.markerifc;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.When;
+import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacetAbstract;
-public class ImmutableFacetMarkerInterface extends ImmutableFacetImpl {
+public class ImmutableFacetMarkerInterface extends ImmutableFacetAbstract {
public ImmutableFacetMarkerInterface(final When value, final FacetHolder holder) {
super(value, holder);
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableMarkerInterfacesFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableMarkerInterfacesFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableMarkerInterfacesFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableMarkerInterfacesFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableMarkerInterfacesFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/ImmutableMarkerInterfacesFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableMarkerInterfacesFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.object.immutable;
+package org.apache.isis.core.progmodel.facets.object.immutable.markerifc;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskEvaluator.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskEvaluator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskEvaluator.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskEvaluator.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskEvaluator.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskEvaluator.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskEvaluator.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mask;
+package org.apache.isis.core.progmodel.facets.object.mask;
import java.util.ArrayList;
import java.util.List;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacet.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacet.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacet.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacet.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacet.java Mon Jan 17 18:22:58 2011
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mask;
+package org.apache.isis.core.progmodel.facets.object.mask;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
-import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExFacet;
+import org.apache.isis.core.progmodel.facets.object.regex.RegExFacet;
/**
* Whether the (string) property or a parameter must correspond to a specific mask.
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacetAbstract.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacetAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacetAbstract.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacetAbstract.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacetAbstract.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/MaskFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacetAbstract.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mask;
+package org.apache.isis.core.progmodel.facets.object.mask;
import org.apache.isis.applib.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/TitleFacetBasedOnMask.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/TitleFacetBasedOnMask.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/TitleFacetBasedOnMask.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/TitleFacetBasedOnMask.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/TitleFacetBasedOnMask.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/TitleFacetBasedOnMask.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/TitleFacetBasedOnMask.java Mon Jan 17 18:22:58 2011
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mask;
+package org.apache.isis.core.progmodel.facets.object.mask;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacetAbstract;
-import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacetUsingParser;
+import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
+import org.apache.isis.core.progmodel.facets.object.title.TitleFacetUsingParser;
public class TitleFacetBasedOnMask extends TitleFacetAbstract {
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskAnnotationFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mask.annotation;
+package org.apache.isis.core.progmodel.facets.object.mask.annotation;
import org.apache.isis.applib.annotation.Mask;
@@ -26,16 +26,13 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.object.ident.title.TitleFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskFacet;
-import org.apache.isis.core.progmodel.facets.propparam.validate.mask.TitleFacetBasedOnMask;
+import org.apache.isis.core.progmodel.facets.object.mask.MaskFacet;
-public class MaskAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class MaskAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
- public MaskAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_PROPERTIES_AND_PARAMETERS);
+ public MaskAnnotationForTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
}
/**
@@ -46,53 +43,10 @@ public class MaskAnnotationFacetFactory
final Mask annotation = getAnnotation(processClassContaxt.getCls(), Mask.class);
FacetUtil.addFacet(createMaskFacet(annotation, processClassContaxt.getFacetHolder()));
}
-
- @Override
- public void process(ProcessMethodContext processMethodContext) {
- if (processMethodContext.getMethod().getReturnType() == void.class) {
- return;
- }
-
- final Mask annotation = getAnnotation(processMethodContext.getMethod(), Mask.class);
- addMaskFacetAndCorrespondingTitleFacet(processMethodContext.getFacetHolder(), annotation, processMethodContext.getMethod().getReturnType());
- }
-
- @Override
- public void processParams(ProcessParameterContext processParameterContext) {
- final Class<?>[] parameterTypes = processParameterContext.getMethod().getParameterTypes();
- if (processParameterContext.getParamNum() >= parameterTypes.length) {
- // ignore
- return;
- }
-
- final java.lang.annotation.Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
- for (int i = 0; i < parameterAnnotations.length; i++) {
- if (parameterAnnotations[i] instanceof Mask) {
- final Mask annotation = (Mask) parameterAnnotations[i];
- addMaskFacetAndCorrespondingTitleFacet(processParameterContext.getFacetHolder(), annotation, parameterTypes[i]);
- return;
- }
- }
- }
-
- private MaskFacet createMaskFacet(final Mask annotation, final FacetHolder holder) {
- return annotation != null ? new MaskFacetAnnotation(annotation.value(), null, holder) : null;
- }
-
- private boolean addMaskFacetAndCorrespondingTitleFacet(final FacetHolder holder, final Mask annotation, Class<?> cls) {
- final MaskFacet maskFacet = createMaskFacet(annotation, holder);
- if (maskFacet == null) {
- return false;
- }
- FacetUtil.addFacet(maskFacet);
-
- ObjectSpecification type = getSpecificationLookup().loadSpecification(cls);
- final TitleFacet underlyingTitleFacet = type.getFacet(TitleFacet.class);
- if (underlyingTitleFacet != null) {
- final TitleFacet titleFacet = new TitleFacetBasedOnMask(maskFacet, underlyingTitleFacet);
- FacetUtil.addFacet(titleFacet);
- }
- return true;
- }
+
+ private MaskFacet createMaskFacet(final Mask annotation, final FacetHolder holder) {
+ return annotation != null ? new MaskFacetAnnotationForType(annotation.value(), null, holder) : null;
+ }
+
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskFacetAnnotationForType.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskFacetAnnotationForType.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskFacetAnnotationForType.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskFacetAnnotation.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/mask/annotation/MaskFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskFacetAnnotationForType.java Mon Jan 17 18:22:58 2011
@@ -18,18 +18,18 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.mask.annotation;
+package org.apache.isis.core.progmodel.facets.object.mask.annotation;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskEvaluator;
-import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskFacetAbstract;
+import org.apache.isis.core.progmodel.facets.object.mask.MaskEvaluator;
+import org.apache.isis.core.progmodel.facets.object.mask.MaskFacetAbstract;
-public class MaskFacetAnnotation extends MaskFacetAbstract {
+public class MaskFacetAnnotationForType extends MaskFacetAbstract {
private final MaskEvaluator evaluator;
- public MaskFacetAnnotation(final String outputMask, String inputMask, final FacetHolder holder) {
+ public MaskFacetAnnotationForType(final String outputMask, String inputMask, final FacetHolder holder) {
super(outputMask, holder);
evaluator = inputMask == null ? null : new MaskEvaluator(inputMask);
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthAnnotationFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.annotation;
+package org.apache.isis.core.progmodel.facets.object.maxlen.annotation;
import org.apache.isis.applib.annotation.MaxLength;
@@ -26,13 +26,13 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.propparam.validate.maxlength.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet;
-public class MaxLengthAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class MaxLengthAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
- public MaxLengthAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_PROPERTIES_AND_PARAMETERS);
+ public MaxLengthAnnotationForTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
}
/**
@@ -44,26 +44,7 @@ public class MaxLengthAnnotationFacetFac
FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
}
- @Override
- public void process(ProcessMethodContext processMethodContext) {
- final MaxLength annotation = getAnnotation(processMethodContext.getMethod(), MaxLength.class);
- FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
- }
-
- @Override
- public void processParams(ProcessParameterContext processParameterContext) {
- final java.lang.annotation.Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
-
- for (int j = 0; j < parameterAnnotations.length; j++) {
- if (parameterAnnotations[j] instanceof MaxLength) {
- final MaxLength annotation = (MaxLength) parameterAnnotations[j];
- FacetUtil.addFacet(create(annotation, processParameterContext.getFacetHolder()));
- return;
- }
- }
- }
-
private MaxLengthFacet create(final MaxLength annotation, final FacetHolder holder) {
- return annotation == null ? null : new MaxLengthFacetAnnotation(annotation.value(), holder);
+ return annotation == null ? null : new MaxLengthFacetAnnotationForType(annotation.value(), holder);
}
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthFacetAnnotation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthFacetAnnotation.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/validate/maxlength/annotation/MaxLengthFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java Mon Jan 17 18:22:58 2011
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.annotation;
+package org.apache.isis.core.progmodel.facets.object.maxlen.annotation;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.MaxLengthFacetAbstract;
+import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacetAbstract;
-public class MaxLengthFacetAnnotation extends MaxLengthFacetAbstract {
+public class MaxLengthFacetAnnotationForType extends MaxLengthFacetAbstract {
- public MaxLengthFacetAnnotation(final int value, final FacetHolder holder) {
+ public MaxLengthFacetAnnotationForType(final int value, final FacetHolder holder) {
super(value, holder);
}
Copied: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java (from r1059849, incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineAnnotationFacetFactory.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java?p2=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java&p1=incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineAnnotationFacetFactory.java&r1=1059849&r2=1060035&rev=1060035&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/propparam/multiline/annotation/MultiLineAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java Mon Jan 17 18:22:58 2011
@@ -18,22 +18,20 @@
*/
-package org.apache.isis.core.progmodel.facets.propparam.multiline.annotation;
+package org.apache.isis.core.progmodel.facets.object.multiline.annotation;
-import java.lang.annotation.Annotation;
-
import org.apache.isis.applib.annotation.MultiLine;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacet;
-public class MultiLineAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+public class MultiLineAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
- public MultiLineAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_PROPERTIES_AND_PARAMETERS);
+ public MultiLineAnnotationOnTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
}
/**
@@ -45,38 +43,8 @@ public class MultiLineAnnotationFacetFac
FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
}
- @Override
- public void process(ProcessMethodContext processMethodContext) {
- final Class<?> returnType = processMethodContext.getMethod().getReturnType();
- if (!isString(returnType)) {
- return;
- }
- final MultiLine annotation = getAnnotation(processMethodContext.getMethod(), MultiLine.class);
- FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
- }
-
- @Override
- public void processParams(ProcessParameterContext processParameterContext) {
- final Class<?>[] parameterTypes = processParameterContext.getMethod().getParameterTypes();
- if (processParameterContext.getParamNum() >= parameterTypes.length) {
- // ignore
- return;
- }
- if (!isString(parameterTypes[processParameterContext.getParamNum()])) {
- return;
- }
- final Annotation[] parameterAnnotations = getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
- for (int j = 0; j < parameterAnnotations.length; j++) {
- if (parameterAnnotations[j] instanceof MultiLine) {
- final MultiLine annotation = (MultiLine) parameterAnnotations[j];
- FacetUtil.addFacet(create(annotation, processParameterContext.getFacetHolder()));
- return;
- }
- }
- }
-
private MultiLineFacet create(final MultiLine annotation, final FacetHolder holder) {
- return (annotation != null) ? new MultiLineFacetAnnotation(annotation.numberOfLines(), annotation.preventWrapping(),
+ return (annotation != null) ? new MultiLineFacetAnnotationOnType(annotation.numberOfLines(), annotation.preventWrapping(),
holder) : null;
}