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 [9/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/object/parseable/ParseableFacetUsingParser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParser.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParser.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParser.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.object.parseable;
import java.util.IllegalFormatException;
@@ -42,25 +41,20 @@ import org.apache.isis.core.metamodel.in
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
/**
* TODO: need to fix genericity of using Parser<?>, for now suppressing warnings.
*/
public class ParseableFacetUsingParser extends FacetAbstract implements ParseableFacet {
@SuppressWarnings("unchecked")
- private final Parser parser;
+ private final Parser parser;
private final DependencyInjector dependencyInjector;
private final AdapterMap adapterMap;
private final AuthenticationSessionProvider authenticationSessionProvider;
- public ParseableFacetUsingParser(
- @SuppressWarnings("unchecked")
- final Parser parser,
- final FacetHolder holder,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final DependencyInjector dependencyInjector,
- final AdapterMap adapterManager) {
+ public ParseableFacetUsingParser(@SuppressWarnings("unchecked") final Parser parser, final FacetHolder holder,
+ final AuthenticationSessionProvider authenticationSessionProvider, final DependencyInjector dependencyInjector,
+ final AdapterMap adapterManager) {
super(ParseableFacet.class, holder, false);
this.parser = parser;
this.authenticationSessionProvider = authenticationSessionProvider;
@@ -76,68 +70,69 @@ public class ParseableFacetUsingParser e
@Override
public ObjectAdapter parseTextEntry(final ObjectAdapter contextAdapter, final String entry) {
- if (entry == null) {
+ if (entry == null) {
throw new IllegalArgumentException("An entry must be provided");
}
-
- // check string is valid
- // (eg pick up any @RegEx on value type)
- if (getFacetHolder().containsFacet(ValueFacet.class)) {
- ObjectAdapter entryAdapter = getAdapterMap().adapterFor(entry);
- ParseValueContext parseValueContext = new ParseValueContext(getAuthenticationSessionProvider().getAuthenticationSession(), InteractionInvocationMethod.BY_USER, contextAdapter, getIdentified().getIdentifier(), entryAdapter);
- validate(parseValueContext);
- }
- Object context = AdapterUtils.unwrap(contextAdapter);
+ // check string is valid
+ // (eg pick up any @RegEx on value type)
+ if (getFacetHolder().containsFacet(ValueFacet.class)) {
+ final ObjectAdapter entryAdapter = getAdapterMap().adapterFor(entry);
+ final ParseValueContext parseValueContext =
+ new ParseValueContext(getAuthenticationSessionProvider().getAuthenticationSession(),
+ InteractionInvocationMethod.BY_USER, contextAdapter, getIdentified().getIdentifier(), entryAdapter);
+ validate(parseValueContext);
+ }
+
+ final Object context = AdapterUtils.unwrap(contextAdapter);
getDependencyInjector().injectDependenciesInto(parser);
try {
- final Object parsed = parser.parseTextEntry(context, entry);
+ final Object parsed = parser.parseTextEntry(context, entry);
if (parsed == null) {
- return null;
- }
-
+ return null;
+ }
+
// check resultant object is also valid
// (eg pick up any validate() methods on it)
- ObjectAdapter adapter = getAdapterMap().adapterFor(parsed);
- ObjectSpecification specification = adapter.getSpecification();
- ObjectValidityContext validateContext =
- specification.createValidityInteractionContext(getAuthenticationSessionProvider().getAuthenticationSession(), InteractionInvocationMethod.BY_USER, adapter);
+ final ObjectAdapter adapter = getAdapterMap().adapterFor(parsed);
+ final ObjectSpecification specification = adapter.getSpecification();
+ final ObjectValidityContext validateContext =
+ specification.createValidityInteractionContext(getAuthenticationSessionProvider()
+ .getAuthenticationSession(), InteractionInvocationMethod.BY_USER, adapter);
validate(validateContext);
-
+
return adapter;
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
throw new TextEntryParseException(e.getMessage(), e);
- } catch (IllegalFormatException e) {
+ } catch (final IllegalFormatException e) {
throw new TextEntryParseException(e.getMessage(), e);
- } catch (ParsingException e) {
+ } catch (final ParsingException e) {
throw new TextEntryParseException(e.getMessage(), e);
}
- }
+ }
- private void validate(ValidityContext<?> validityContext) {
- InteractionResultSet resultSet = new InteractionResultSet();
- InteractionUtils.isValidResultSet(getFacetHolder(), validityContext, resultSet);
- if (resultSet.isVetoed()) {
- throw new IllegalArgumentException(resultSet.getInteractionResult().getReason());
- }
- }
+ private void validate(final ValidityContext<?> validityContext) {
+ final InteractionResultSet resultSet = new InteractionResultSet();
+ InteractionUtils.isValidResultSet(getFacetHolder(), validityContext, resultSet);
+ if (resultSet.isVetoed()) {
+ throw new IllegalArgumentException(resultSet.getInteractionResult().getReason());
+ }
+ }
@Override
@SuppressWarnings("unchecked")
- public String parseableTitle(final ObjectAdapter contextAdapter) {
- Object pojo = AdapterUtils.unwrap(contextAdapter);
-
+ public String parseableTitle(final ObjectAdapter contextAdapter) {
+ final Object pojo = AdapterUtils.unwrap(contextAdapter);
+
getDependencyInjector().injectDependenciesInto(parser);
- return parser.parseableTitleOf(pojo);
- }
+ return parser.parseableTitleOf(pojo);
+ }
-
-
- ///////////////////////////////////////////////////////////
+ // /////////////////////////////////////////////////////////
// Dependencies (from constructor)
- ///////////////////////////////////////////////////////////
+ // /////////////////////////////////////////////////////////
/**
* @return the dependencyInjector
@@ -152,7 +147,7 @@ public class ParseableFacetUsingParser e
public AuthenticationSessionProvider getAuthenticationSessionProvider() {
return authenticationSessionProvider;
}
-
+
/**
* @return the adapterManager
*/
@@ -160,4 +155,3 @@ public class ParseableFacetUsingParser e
return adapterMap;
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParserUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParserUtil.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParserUtil.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParserUtil.java Tue Apr 26 22:03:43 2011
@@ -17,35 +17,35 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.parseable;
-package org.apache.isis.core.progmodel.facets.object.parseable;
-
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.JavaClassUtils;
import org.apache.isis.core.commons.lang.StringUtils;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public final class ParserUtil {
-
- private ParserUtil() {}
-
- public static final String PARSER_NAME_KEY_PREFIX = "isis.reflector.java.facets.parser.";
- public static final String PARSER_NAME_KEY_SUFFIX = ".parserName";
-
- static String parserNameFromConfiguration(final Class<?> type, final IsisConfiguration configuration) {
- final String key = PARSER_NAME_KEY_PREFIX + type.getCanonicalName() + PARSER_NAME_KEY_SUFFIX;
- final String parserName = configuration.getString(key);
- return !StringUtils.isNullOrEmpty(parserName) ? parserName : null;
- }
-
- @SuppressWarnings("unchecked")
- public static Class<? extends Parser<?>> parserOrNull(final Class<?> candidateClass, final String classCandidateName) {
- final Class type = candidateClass != null ? JavaClassUtils.implementingClassOrNull(candidateClass.getName(), Parser.class, FacetHolder.class)
- : null;
- return type != null ? type : JavaClassUtils.implementingClassOrNull(classCandidateName, Parser.class, FacetHolder.class);
- }
-
-}
-
+
+public final class ParserUtil {
+
+ private ParserUtil() {
+ }
+
+ public static final String PARSER_NAME_KEY_PREFIX = "isis.reflector.java.facets.parser.";
+ public static final String PARSER_NAME_KEY_SUFFIX = ".parserName";
+
+ static String parserNameFromConfiguration(final Class<?> type, final IsisConfiguration configuration) {
+ final String key = PARSER_NAME_KEY_PREFIX + type.getCanonicalName() + PARSER_NAME_KEY_SUFFIX;
+ final String parserName = configuration.getString(key);
+ return !StringUtils.isNullOrEmpty(parserName) ? parserName : null;
+ }
+
+ @SuppressWarnings("unchecked")
+ public static Class<? extends Parser<?>> parserOrNull(final Class<?> candidateClass, final String classCandidateName) {
+ final Class type =
+ candidateClass != null ? JavaClassUtils.implementingClassOrNull(candidateClass.getName(), Parser.class,
+ FacetHolder.class) : null;
+ return type != null ? type : JavaClassUtils.implementingClassOrNull(classCandidateName, Parser.class,
+ FacetHolder.class);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.plural.annotation;
-package org.apache.isis.core.progmodel.facets.object.plural.annotation;
-
import org.apache.isis.applib.annotation.Plural;
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.object.plural.PluralFacet;
-
-
-public class PluralAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public PluralAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final Plural annotation = getAnnotation(processClassContaxt.getCls(), Plural.class);
- FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
- }
-
- private PluralFacet create(final Plural annotation, final FacetHolder holder) {
- return annotation == null ? null : new PluralFacetAnnotation(annotation.value(), holder);
- }
-
-}
+
+public class PluralAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public PluralAnnotationFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final Plural annotation = getAnnotation(processClassContaxt.getCls(), Plural.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private PluralFacet create(final Plural annotation, final FacetHolder holder) {
+ return annotation == null ? null : new PluralFacetAnnotation(annotation.value(), holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/annotation/PluralFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.plural.annotation;
-package org.apache.isis.core.progmodel.facets.object.plural.annotation;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacetAbstract;
-
-
-public class PluralFacetAnnotation extends PluralFacetAbstract {
-
- public PluralFacetAnnotation(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class PluralFacetAnnotation extends PluralFacetAbstract {
+
+ public PluralFacetAnnotation(final String value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/staticmethod/PluralFacetViaMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/staticmethod/PluralFacetViaMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/staticmethod/PluralFacetViaMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/staticmethod/PluralFacetViaMethod.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.plural.staticmethod;
-package org.apache.isis.core.progmodel.facets.object.plural.staticmethod;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacetAbstract;
-
-
-public class PluralFacetViaMethod extends PluralFacetAbstract {
-
- public PluralFacetViaMethod(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class PluralFacetViaMethod extends PluralFacetAbstract {
+
+ public PluralFacetViaMethod(final String value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/staticmethod/PluralMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/staticmethod/PluralMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/staticmethod/PluralMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/plural/staticmethod/PluralMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.plural.staticmethod;
-package org.apache.isis.core.progmodel.facets.object.plural.staticmethod;
-
import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
@@ -29,28 +28,28 @@ 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;
-
-
-public class PluralMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
-
- private static final String PLURAL_NAME = "pluralName";
-
- private static final String[] PREFIXES = { PLURAL_NAME, };
-
- public PluralMethodFacetFactory() {
- super(FeatureType.OBJECTS_ONLY, PREFIXES);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class PluralMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
+
+ private static final String PLURAL_NAME = "pluralName";
+
+ private static final String[] PREFIXES = { PLURAL_NAME, };
+
+ public PluralMethodFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY, PREFIXES);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> type = processClassContext.getCls();
final FacetHolder facetHolder = processClassContext.getFacetHolder();
-
- final Method method = MethodFinderUtils.findMethod(type, MethodScope.CLASS, PLURAL_NAME, String.class, NO_PARAMETERS_TYPES);
- if (method != null) {
- final String name = (String) InvokeUtils.invokeStatic(method);
- processClassContext.removeMethod(method);
+
+ final Method method =
+ MethodFinderUtils.findMethod(type, MethodScope.CLASS, PLURAL_NAME, String.class, NO_PARAMETERS_TYPES);
+ if (method != null) {
+ final String name = (String) InvokeUtils.invokeStatic(method);
+ processClassContext.removeMethod(method);
FacetUtil.addFacet(new PluralFacetViaMethod(name, facetHolder));
- }
- }
-}
+ }
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/RegExFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/RegExFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/RegExFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/RegExFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.regex;
-package org.apache.isis.core.progmodel.facets.object.regex;
-
import org.apache.isis.applib.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -27,53 +26,57 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.MultipleValueFacetAbstract;
import org.apache.isis.core.metamodel.interactions.ProposedHolder;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-
-public abstract class RegExFacetAbstract extends MultipleValueFacetAbstract implements RegExFacet {
-
- public static Class<? extends Facet> type() {
- return RegExFacet.class;
- }
-
- private final String validation;
- private final String format;
- private final boolean caseSensitive;
-
- public RegExFacetAbstract(final String validation, final String format, final boolean caseSensitive, final FacetHolder holder) {
- super(type(), holder);
- this.validation = validation;
- this.format = format;
- this.caseSensitive = caseSensitive;
- }
-
- public String validation() {
- return validation;
- }
-
- public String format() {
- return format;
- }
-
- public boolean caseSensitive() {
- return caseSensitive;
- }
-
- // //////////////////////////////////////////////////////////
-
- public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
- if (!(context instanceof ProposedHolder)) {
- return null;
- }
- final ProposedHolder proposedHolder = (ProposedHolder) context;
- final ObjectAdapter proposedArgument = proposedHolder.getProposed();
- if (proposedArgument == null) {
- return null;
- }
- final String titleString = proposedArgument.titleString();
- if (!doesNotMatch(titleString)) {
- return null;
- }
- return "Doesn't match pattern";
- }
-
-}
+
+public abstract class RegExFacetAbstract extends MultipleValueFacetAbstract implements RegExFacet {
+
+ public static Class<? extends Facet> type() {
+ return RegExFacet.class;
+ }
+
+ private final String validation;
+ private final String format;
+ private final boolean caseSensitive;
+
+ public RegExFacetAbstract(final String validation, final String format, final boolean caseSensitive,
+ final FacetHolder holder) {
+ super(type(), holder);
+ this.validation = validation;
+ this.format = format;
+ this.caseSensitive = caseSensitive;
+ }
+
+ @Override
+ public String validation() {
+ return validation;
+ }
+
+ @Override
+ public String format() {
+ return format;
+ }
+
+ @Override
+ public boolean caseSensitive() {
+ return caseSensitive;
+ }
+
+ // //////////////////////////////////////////////////////////
+
+ @Override
+ public String invalidates(final ValidityContext<? extends ValidityEvent> context) {
+ if (!(context instanceof ProposedHolder)) {
+ return null;
+ }
+ final ProposedHolder proposedHolder = (ProposedHolder) context;
+ final ObjectAdapter proposedArgument = proposedHolder.getProposed();
+ if (proposedArgument == null) {
+ return null;
+ }
+ final String titleString = proposedArgument.titleString();
+ if (!doesNotMatch(titleString)) {
+ return null;
+ }
+ return "Doesn't match pattern";
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/TitleFacetFormattedByRegex.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/TitleFacetFormattedByRegex.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/TitleFacetFormattedByRegex.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/TitleFacetFormattedByRegex.java Tue Apr 26 22:03:43 2011
@@ -17,25 +17,24 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.regex;
-package org.apache.isis.core.progmodel.facets.object.regex;
-
import org.apache.isis.applib.adapters.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
-
-
-public class TitleFacetFormattedByRegex extends TitleFacetAbstract {
-
- private final RegExFacet regexFacet;
-
- public TitleFacetFormattedByRegex(final RegExFacet regexFacet) {
- super(regexFacet.getFacetHolder());
- this.regexFacet = regexFacet;
- }
-
- public String title(final ObjectAdapter object, Localization localization) {
- return regexFacet.format(object.titleString());
- }
-
-}
+
+public class TitleFacetFormattedByRegex extends TitleFacetAbstract {
+
+ private final RegExFacet regexFacet;
+
+ public TitleFacetFormattedByRegex(final RegExFacet regexFacet) {
+ super(regexFacet.getFacetHolder());
+ this.regexFacet = regexFacet;
+ }
+
+ @Override
+ public String title(final ObjectAdapter object, final Localization localization) {
+ return regexFacet.format(object.titleString());
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForType.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForType.java Tue Apr 26 22:03:43 2011
@@ -17,48 +17,44 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.regex.annotation;
-package org.apache.isis.core.progmodel.facets.object.regex.annotation;
-
import java.util.regex.Pattern;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.object.regex.RegExFacetAbstract;
-
-
-public class RegExFacetAnnotationForType extends RegExFacetAbstract {
-
- private final Pattern pattern;
-
- public RegExFacetAnnotationForType(
- final String validation,
- final String format,
- final boolean caseSensitive,
- final FacetHolder holder) {
- super(validation, format, caseSensitive, holder);
- pattern = Pattern.compile(validation(), patternFlags());
- }
-
- public String format(final String text) {
- if (text == null) {
- return "<not a string>";
- }
- if (format() == null || format().length() == 0) {
- return text;
- }
- return pattern.matcher(text).replaceAll(format());
- }
-
- public boolean doesNotMatch(final String text) {
- if (text == null) {
- return true;
- }
- return !pattern.matcher(text).matches();
- }
-
- private int patternFlags() {
- return !caseSensitive() ? Pattern.CASE_INSENSITIVE : 0;
- }
-
-}
-
+
+public class RegExFacetAnnotationForType extends RegExFacetAbstract {
+
+ private final Pattern pattern;
+
+ public RegExFacetAnnotationForType(final String validation, final String format, final boolean caseSensitive,
+ final FacetHolder holder) {
+ super(validation, format, caseSensitive, holder);
+ pattern = Pattern.compile(validation(), patternFlags());
+ }
+
+ @Override
+ public String format(final String text) {
+ if (text == null) {
+ return "<not a string>";
+ }
+ if (format() == null || format().length() == 0) {
+ return text;
+ }
+ return pattern.matcher(text).replaceAll(format());
+ }
+
+ @Override
+ public boolean doesNotMatch(final String text) {
+ if (text == null) {
+ return true;
+ }
+ return !pattern.matcher(text).matches();
+ }
+
+ private int patternFlags() {
+ return !caseSensitive() ? Pattern.CASE_INSENSITIVE : 0;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/regex/annotation/RegExFacetAnnotationForTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,38 +17,36 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.regex.annotation;
-package org.apache.isis.core.progmodel.facets.object.regex.annotation;
-
import org.apache.isis.applib.annotation.RegEx;
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.progmodel.facets.object.regex.RegExFacet;
-
-
-public class RegExFacetAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public RegExFacetAnnotationForTypeFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final RegEx annotation = getAnnotation(processClassContaxt.getCls(), RegEx.class);
- FacetUtil.addFacet(createRegexFacet(annotation, processClassContaxt.getFacetHolder()));
- }
-
- private RegExFacet createRegexFacet(final RegEx annotation, final FacetHolder holder) {
- if (annotation == null) {
- return null;
- }
-
- final String validationExpression = annotation.validation();
- final boolean caseSensitive = annotation.caseSensitive();
- final String formatExpression = annotation.format();
-
- return new RegExFacetAnnotationForType(validationExpression, formatExpression, caseSensitive, holder);
- }
-}
+
+public class RegExFacetAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public RegExFacetAnnotationForTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final RegEx annotation = getAnnotation(processClassContaxt.getCls(), RegEx.class);
+ FacetUtil.addFacet(createRegexFacet(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private RegExFacet createRegexFacet(final RegEx annotation, final FacetHolder holder) {
+ if (annotation == null) {
+ return null;
+ }
+
+ final String validationExpression = annotation.validation();
+ final boolean caseSensitive = annotation.caseSensitive();
+ final String formatExpression = annotation.format();
+
+ return new RegExFacetAnnotationForType(validationExpression, formatExpression, caseSensitive, holder);
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetUsingParser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetUsingParser.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetUsingParser.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetUsingParser.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.object.title;
import org.apache.isis.applib.adapters.Localization;
@@ -28,13 +27,13 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-
public class TitleFacetUsingParser extends FacetAbstract implements TitleFacet {
private final Parser parser;
- private final DependencyInjector dependencyInjector;
-
- public TitleFacetUsingParser(final Parser parser, final FacetHolder holder, final DependencyInjector dependencyInjector) {
+ private final DependencyInjector dependencyInjector;
+
+ public TitleFacetUsingParser(final Parser parser, final FacetHolder holder,
+ final DependencyInjector dependencyInjector) {
super(TitleFacet.class, holder, false);
this.parser = parser;
this.dependencyInjector = dependencyInjector;
@@ -42,12 +41,12 @@ public class TitleFacetUsingParser exten
@Override
protected String toStringValues() {
- getDependencyInjector().injectDependenciesInto(parser);
+ getDependencyInjector().injectDependenciesInto(parser);
return parser.toString();
}
@Override
- public String title(final ObjectAdapter adapter, Localization localization) {
+ public String title(final ObjectAdapter adapter, final Localization localization) {
if (adapter == null) {
return null;
}
@@ -55,11 +54,11 @@ public class TitleFacetUsingParser exten
if (object == null) {
return null;
}
- getDependencyInjector().injectDependenciesInto(parser);
+ getDependencyInjector().injectDependenciesInto(parser);
return parser.displayTitleOf(object, localization);
}
- public String title(final ObjectAdapter adapter, String usingMask) {
+ public String title(final ObjectAdapter adapter, final String usingMask) {
if (adapter == null) {
return null;
}
@@ -71,11 +70,10 @@ public class TitleFacetUsingParser exten
return parser.displayTitleOf(object, usingMask);
}
-
- ////////////////////////////////////////////////////////
+ // //////////////////////////////////////////////////////
// Dependencies (from constructor)
- ////////////////////////////////////////////////////////
-
+ // //////////////////////////////////////////////////////
+
/**
* @return the dependencyInjector
*/
@@ -84,4 +82,3 @@ public class TitleFacetUsingParser exten
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.object.title;
import java.lang.reflect.Method;
@@ -32,42 +31,42 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
import org.apache.log4j.Logger;
-
public class TitleFacetViaTitleMethod extends TitleFacetAbstract implements ImperativeFacet {
private static final Logger LOG = Logger.getLogger(TitleFacetViaTitleMethod.class);
private final Method method;
- public TitleFacetViaTitleMethod(
- final Method method,
- final FacetHolder holder) {
+ public TitleFacetViaTitleMethod(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);
+ }
+
+ @Override
+ public boolean impliesResolve() {
+ return true;
}
- public boolean impliesResolve() {
- return true;
- }
-
- public boolean impliesObjectChanged() {
- return false;
- }
+ @Override
+ public boolean impliesObjectChanged() {
+ return false;
+ }
- public String title(final ObjectAdapter owningAdapter, Localization localization) {
+ @Override
+ public String title(final ObjectAdapter owningAdapter, final Localization localization) {
try {
- return (String) AdapterInvokeUtils.invoke(method, owningAdapter);
- } catch (RuntimeException ex) {
- LOG.warn("title failure", ex);
- return "Failed Title";
- }
+ return (String) AdapterInvokeUtils.invoke(method, owningAdapter);
+ } catch (final RuntimeException ex) {
+ LOG.warn("title failure", ex);
+ return "Failed Title";
+ }
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaToStringMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaToStringMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaToStringMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaToStringMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.object.title;
import java.lang.reflect.Method;
@@ -30,34 +29,35 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
-
public class TitleFacetViaToStringMethod extends TitleFacetAbstract implements ImperativeFacet {
private final Method method;
- public TitleFacetViaToStringMethod(
- final Method method,
- final FacetHolder holder) {
+ public TitleFacetViaToStringMethod(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 title(final ObjectAdapter object, Localization localization) {
+ @Override
+ public String title(final ObjectAdapter object, final Localization localization) {
return object.getObject().toString();
}
@@ -66,4 +66,3 @@ public class TitleFacetViaToStringMethod
return true;
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.title;
-package org.apache.isis.core.progmodel.facets.object.title;
-
import java.lang.reflect.Method;
import org.apache.isis.core.commons.lang.JavaClassUtils;
@@ -30,49 +29,46 @@ import org.apache.isis.core.metamodel.me
import org.apache.isis.core.progmodel.facets.MethodFinderUtils;
import org.apache.isis.core.progmodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.progmodel.facets.fallback.FallbackFacetFactory;
-
-
-public class TitleMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
-
- private static final String TO_STRING = "toString";
- private static final String TITLE = "title";
-
- private static final String[] PREFIXES = { TO_STRING, TITLE, };
-
- public TitleMethodFacetFactory() {
- super(FeatureType.OBJECTS_ONLY, PREFIXES);
- }
-
- /**
- * If no title or toString can be used then will use Facets provided by {@link FallbackFacetFactory}
- * instead.
- */
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class TitleMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
+
+ private static final String TO_STRING = "toString";
+ private static final String TITLE = "title";
+
+ private static final String[] PREFIXES = { TO_STRING, TITLE, };
+
+ public TitleMethodFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY, PREFIXES);
+ }
+
+ /**
+ * If no title or toString can be used then will use Facets provided by {@link FallbackFacetFactory} instead.
+ */
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> cls = processClassContext.getCls();
final FacetHolder facetHolder = processClassContext.getFacetHolder();
-
-
- Method method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, TITLE, String.class, null);
- if (method != null) {
- processClassContext.removeMethod(method);
+
+ Method method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, TITLE, String.class, null);
+ if (method != null) {
+ processClassContext.removeMethod(method);
FacetUtil.addFacet(new TitleFacetViaTitleMethod(method, facetHolder));
- return;
- }
-
- try {
- method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, TO_STRING, String.class, null);
- if (method == null) {
- return;
- }
- if (JavaClassUtils.isJavaClass(method.getDeclaringClass())) {
- return;
- }
- processClassContext.removeMethod(method);
- FacetUtil.addFacet(new TitleFacetViaToStringMethod(method, facetHolder));
-
- } catch (final Exception e) {
- return;
- }
- }
-}
+ return;
+ }
+
+ try {
+ method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, TO_STRING, String.class, null);
+ if (method == null) {
+ return;
+ }
+ if (JavaClassUtils.isJavaClass(method.getDeclaringClass())) {
+ return;
+ }
+ processClassContext.removeMethod(method);
+ FacetUtil.addFacet(new TitleFacetViaToStringMethod(method, facetHolder));
+
+ } catch (final Exception e) {
+ return;
+ }
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthAnnotationOnTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.typicallen.annotation;
-package org.apache.isis.core.progmodel.facets.object.typicallen.annotation;
-
import org.apache.isis.applib.annotation.TypicalLength;
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.typicallength.TypicalLengthFacet;
-
-
-public class TypicalLengthAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public TypicalLengthAnnotationOnTypeFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final TypicalLength annotation = getAnnotation(processClassContaxt.getCls(), TypicalLength.class);
- FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
- }
-
- private TypicalLengthFacet create(final TypicalLength annotation, final FacetHolder holder) {
- return annotation != null ? new TypicalLengthFacetAnnotationOnType(annotation.value(), holder) : null;
- }
-
-}
+
+public class TypicalLengthAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public TypicalLengthAnnotationOnTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final TypicalLength annotation = getAnnotation(processClassContaxt.getCls(), TypicalLength.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private TypicalLengthFacet create(final TypicalLength annotation, final FacetHolder holder) {
+ return annotation != null ? new TypicalLengthFacetAnnotationOnType(annotation.value(), holder) : null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/typicallen/annotation/TypicalLengthFacetAnnotationOnType.java Tue Apr 26 22:03:43 2011
@@ -17,26 +17,23 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.typicallen.annotation;
-package org.apache.isis.core.progmodel.facets.object.typicallen.annotation;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacetAbstract;
-
-
-public class TypicalLengthFacetAnnotationOnType extends TypicalLengthFacetAbstract {
-
- private final int value;
-
- public TypicalLengthFacetAnnotationOnType(final int value, final FacetHolder holder) {
- super(holder, false);
- this.value = value;
- }
-
- @Override
- public int value() {
- return value;
- }
-
-}
-
+
+public class TypicalLengthFacetAnnotationOnType extends TypicalLengthFacetAbstract {
+
+ private final int value;
+
+ public TypicalLengthFacetAnnotationOnType(final int value, final FacetHolder holder) {
+ super(holder, false);
+ this.value = value;
+ }
+
+ @Override
+ public int value() {
+ return value;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/ValidateObjectFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/ValidateObjectFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/ValidateObjectFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/ValidateObjectFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.validate;
-package org.apache.isis.core.progmodel.facets.object.validate;
-
import org.apache.isis.applib.events.ValidityEvent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -27,24 +26,24 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-
-public abstract class ValidateObjectFacetAbstract extends FacetAbstract implements ValidateObjectFacet {
-
- public static Class<? extends Facet> type() {
- return ValidateObjectFacet.class;
- }
-
- public ValidateObjectFacetAbstract(final FacetHolder holder) {
- super(type(), holder, false);
- }
-
- public String invalidates(final ValidityContext<? extends ValidityEvent> vc) {
- if (!(vc instanceof ObjectValidityContext)) {
- return null;
- }
- ObjectAdapter toValidate = vc.getTarget();
- return toValidate!=null? invalidReason(toValidate): null;
- }
-
-}
+
+public abstract class ValidateObjectFacetAbstract extends FacetAbstract implements ValidateObjectFacet {
+
+ public static Class<? extends Facet> type() {
+ return ValidateObjectFacet.class;
+ }
+
+ public ValidateObjectFacetAbstract(final FacetHolder holder) {
+ super(type(), holder, false);
+ }
+
+ @Override
+ public String invalidates(final ValidityContext<? extends ValidityEvent> vc) {
+ if (!(vc instanceof ObjectValidityContext)) {
+ return null;
+ }
+ final ObjectAdapter toValidate = vc.getTarget();
+ return toValidate != null ? invalidReason(toValidate) : null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/method/ValidateObjectFacetViaValidateMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/method/ValidateObjectFacetViaValidateMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/method/ValidateObjectFacetViaValidateMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/method/ValidateObjectFacetViaValidateMethod.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.object.validate.method;
import java.lang.reflect.Method;
@@ -30,7 +29,6 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.progmodel.facets.object.validate.ValidateObjectFacetAbstract;
-
public class ValidateObjectFacetViaValidateMethod extends ValidateObjectFacetAbstract implements ImperativeFacet {
private final Method method;
@@ -40,18 +38,22 @@ public class ValidateObjectFacetViaValid
this.method = method;
}
+ @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) {
return (String) AdapterInvokeUtils.invoke(method, owningAdapter);
}
@@ -62,4 +64,3 @@ public class ValidateObjectFacetViaValid
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/method/ValidateObjectViaValidateMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/method/ValidateObjectViaValidateMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/method/ValidateObjectViaValidateMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validate/method/ValidateObjectViaValidateMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.validate.method;
-package org.apache.isis.core.progmodel.facets.object.validate.method;
-
import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,27 +27,27 @@ 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;
-
-
-public class ValidateObjectViaValidateMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
-
- private static final String VALIDATE_PREFIX = "validate";
-
- private static final String[] PREFIXES = { VALIDATE_PREFIX, };
-
- public ValidateObjectViaValidateMethodFacetFactory() {
- super(FeatureType.OBJECTS_ONLY, PREFIXES);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class ValidateObjectViaValidateMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
+
+ private static final String VALIDATE_PREFIX = "validate";
+
+ private static final String[] PREFIXES = { VALIDATE_PREFIX, };
+
+ public ValidateObjectViaValidateMethodFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY, PREFIXES);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContext) {
final Class<?> cls = processClassContext.getCls();
final FacetHolder facetHolder = processClassContext.getFacetHolder();
-
- final Method method = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, VALIDATE_PREFIX, String.class, NO_PARAMETERS_TYPES);
+
+ final Method method =
+ MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, VALIDATE_PREFIX, String.class, NO_PARAMETERS_TYPES);
if (method != null) {
- FacetUtil.addFacet(new ValidateObjectFacetViaValidateMethod(method, facetHolder));
- processClassContext.removeMethod(method);
- }
- }
-}
+ FacetUtil.addFacet(new ValidateObjectFacetViaValidateMethod(method, facetHolder));
+ processClassContext.removeMethod(method);
+ }
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacet.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.validperspec;
-package org.apache.isis.core.progmodel.facets.object.validperspec;
-
import java.util.List;
import org.apache.isis.applib.events.ValidityEvent;
@@ -32,32 +31,33 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.interactions.ProposedHolder;
import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-public class MustSatisfySpecificationOnTypeFacet extends FacetAbstract implements ValidatingInteractionAdvisor {
-
- public static Class<? extends Facet> type() {
- return MustSatisfySpecificationOnTypeFacet.class;
- }
-
- private final List<Specification> specifications;
-
- public MustSatisfySpecificationOnTypeFacet(final List<Specification> specifications, final FacetHolder holder) {
- super(type(), holder, false);
- this.specifications = specifications;
- }
-
- public String invalidates(final ValidityContext<? extends ValidityEvent> validityContext) {
- if (!(validityContext instanceof ProposedHolder)) {
- return null;
- }
- ProposedHolder proposedHolder = (ProposedHolder) validityContext;
- final ObjectAdapter targetNO = proposedHolder.getProposed();
- final Object targetObject = targetNO.getObject();
- ReasonBuffer buf = new ReasonBuffer();
- for(Specification specification: specifications) {
- buf.append(specification.satisfies(targetObject));
- }
- return buf.getReason();
- }
-
-}
+
+public class MustSatisfySpecificationOnTypeFacet extends FacetAbstract implements ValidatingInteractionAdvisor {
+
+ public static Class<? extends Facet> type() {
+ return MustSatisfySpecificationOnTypeFacet.class;
+ }
+
+ private final List<Specification> specifications;
+
+ public MustSatisfySpecificationOnTypeFacet(final List<Specification> specifications, final FacetHolder holder) {
+ super(type(), holder, false);
+ this.specifications = specifications;
+ }
+
+ @Override
+ public String invalidates(final ValidityContext<? extends ValidityEvent> validityContext) {
+ if (!(validityContext instanceof ProposedHolder)) {
+ return null;
+ }
+ final ProposedHolder proposedHolder = (ProposedHolder) validityContext;
+ final ObjectAdapter targetNO = proposedHolder.getProposed();
+ final Object targetObject = targetNO.getObject();
+ final ReasonBuffer buf = new ReasonBuffer();
+ for (final Specification specification : specifications) {
+ buf.append(specification.satisfies(targetObject));
+ }
+ return buf.getReason();
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validperspec/MustSatisfySpecificationOnTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.validperspec;
-package org.apache.isis.core.progmodel.facets.object.validperspec;
-
import java.util.ArrayList;
import java.util.List;
@@ -30,48 +29,48 @@ 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;
-
-public class MustSatisfySpecificationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public MustSatisfySpecificationOnTypeFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- FacetUtil.addFacet(create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder()));
- }
-
- private Facet create(Class<?> clazz, FacetHolder holder) {
- return create(getAnnotation(clazz, MustSatisfy.class), holder);
- }
-
- private static Facet create(final MustSatisfy annotation, final FacetHolder holder) {
- if (annotation == null) {
- return null;
- }
- Class<?>[] values = annotation.value();
- List<Specification> specifications = new ArrayList<Specification>();
- for(Class<?> value: values) {
- Specification specification = newSpecificationElseNull(value);
- if (specification != null) {
- specifications.add(specification);
- }
- }
- return specifications.size() > 0 ? new MustSatisfySpecificationOnTypeFacet(specifications, holder) : null;
- }
-
- private static Specification newSpecificationElseNull(Class<?> value) {
- if (!(Specification.class.isAssignableFrom(value))) {
- return null;
- }
- try {
- return (Specification) value.newInstance();
- } catch (InstantiationException e) {
- return null;
- } catch (IllegalAccessException e) {
- return null;
- }
- }
-
-}
+
+public class MustSatisfySpecificationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public MustSatisfySpecificationOnTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ FacetUtil.addFacet(create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder()));
+ }
+
+ private Facet create(final Class<?> clazz, final FacetHolder holder) {
+ return create(getAnnotation(clazz, MustSatisfy.class), holder);
+ }
+
+ private static Facet create(final MustSatisfy annotation, final FacetHolder holder) {
+ if (annotation == null) {
+ return null;
+ }
+ final Class<?>[] values = annotation.value();
+ final List<Specification> specifications = new ArrayList<Specification>();
+ for (final Class<?> value : values) {
+ final Specification specification = newSpecificationElseNull(value);
+ if (specification != null) {
+ specifications.add(specification);
+ }
+ }
+ return specifications.size() > 0 ? new MustSatisfySpecificationOnTypeFacet(specifications, holder) : null;
+ }
+
+ private static Specification newSpecificationElseNull(final Class<?> value) {
+ if (!(Specification.class.isAssignableFrom(value))) {
+ return null;
+ }
+ try {
+ return (Specification) value.newInstance();
+ } catch (final InstantiationException e) {
+ return null;
+ } catch (final IllegalAccessException e) {
+ return null;
+ }
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacet.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacet.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacet.java Tue Apr 26 22:03:43 2011
@@ -17,27 +17,25 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.validprops;
-package org.apache.isis.core.progmodel.facets.object.validprops;
-
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
-
-
-/**
- * Object-level {@link ValidatingInteractionAdvisor validator} that ensures that all {@link MandatoryFacet
- * mandatory} properties are entered prior to persisting the object.
- */
-public interface ObjectValidPropertiesFacet extends Facet, ValidatingInteractionAdvisor {
-
- /**
- * The reason the object is invalid.
- *
- * <p>
- * . If the object is actually valid, should return <tt>null</tt>.
- */
- public String invalidReason(ObjectValidityContext context);
-
-}
+
+/**
+ * Object-level {@link ValidatingInteractionAdvisor validator} that ensures that all {@link MandatoryFacet mandatory}
+ * properties are entered prior to persisting the object.
+ */
+public interface ObjectValidPropertiesFacet extends Facet, ValidatingInteractionAdvisor {
+
+ /**
+ * The reason the object is invalid.
+ *
+ * <p>
+ * . If the object is actually valid, should return <tt>null</tt>.
+ */
+ public String invalidReason(ObjectValidityContext context);
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,33 +17,32 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.validprops;
-package org.apache.isis.core.progmodel.facets.object.validprops;
-
import org.apache.isis.applib.events.ValidityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-
-public abstract class ObjectValidPropertiesFacetAbstract extends FacetAbstract implements ObjectValidPropertiesFacet {
-
- public static Class<? extends Facet> type() {
- return ObjectValidPropertiesFacet.class;
- }
-
- public ObjectValidPropertiesFacetAbstract(final FacetHolder holder) {
- super(type(), holder, false);
- }
-
- public String invalidates(final ValidityContext<? extends ValidityEvent> ic) {
- if (!(ic instanceof ObjectValidityContext)) {
- return null;
- }
- final ObjectValidityContext validityContext = (ObjectValidityContext) ic;
- return invalidReason(validityContext);
- }
-
-}
+
+public abstract class ObjectValidPropertiesFacetAbstract extends FacetAbstract implements ObjectValidPropertiesFacet {
+
+ public static Class<? extends Facet> type() {
+ return ObjectValidPropertiesFacet.class;
+ }
+
+ public ObjectValidPropertiesFacetAbstract(final FacetHolder holder) {
+ super(type(), holder, false);
+ }
+
+ @Override
+ public String invalidates(final ValidityContext<? extends ValidityEvent> ic) {
+ if (!(ic instanceof ObjectValidityContext)) {
+ return null;
+ }
+ final ObjectValidityContext validityContext = (ObjectValidityContext) ic;
+ return invalidReason(validityContext);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,22 +17,20 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.validprops;
-package org.apache.isis.core.progmodel.facets.object.validprops;
-
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-
-
-public class ObjectValidPropertiesFacetFactory extends FacetFactoryAbstract {
-
- public ObjectValidPropertiesFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- FacetUtil.addFacet(new ObjectValidPropertiesFacetImpl(processClassContaxt.getFacetHolder()));
- }
-}
+
+public class ObjectValidPropertiesFacetFactory extends FacetFactoryAbstract {
+
+ public ObjectValidPropertiesFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ FacetUtil.addFacet(new ObjectValidPropertiesFacetImpl(processClassContaxt.getFacetHolder()));
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetImpl.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/validprops/ObjectValidPropertiesFacetImpl.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.object.validprops;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -27,18 +26,18 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-
public class ObjectValidPropertiesFacetImpl extends ObjectValidPropertiesFacetAbstract {
public ObjectValidPropertiesFacetImpl(final FacetHolder holder) {
super(holder);
}
+ @Override
public String invalidReason(final ObjectValidityContext context) {
final StringBuilder buf = new StringBuilder();
final ObjectAdapter adapter = context.getTarget();
for (final ObjectAssociation property : adapter.getSpecification().getAssociations(
- ObjectAssociationFilters.PROPERTIES)) {
+ ObjectAssociationFilters.PROPERTIES)) {
// ignore hidden properties
if (property.isVisible(context.getSession(), adapter).isVetoed()) {
continue;
@@ -63,4 +62,3 @@ public class ObjectValidPropertiesFacetI
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/EqualByContentFacetViaValueSemantics.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/EqualByContentFacetViaValueSemantics.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/EqualByContentFacetViaValueSemantics.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/EqualByContentFacetViaValueSemantics.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.value;
-package org.apache.isis.core.progmodel.facets.object.value;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ebc.EqualByContentFacetAbstract;
-
-
-public class EqualByContentFacetViaValueSemantics extends EqualByContentFacetAbstract {
-
- public EqualByContentFacetViaValueSemantics(final FacetHolder holder) {
- super(holder);
- }
-
-}
-
+
+public class EqualByContentFacetViaValueSemantics extends EqualByContentFacetAbstract {
+
+ public EqualByContentFacetViaValueSemantics(final FacetHolder holder) {
+ super(holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/ImmutableFacetViaValueSemantics.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/ImmutableFacetViaValueSemantics.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/ImmutableFacetViaValueSemantics.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/ImmutableFacetViaValueSemantics.java Tue Apr 26 22:03:43 2011
@@ -17,19 +17,16 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.value;
-package org.apache.isis.core.progmodel.facets.object.value;
-
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 ImmutableFacetViaValueSemantics extends ImmutableFacetAbstract {
-
- public ImmutableFacetViaValueSemantics(final FacetHolder holder) {
- super(When.ALWAYS, holder);
- }
-
-}
-
+
+public class ImmutableFacetViaValueSemantics extends ImmutableFacetAbstract {
+
+ public ImmutableFacetViaValueSemantics(final FacetHolder holder) {
+ super(When.ALWAYS, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/value/TypicalLengthFacetUsingParser.java Tue Apr 26 22:03:43 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.object.value;
import org.apache.isis.applib.adapters.Parser;
@@ -26,13 +25,13 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.typicallength.TypicalLengthFacet;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-
public class TypicalLengthFacetUsingParser extends FacetAbstract implements TypicalLengthFacet {
private final Parser<?> parser;
- private final DependencyInjector dependencyInjector;
-
- public TypicalLengthFacetUsingParser(final Parser<?> parser, final FacetHolder holder, final DependencyInjector dependencyInjector) {
+ private final DependencyInjector dependencyInjector;
+
+ public TypicalLengthFacetUsingParser(final Parser<?> parser, final FacetHolder holder,
+ final DependencyInjector dependencyInjector) {
super(TypicalLengthFacet.class, holder, false);
this.parser = parser;
this.dependencyInjector = dependencyInjector;
@@ -40,13 +39,13 @@ public class TypicalLengthFacetUsingPars
@Override
protected String toStringValues() {
- getDependencyInjector().injectDependenciesInto(parser);
+ getDependencyInjector().injectDependenciesInto(parser);
return parser.toString();
}
@Override
public int value() {
- getDependencyInjector().injectDependenciesInto(parser);
+ getDependencyInjector().injectDependenciesInto(parser);
return parser.typicalLength();
}
@@ -55,11 +54,9 @@ public class TypicalLengthFacetUsingPars
return "typicalLength=" + value();
}
-
- ////////////////////////////////////////////////////////
+ // //////////////////////////////////////////////////////
// Dependencies (from constructor)
- ////////////////////////////////////////////////////////
-
+ // //////////////////////////////////////////////////////
/**
* @return the dependencyInjector
@@ -69,4 +66,3 @@ public class TypicalLengthFacetUsingPars
}
}
-