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 [8/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/immutable/annotation/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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/annotation/ImmutableFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,19 +17,16 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.immutable.annotation;
-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 ImmutableFacetAbstract {
-
- public ImmutableFacetAnnotation(final When value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class ImmutableFacetAnnotation extends ImmutableFacetAbstract {
+
+ public ImmutableFacetAnnotation(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/immutable/markerifc/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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableFacetMarkerInterface.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableFacetMarkerInterface.java Tue Apr 26 22:03:43 2011
@@ -17,19 +17,16 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.immutable.markerifc;
-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 ImmutableFacetAbstract {
-
- public ImmutableFacetMarkerInterface(final When value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class ImmutableFacetMarkerInterface extends ImmutableFacetAbstract {
+
+ public ImmutableFacetMarkerInterface(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/immutable/markerifc/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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableMarkerInterfacesFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/immutable/markerifc/ImmutableMarkerInterfacesFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.immutable.markerifc;
-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;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.When;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
-
-
-public class ImmutableMarkerInterfacesFacetFactory extends FacetFactoryAbstract {
-
- public ImmutableMarkerInterfacesFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- When when = When.forCorrespondingMarkerSubType(processClassContaxt.getCls());
- FacetUtil.addFacet(create(when, processClassContaxt.getFacetHolder()));
+
+public class ImmutableMarkerInterfacesFacetFactory extends FacetFactoryAbstract {
+
+ public ImmutableMarkerInterfacesFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final When when = When.forCorrespondingMarkerSubType(processClassContaxt.getCls());
+ FacetUtil.addFacet(create(when, processClassContaxt.getFacetHolder()));
+ }
+
+ private ImmutableFacet create(final When when, final FacetHolder holder) {
+ return when == null ? null : new ImmutableFacetMarkerInterface(when, holder);
}
- private ImmutableFacet create(final When when, final FacetHolder holder) {
- return when == null ? null : new ImmutableFacetMarkerInterface(when, holder);
- }
-
-}
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskEvaluator.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskEvaluator.java Tue Apr 26 22:03:43 2011
@@ -17,88 +17,88 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.mask;
-package org.apache.isis.core.progmodel.facets.object.mask;
-
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
-
-
-public class MaskEvaluator {
-
- interface Converter {
- void convert(String str, StringBuilder buf);
- }
-
- static class RegExConverter implements Converter {
- private final String mask;
- private final String regex;
-
- public RegExConverter(final String mask, final String regex) {
- this.mask = mask;
- this.regex = regex;
- }
-
- public String getMask() {
- return mask;
- }
-
- public String getRegex() {
- return regex;
- }
-
- public void convert(final String str, final StringBuilder buf) {
- final String convert = str.replace(mask, regex);
- if (!convert.equals(str)) {
- buf.append(convert);
- }
- }
- }
-
- @SuppressWarnings("serial")
- private static List<Converter> converters = new ArrayList<Converter>() {
- {
- add("#", "[0-9]");
- // add(".", "[\\" + DecimalFormatSymbols.getInstance().getDecimalSeparator()+"]");
- // add(",", "["+DecimalFormatSymbols.getInstance().getGroupingSeparator()+"]");
- add("&", "[A-Za-z]");
- add("?", "[A-Za-z]");
- add("A", "[A-Za-z0-9]");
- add("a", "[ A-Za-z0-9]");
- add("9", "[ 0-9]");
- add("U", "[A-Z]");
- add("L", "[a-z]");
-
- add(new Converter() {
- public void convert(final String str, final StringBuilder buf) {
- if (buf.length() == 0) {
- buf.append(str);
- }
- }
- });
- }
-
- public void add(final String mask, final String regex) {
- add(new RegExConverter(mask, regex));
- }
- };
-
- private final Pattern pattern;
-
- public MaskEvaluator(final String mask) {
- final StringBuilder buf = new StringBuilder();
- for (int i = 0; i < mask.length(); i++) {
- final String charAt = "" + mask.charAt(i);
- for (final Converter converter : converters) {
- converter.convert(charAt, buf);
- }
- }
- pattern = Pattern.compile(buf.toString());
- }
-
- public boolean evaluate(final String str) {
- return pattern.matcher(str).matches();
- }
-
-}
+
+public class MaskEvaluator {
+
+ interface Converter {
+ void convert(String str, StringBuilder buf);
+ }
+
+ static class RegExConverter implements Converter {
+ private final String mask;
+ private final String regex;
+
+ public RegExConverter(final String mask, final String regex) {
+ this.mask = mask;
+ this.regex = regex;
+ }
+
+ public String getMask() {
+ return mask;
+ }
+
+ public String getRegex() {
+ return regex;
+ }
+
+ @Override
+ public void convert(final String str, final StringBuilder buf) {
+ final String convert = str.replace(mask, regex);
+ if (!convert.equals(str)) {
+ buf.append(convert);
+ }
+ }
+ }
+
+ @SuppressWarnings("serial")
+ private static List<Converter> converters = new ArrayList<Converter>() {
+ {
+ add("#", "[0-9]");
+ // add(".", "[\\" + DecimalFormatSymbols.getInstance().getDecimalSeparator()+"]");
+ // add(",", "["+DecimalFormatSymbols.getInstance().getGroupingSeparator()+"]");
+ add("&", "[A-Za-z]");
+ add("?", "[A-Za-z]");
+ add("A", "[A-Za-z0-9]");
+ add("a", "[ A-Za-z0-9]");
+ add("9", "[ 0-9]");
+ add("U", "[A-Z]");
+ add("L", "[a-z]");
+
+ add(new Converter() {
+ @Override
+ public void convert(final String str, final StringBuilder buf) {
+ if (buf.length() == 0) {
+ buf.append(str);
+ }
+ }
+ });
+ }
+
+ public void add(final String mask, final String regex) {
+ add(new RegExConverter(mask, regex));
+ }
+ };
+
+ private final Pattern pattern;
+
+ public MaskEvaluator(final String mask) {
+ final StringBuilder buf = new StringBuilder();
+ for (int i = 0; i < mask.length(); i++) {
+ final String charAt = "" + mask.charAt(i);
+ for (final Converter converter : converters) {
+ converter.convert(charAt, buf);
+ }
+ }
+ pattern = Pattern.compile(buf.toString());
+ }
+
+ public boolean evaluate(final String str) {
+ return pattern.matcher(str).matches();
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/MaskFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.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;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -27,28 +26,28 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
import org.apache.isis.core.metamodel.interactions.ProposedHolder;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
-
-
-public abstract class MaskFacetAbstract extends SingleStringValueFacetAbstract implements MaskFacet {
-
- public static Class<? extends Facet> type() {
- return MaskFacet.class;
- }
-
- public MaskFacetAbstract(final String value, final FacetHolder holder) {
- super(type(), holder, value);
- }
-
- 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 (doesNotMatch(proposedArgument)) {
- return "'" + proposedArgument.titleString() + "' does not match the mask '" + value() + "'";
- }
- return null;
- }
-
-}
+
+public abstract class MaskFacetAbstract extends SingleStringValueFacetAbstract implements MaskFacet {
+
+ public static Class<? extends Facet> type() {
+ return MaskFacet.class;
+ }
+
+ public MaskFacetAbstract(final String value, final FacetHolder holder) {
+ super(type(), holder, value);
+ }
+
+ @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 (doesNotMatch(proposedArgument)) {
+ return "'" + proposedArgument.titleString() + "' does not match the mask '" + value() + "'";
+ }
+ return null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/TitleFacetBasedOnMask.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/TitleFacetBasedOnMask.java Tue Apr 26 22:03:43 2011
@@ -17,35 +17,35 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.mask;
-package org.apache.isis.core.progmodel.facets.object.mask;
-
import org.apache.isis.applib.adapters.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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 {
- private final MaskFacet maskFacet;
- private final TitleFacet underlyingTitleFacet;
-
- public TitleFacetBasedOnMask(final MaskFacet maskFacet, final TitleFacet underlyingTitleFacet) {
- super(maskFacet.getFacetHolder());
- this.maskFacet = maskFacet;
- this.underlyingTitleFacet = underlyingTitleFacet;
- }
-
- public String title(final ObjectAdapter object, Localization localization) {
- final String mask = maskFacet.value();
- TitleFacetUsingParser titleFacetUsingParser = (TitleFacetUsingParser) underlyingTitleFacet.getUnderlyingFacet();
- if (titleFacetUsingParser != null) {
- final String titleString = titleFacetUsingParser.title(object, mask);
- return titleString;
- } else {
- return underlyingTitleFacet.title(object, localization);
- }
- }
-
-}
+
+public class TitleFacetBasedOnMask extends TitleFacetAbstract {
+ private final MaskFacet maskFacet;
+ private final TitleFacet underlyingTitleFacet;
+
+ public TitleFacetBasedOnMask(final MaskFacet maskFacet, final TitleFacet underlyingTitleFacet) {
+ super(maskFacet.getFacetHolder());
+ this.maskFacet = maskFacet;
+ this.underlyingTitleFacet = underlyingTitleFacet;
+ }
+
+ @Override
+ public String title(final ObjectAdapter object, final Localization localization) {
+ final String mask = maskFacet.value();
+ final TitleFacetUsingParser titleFacetUsingParser =
+ (TitleFacetUsingParser) underlyingTitleFacet.getUnderlyingFacet();
+ if (titleFacetUsingParser != null) {
+ final String titleString = titleFacetUsingParser.title(object, mask);
+ return titleString;
+ } else {
+ return underlyingTitleFacet.title(object, localization);
+ }
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskAnnotationForTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
* under the License.
*/
-
-package org.apache.isis.core.progmodel.facets.object.mask.annotation;
-
+package org.apache.isis.core.progmodel.facets.object.mask.annotation;
import org.apache.isis.applib.annotation.Mask;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -27,26 +25,24 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.progmodel.facets.object.mask.MaskFacet;
-
-
-public class MaskAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public MaskAnnotationForTypeFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- /**
- * In readiness for supporting <tt>@Value</tt> in the future.
- */
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final Mask annotation = getAnnotation(processClassContaxt.getCls(), Mask.class);
- FacetUtil.addFacet(createMaskFacet(annotation, processClassContaxt.getFacetHolder()));
- }
+
+public class MaskAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public MaskAnnotationForTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ /**
+ * In readiness for supporting <tt>@Value</tt> in the future.
+ */
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final Mask annotation = getAnnotation(processClassContaxt.getCls(), Mask.class);
+ FacetUtil.addFacet(createMaskFacet(annotation, processClassContaxt.getFacetHolder()));
+ }
private MaskFacet createMaskFacet(final Mask annotation, final FacetHolder holder) {
return annotation != null ? new MaskFacetAnnotationForType(annotation.value(), null, holder) : null;
}
-
-}
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskFacetAnnotationForType.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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskFacetAnnotationForType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/mask/annotation/MaskFacetAnnotationForType.java Tue Apr 26 22:03:43 2011
@@ -17,37 +17,35 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.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.object.mask.MaskEvaluator;
import org.apache.isis.core.progmodel.facets.object.mask.MaskFacetAbstract;
-
-
-public class MaskFacetAnnotationForType extends MaskFacetAbstract {
- private final MaskEvaluator evaluator;
-
- public MaskFacetAnnotationForType(final String outputMask, String inputMask, final FacetHolder holder) {
- super(outputMask, holder);
- evaluator = inputMask == null ? null : new MaskEvaluator(inputMask);
- }
-
- public boolean doesNotMatch(final ObjectAdapter adapter) {
- if (evaluator == null) {
- return false;
- } else {
- if (adapter == null) {
- return false;
- }
- final Object object = adapter.getObject();
- if (object == null) {
- return false;
- }
- return !evaluator.evaluate(object.toString());
- }
- }
-
-}
-
+
+public class MaskFacetAnnotationForType extends MaskFacetAbstract {
+ private final MaskEvaluator evaluator;
+
+ public MaskFacetAnnotationForType(final String outputMask, final String inputMask, final FacetHolder holder) {
+ super(outputMask, holder);
+ evaluator = inputMask == null ? null : new MaskEvaluator(inputMask);
+ }
+
+ @Override
+ public boolean doesNotMatch(final ObjectAdapter adapter) {
+ if (evaluator == null) {
+ return false;
+ } else {
+ if (adapter == null) {
+ return false;
+ }
+ final Object object = adapter.getObject();
+ if (object == null) {
+ return false;
+ }
+ return !evaluator.evaluate(object.toString());
+ }
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthAnnotationForTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
* under the License.
*/
-
-package org.apache.isis.core.progmodel.facets.object.maxlen.annotation;
-
+package org.apache.isis.core.progmodel.facets.object.maxlen.annotation;
import org.apache.isis.applib.annotation.MaxLength;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -27,24 +25,23 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacet;
-
-
-public class MaxLengthAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public MaxLengthAnnotationForTypeFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- /**
- * In readiness for supporting <tt>@Value</tt> in the future.
- */
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final MaxLength annotation = getAnnotation(processClassContaxt.getCls(), MaxLength.class);
- FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
- }
-
- private MaxLengthFacet create(final MaxLength annotation, final FacetHolder holder) {
- return annotation == null ? null : new MaxLengthFacetAnnotationForType(annotation.value(), holder);
- }
-}
+
+public class MaxLengthAnnotationForTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public MaxLengthAnnotationForTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ /**
+ * In readiness for supporting <tt>@Value</tt> in the future.
+ */
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final MaxLength annotation = getAnnotation(processClassContaxt.getCls(), MaxLength.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private MaxLengthFacet create(final MaxLength annotation, final FacetHolder holder) {
+ return annotation == null ? null : new MaxLengthFacetAnnotationForType(annotation.value(), holder);
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/maxlen/annotation/MaxLengthFacetAnnotationForType.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.maxlen.annotation;
-package org.apache.isis.core.progmodel.facets.object.maxlen.annotation;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.propparam.maxlength.MaxLengthFacetAbstract;
-
-
-public class MaxLengthFacetAnnotationForType extends MaxLengthFacetAbstract {
-
- public MaxLengthFacetAnnotationForType(final int value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class MaxLengthFacetAnnotationForType extends MaxLengthFacetAbstract {
+
+ public MaxLengthFacetAnnotationForType(final int value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.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?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineAnnotationOnTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,35 +17,33 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.multiline.annotation;
-package org.apache.isis.core.progmodel.facets.object.multiline.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.multiline.MultiLineFacet;
-
-
-public class MultiLineAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public MultiLineAnnotationOnTypeFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- /**
- * In readiness for supporting <tt>@Value</tt> in the future.
- */
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final MultiLine annotation = getAnnotation(processClassContaxt.getCls(), MultiLine.class);
- FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
- }
-
- private MultiLineFacet create(final MultiLine annotation, final FacetHolder holder) {
- return (annotation != null) ? new MultiLineFacetAnnotationOnType(annotation.numberOfLines(), annotation.preventWrapping(),
- holder) : null;
- }
-
-}
+
+public class MultiLineAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public MultiLineAnnotationOnTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ /**
+ * In readiness for supporting <tt>@Value</tt> in the future.
+ */
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final MultiLine annotation = getAnnotation(processClassContaxt.getCls(), MultiLine.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private MultiLineFacet create(final MultiLine annotation, final FacetHolder holder) {
+ return (annotation != null) ? new MultiLineFacetAnnotationOnType(annotation.numberOfLines(),
+ annotation.preventWrapping(), holder) : null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineFacetAnnotationOnType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineFacetAnnotationOnType.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineFacetAnnotationOnType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/multiline/annotation/MultiLineFacetAnnotationOnType.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,16 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.multiline.annotation;
-package org.apache.isis.core.progmodel.facets.object.multiline.annotation;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.multiline.MultiLineFacetAbstract;
-
-
-public class MultiLineFacetAnnotationOnType extends MultiLineFacetAbstract {
-
- public MultiLineFacetAnnotationOnType(final int numberOfLines, final boolean preventWrapping, final FacetHolder holder) {
- super(numberOfLines, preventWrapping, holder);
- }
-
-}
-
+
+public class MultiLineFacetAnnotationOnType extends MultiLineFacetAbstract {
+
+ public MultiLineFacetAnnotationOnType(final int numberOfLines, final boolean preventWrapping,
+ final FacetHolder holder) {
+ super(numberOfLines, preventWrapping, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedAnnotationOnTypeFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.named.annotation;
-package org.apache.isis.core.progmodel.facets.object.named.annotation;
-
import org.apache.isis.applib.annotation.Named;
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.named.NamedFacet;
-
-
-public class NamedAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public NamedAnnotationOnTypeFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final Named annotation = getAnnotation(processClassContaxt.getCls(), Named.class);
- FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
- }
-
- private NamedFacet create(final Named annotation, final FacetHolder holder) {
- return annotation != null ? new NamedFacetAnnotationOnType(annotation.value(), holder) : null;
- }
-
-}
+
+public class NamedAnnotationOnTypeFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public NamedAnnotationOnTypeFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final Named annotation = getAnnotation(processClassContaxt.getCls(), Named.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private NamedFacet create(final Named annotation, final FacetHolder holder) {
+ return annotation != null ? new NamedFacetAnnotationOnType(annotation.value(), holder) : null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedFacetAnnotationOnType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedFacetAnnotationOnType.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedFacetAnnotationOnType.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/annotation/NamedFacetAnnotationOnType.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.named.annotation;
-package org.apache.isis.core.progmodel.facets.object.named.annotation;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.named.NamedFacetAbstract;
-
-
-public class NamedFacetAnnotationOnType extends NamedFacetAbstract {
-
- public NamedFacetAnnotationOnType(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class NamedFacetAnnotationOnType extends NamedFacetAbstract {
+
+ public NamedFacetAnnotationOnType(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/named/staticmethod/NamedFacetViaSingularNameStaticMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/staticmethod/NamedFacetViaSingularNameStaticMethod.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/staticmethod/NamedFacetViaSingularNameStaticMethod.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/staticmethod/NamedFacetViaSingularNameStaticMethod.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.named.staticmethod;
-package org.apache.isis.core.progmodel.facets.object.named.staticmethod;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.named.NamedFacetAbstract;
-
-
-public class NamedFacetViaSingularNameStaticMethod extends NamedFacetAbstract {
-
- public NamedFacetViaSingularNameStaticMethod(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class NamedFacetViaSingularNameStaticMethod extends NamedFacetAbstract {
+
+ public NamedFacetViaSingularNameStaticMethod(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/named/staticmethod/NamedFacetViaSingularNameStaticMethodFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/staticmethod/NamedFacetViaSingularNameStaticMethodFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/staticmethod/NamedFacetViaSingularNameStaticMethodFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/named/staticmethod/NamedFacetViaSingularNameStaticMethodFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.named.staticmethod;
-package org.apache.isis.core.progmodel.facets.object.named.staticmethod;
-
import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
@@ -30,26 +29,27 @@ 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.MethodPrefixConstants;
-
-
-public class NamedFacetViaSingularNameStaticMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
-
- private static final String[] PREFIXES = { MethodPrefixConstants.SINGULAR_NAME, };
-
- public NamedFacetViaSingularNameStaticMethodFacetFactory() {
- super(FeatureType.OBJECTS_ONLY, PREFIXES);
- }
-
- @Override
- public void process(ProcessClassContext processClassContext) {
+
+public class NamedFacetViaSingularNameStaticMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
+
+ private static final String[] PREFIXES = { MethodPrefixConstants.SINGULAR_NAME, };
+
+ public NamedFacetViaSingularNameStaticMethodFacetFactory() {
+ 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.CLASS, MethodPrefixConstants.SINGULAR_NAME, String.class, NO_PARAMETERS_TYPES);
- if (method != null) {
- final String name = (String) InvokeUtils.invokeStatic(method);
- processClassContext.removeMethod(method);
- FacetUtil.addFacet(new NamedFacetViaSingularNameStaticMethod(name, facetHolder));
- }
- }
-}
+
+ final Method method =
+ MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.SINGULAR_NAME, String.class,
+ NO_PARAMETERS_TYPES);
+ if (method != null) {
+ final String name = (String) InvokeUtils.invokeStatic(method);
+ processClassContext.removeMethod(method);
+ FacetUtil.addFacet(new NamedFacetViaSingularNameStaticMethod(name, facetHolder));
+ }
+ }
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,7 @@
* under the License.
*/
-
-package org.apache.isis.core.progmodel.facets.object.notpersistable;
-
+package org.apache.isis.core.progmodel.facets.object.notpersistable;
import org.apache.isis.applib.annotation.NotPersistable;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,28 +26,28 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy;
import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
-
-
-public class NotPersistableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public NotPersistableAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final NotPersistable annotation = getAnnotation(processClassContaxt.getCls(), NotPersistable.class);
- FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
- }
-
- @Override
- public void process(ProcessMethodContext processMethodContext) {
- final NotPersistable annotation = getAnnotation(processMethodContext.getMethod(), NotPersistable.class);
- FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
- }
-
- private NotPersistableFacet create(final NotPersistable annotation, final FacetHolder holder) {
- return annotation != null ? new NotPersistableFacetAnnotation(InitiatedBy.decodeBy(annotation.value()), holder) : null;
- }
-
-}
+
+public class NotPersistableAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public NotPersistableAnnotationFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final NotPersistable annotation = getAnnotation(processClassContaxt.getCls(), NotPersistable.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+ final NotPersistable annotation = getAnnotation(processMethodContext.getMethod(), NotPersistable.class);
+ FacetUtil.addFacet(create(annotation, processMethodContext.getFacetHolder()));
+ }
+
+ private NotPersistableFacet create(final NotPersistable annotation, final FacetHolder holder) {
+ return annotation != null ? new NotPersistableFacetAnnotation(InitiatedBy.decodeBy(annotation.value()), holder)
+ : null;
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.notpersistable;
-package org.apache.isis.core.progmodel.facets.object.notpersistable;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy;
-
-
-public class NotPersistableFacetAnnotation extends NotPersistableFacetImpl {
-
- public NotPersistableFacetAnnotation(final InitiatedBy value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class NotPersistableFacetAnnotation extends NotPersistableFacetImpl {
+
+ public NotPersistableFacetAnnotation(final InitiatedBy value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetImpl.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetImpl.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetImpl.java Tue Apr 26 22:03:43 2011
@@ -17,37 +17,35 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.notpersistable;
-package org.apache.isis.core.progmodel.facets.object.notpersistable;
-
import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy;
import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacetAbstract;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
-
-
-public class NotPersistableFacetImpl extends NotPersistableFacetAbstract {
-
- public NotPersistableFacetImpl(final InitiatedBy value, final FacetHolder holder) {
- super(value, holder);
- }
-
- public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
- final InitiatedBy initiatedBy = value();
- if (initiatedBy == InitiatedBy.USER_OR_PROGRAM) {
- // never persistable
- return "Not persistable";
- } else {
- if (ic.isProgrammatic()) {
- // enabled only in this case
- return null;
- } else {
- // not programmatic, ie by user, so disabled
- return "Not persistable";
- }
- }
- }
-
-}
-
+
+public class NotPersistableFacetImpl extends NotPersistableFacetAbstract {
+
+ public NotPersistableFacetImpl(final InitiatedBy value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+ @Override
+ public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
+ final InitiatedBy initiatedBy = value();
+ if (initiatedBy == InitiatedBy.USER_OR_PROGRAM) {
+ // never persistable
+ return "Not persistable";
+ } else {
+ if (ic.isProgrammatic()) {
+ // enabled only in this case
+ return null;
+ } else {
+ // not programmatic, ie by user, so disabled
+ return "Not persistable";
+ }
+ }
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetMarkerInterface.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetMarkerInterface.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetMarkerInterface.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableFacetMarkerInterface.java Tue Apr 26 22:03:43 2011
@@ -17,18 +17,15 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.notpersistable;
-package org.apache.isis.core.progmodel.facets.object.notpersistable;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy;
-
-
-public class NotPersistableFacetMarkerInterface extends NotPersistableFacetImpl {
-
- public NotPersistableFacetMarkerInterface(final InitiatedBy value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class NotPersistableFacetMarkerInterface extends NotPersistableFacetImpl {
+
+ public NotPersistableFacetMarkerInterface(final InitiatedBy value, final FacetHolder holder) {
+ super(value, holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfacesFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfacesFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfacesFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/notpersistable/NotPersistableMarkerInterfacesFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.notpersistable;
-package org.apache.isis.core.progmodel.facets.object.notpersistable;
-
import java.lang.reflect.Method;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,26 +27,25 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.notpersistable.InitiatedBy;
import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
-
-
-public class NotPersistableMarkerInterfacesFacetFactory extends FacetFactoryAbstract {
-
- public NotPersistableMarkerInterfacesFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- public boolean recognizes(final Method method) {
- return false;
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- InitiatedBy initiatedBy = InitiatedBy.forCorrespondingMarkerSubType(processClassContaxt.getCls());
- FacetUtil.addFacet(create(initiatedBy, processClassContaxt.getFacetHolder()));
+
+public class NotPersistableMarkerInterfacesFacetFactory extends FacetFactoryAbstract {
+
+ public NotPersistableMarkerInterfacesFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ public boolean recognizes(final Method method) {
+ return false;
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final InitiatedBy initiatedBy = InitiatedBy.forCorrespondingMarkerSubType(processClassContaxt.getCls());
+ FacetUtil.addFacet(create(initiatedBy, processClassContaxt.getFacetHolder()));
+ }
+
+ private NotPersistableFacet create(final InitiatedBy initiatedBy, final FacetHolder holder) {
+ return initiatedBy != null ? new NotPersistableFacetMarkerInterface(initiatedBy, holder) : null;
}
- private NotPersistableFacet create(final InitiatedBy initiatedBy, final FacetHolder holder) {
- return initiatedBy != null ? new NotPersistableFacetMarkerInterface(initiatedBy, holder) : null;
- }
-
-}
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.orderactions;
-package org.apache.isis.core.progmodel.facets.object.orderactions;
-
import org.apache.isis.applib.annotation.ActionOrder;
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.orderactions.ActionOrderFacet;
-
-
-public class ActionOrderAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public ActionOrderAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final ActionOrder annotation = getAnnotation(processClassContaxt.getCls(), ActionOrder.class);
- FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
- }
-
- private ActionOrderFacet create(final ActionOrder annotation, final FacetHolder facetHolder) {
- return annotation == null ? null : new ActionOrderFacetAnnotation(annotation.value(), facetHolder);
- }
-
-}
+
+public class ActionOrderAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public ActionOrderAnnotationFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final ActionOrder annotation = getAnnotation(processClassContaxt.getCls(), ActionOrder.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private ActionOrderFacet create(final ActionOrder annotation, final FacetHolder facetHolder) {
+ return annotation == null ? null : new ActionOrderFacetAnnotation(annotation.value(), facetHolder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,23 +17,21 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.orderactions;
-package org.apache.isis.core.progmodel.facets.object.orderactions;
-
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.orderactions.ActionOrderFacet;
-
-
-public abstract class ActionOrderFacetAbstract extends SingleStringValueFacetAbstract implements ActionOrderFacet {
-
- public static Class<? extends Facet> type() {
- return ActionOrderFacet.class;
- }
-
- public ActionOrderFacetAbstract(final String value, final FacetHolder holder) {
- super(type(), holder, value);
- }
-
-}
+
+public abstract class ActionOrderFacetAbstract extends SingleStringValueFacetAbstract implements ActionOrderFacet {
+
+ public static Class<? extends Facet> type() {
+ return ActionOrderFacet.class;
+ }
+
+ public ActionOrderFacetAbstract(final String value, final FacetHolder holder) {
+ super(type(), holder, value);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderactions/ActionOrderFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,17 +17,14 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.orderactions;
-package org.apache.isis.core.progmodel.facets.object.orderactions;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class ActionOrderFacetAnnotation extends ActionOrderFacetAbstract {
-
- public ActionOrderFacetAnnotation(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class ActionOrderFacetAnnotation extends ActionOrderFacetAbstract {
+
+ public ActionOrderFacetAnnotation(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/orderfields/FieldOrderAnnotationFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderAnnotationFacetFactory.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderAnnotationFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderAnnotationFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,31 +17,29 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.orderfields;
-package org.apache.isis.core.progmodel.facets.object.orderfields;
-
import org.apache.isis.applib.annotation.FieldOrder;
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.orderfields.FieldOrderFacet;
-
-
-public class FieldOrderAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
-
- public FieldOrderAnnotationFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- final FieldOrder annotation = getAnnotation(processClassContaxt.getCls(), FieldOrder.class);
- FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
- }
-
- private FieldOrderFacet create(final FieldOrder annotation, final FacetHolder holder) {
- return annotation == null ? null : new FieldOrderFacetAnnotation(annotation.value(), holder);
- }
-
-}
+
+public class FieldOrderAnnotationFacetFactory extends AnnotationBasedFacetFactoryAbstract {
+
+ public FieldOrderAnnotationFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessClassContext processClassContaxt) {
+ final FieldOrder annotation = getAnnotation(processClassContaxt.getCls(), FieldOrder.class);
+ FacetUtil.addFacet(create(annotation, processClassContaxt.getFacetHolder()));
+ }
+
+ private FieldOrderFacet create(final FieldOrder annotation, final FacetHolder holder) {
+ return annotation == null ? null : new FieldOrderFacetAnnotation(annotation.value(), holder);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderFacetAbstract.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderFacetAbstract.java Tue Apr 26 22:03:43 2011
@@ -17,23 +17,21 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.orderfields;
-package org.apache.isis.core.progmodel.facets.object.orderfields;
-
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.orderfields.FieldOrderFacet;
-
-
-public abstract class FieldOrderFacetAbstract extends SingleStringValueFacetAbstract implements FieldOrderFacet {
-
- public static Class<? extends Facet> type() {
- return FieldOrderFacet.class;
- }
-
- public FieldOrderFacetAbstract(final String value, final FacetHolder holder) {
- super(type(), holder, value);
- }
-
-}
+
+public abstract class FieldOrderFacetAbstract extends SingleStringValueFacetAbstract implements FieldOrderFacet {
+
+ public static Class<? extends Facet> type() {
+ return FieldOrderFacet.class;
+ }
+
+ public FieldOrderFacetAbstract(final String value, final FacetHolder holder) {
+ super(type(), holder, value);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderFacetAnnotation.java?rev=1096928&r1=1096927&r2=1096928&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/orderfields/FieldOrderFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,17 +17,14 @@
* under the License.
*/
+package org.apache.isis.core.progmodel.facets.object.orderfields;
-package org.apache.isis.core.progmodel.facets.object.orderfields;
-
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class FieldOrderFacetAnnotation extends FieldOrderFacetAbstract {
-
- public FieldOrderFacetAnnotation(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
-
+
+public class FieldOrderFacetAnnotation extends FieldOrderFacetAbstract {
+
+ public FieldOrderFacetAnnotation(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/parseable/ParseableFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetAbstract.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/ParseableFacetAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetAbstract.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 org.apache.isis.applib.adapters.Parser;
@@ -30,7 +29,6 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-
public abstract class ParseableFacetAbstract extends FacetAbstract implements ParseableFacet {
private final Class<?> parserClass;
@@ -38,19 +36,17 @@ public abstract class ParseableFacetAbst
// to delegate to
private final ParseableFacetUsingParser parseableFacetUsingParser;
- public ParseableFacetAbstract(
- final String candidateParserName,
- final Class<?> candidateParserClass,
- final FacetHolder holder,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final DependencyInjector dependencyInjector,
- final AdapterMap adapterManager) {
+ public ParseableFacetAbstract(final String candidateParserName, final Class<?> candidateParserClass,
+ final FacetHolder holder, final AuthenticationSessionProvider authenticationSessionProvider,
+ final DependencyInjector dependencyInjector, final AdapterMap adapterManager) {
super(ParseableFacet.class, holder, false);
-
+
this.parserClass = ParserUtil.parserOrNull(candidateParserClass, candidateParserName);
if (isValid()) {
- Parser parser = (Parser) ClassUtil.newInstance(parserClass, FacetHolder.class, holder);
- this.parseableFacetUsingParser = new ParseableFacetUsingParser(parser, holder, authenticationSessionProvider, dependencyInjector, adapterManager);
+ final Parser parser = (Parser) ClassUtil.newInstance(parserClass, FacetHolder.class, holder);
+ this.parseableFacetUsingParser =
+ new ParseableFacetUsingParser(parser, holder, authenticationSessionProvider, dependencyInjector,
+ adapterManager);
} else {
this.parseableFacetUsingParser = null;
}
@@ -85,4 +81,3 @@ public abstract class ParseableFacetAbst
return parseableFacetUsingParser.parseableTitle(existing);
}
}
-
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetAnnotation.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/ParseableFacetAnnotation.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetAnnotation.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* 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.annotation.Parseable;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -27,43 +26,35 @@ import org.apache.isis.core.commons.lang
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-
-
-public class ParseableFacetAnnotation extends ParseableFacetAbstract {
-
- private static String parserName(final Class<?> annotatedClass, final IsisConfiguration configuration) {
- final Parseable annotation = annotatedClass.getAnnotation(Parseable.class);
- final String parserName = annotation.parserName();
- if (!StringUtils.isNullOrEmpty(parserName)) {
- return parserName;
- }
- return ParserUtil.parserNameFromConfiguration(annotatedClass, configuration);
- }
-
- private static Class<?> parserClass(final Class<?> annotatedClass) {
- final Parseable annotation = annotatedClass.getAnnotation(Parseable.class);
- return annotation.parserClass();
- }
-
- public ParseableFacetAnnotation(
- final Class<?> annotatedClass,
- final IsisConfiguration configuration,
- final FacetHolder holder,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final AdapterMap adapterManager,
- final DependencyInjector dependencyInjector) {
- this(parserName(annotatedClass, configuration), parserClass(annotatedClass), holder, authenticationSessionProvider, adapterManager, dependencyInjector);
- }
-
- private ParseableFacetAnnotation(
- final String candidateParserName,
- final Class<?> candidateParserClass,
- final FacetHolder holder,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final AdapterMap adapterManager,
- final DependencyInjector dependencyInjector) {
- super(candidateParserName, candidateParserClass, holder, authenticationSessionProvider, dependencyInjector, adapterManager);
- }
-
-}
-
+
+public class ParseableFacetAnnotation extends ParseableFacetAbstract {
+
+ private static String parserName(final Class<?> annotatedClass, final IsisConfiguration configuration) {
+ final Parseable annotation = annotatedClass.getAnnotation(Parseable.class);
+ final String parserName = annotation.parserName();
+ if (!StringUtils.isNullOrEmpty(parserName)) {
+ return parserName;
+ }
+ return ParserUtil.parserNameFromConfiguration(annotatedClass, configuration);
+ }
+
+ private static Class<?> parserClass(final Class<?> annotatedClass) {
+ final Parseable annotation = annotatedClass.getAnnotation(Parseable.class);
+ return annotation.parserClass();
+ }
+
+ public ParseableFacetAnnotation(final Class<?> annotatedClass, final IsisConfiguration configuration,
+ final FacetHolder holder, final AuthenticationSessionProvider authenticationSessionProvider,
+ final AdapterMap adapterManager, final DependencyInjector dependencyInjector) {
+ this(parserName(annotatedClass, configuration), parserClass(annotatedClass), holder,
+ authenticationSessionProvider, adapterManager, dependencyInjector);
+ }
+
+ private ParseableFacetAnnotation(final String candidateParserName, final Class<?> candidateParserClass,
+ final FacetHolder holder, final AuthenticationSessionProvider authenticationSessionProvider,
+ final AdapterMap adapterManager, final DependencyInjector dependencyInjector) {
+ super(candidateParserName, candidateParserClass, holder, authenticationSessionProvider, dependencyInjector,
+ adapterManager);
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFactory.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/ParseableFacetFactory.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFactory.java Tue Apr 26 22:03:43 2011
@@ -17,9 +17,8 @@
* 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.annotation.Parseable;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
@@ -34,75 +33,81 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.AnnotationBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjectorAware;
-
-
-public class ParseableFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterMapAware, DependencyInjectorAware {
-
- private IsisConfiguration configuration;
- private AuthenticationSessionProvider authenticationSessionProvider;
+public class ParseableFacetFactory extends AnnotationBasedFacetFactoryAbstract implements IsisConfigurationAware,
+ AuthenticationSessionProviderAware, AdapterMapAware, DependencyInjectorAware {
+
+ private IsisConfiguration configuration;
+
+ private AuthenticationSessionProvider authenticationSessionProvider;
private AdapterMap adapterManager;
private DependencyInjector dependencyInjector;
-
- public ParseableFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(ProcessClassContext processClassContaxt) {
- FacetUtil.addFacet(create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder()));
- }
-
- private ParseableFacetAbstract create(final Class<?> cls, final FacetHolder holder) {
- final Parseable annotation = getAnnotation(cls, Parseable.class);
-
- // create from annotation, if present
- if (annotation != null) {
- final ParseableFacetAnnotation facet = new ParseableFacetAnnotation(cls, getIsisConfiguration(), holder, authenticationSessionProvider, adapterManager, dependencyInjector);
- if (facet.isValid()) {
- return facet;
- }
- }
-
- // otherwise, try to create from configuration, if present
- final String parserName = ParserUtil.parserNameFromConfiguration(cls, getIsisConfiguration());
- if (!StringUtils.isNullOrEmpty(parserName)) {
- final ParseableFacetFromConfiguration facet = new ParseableFacetFromConfiguration(parserName, holder, authenticationSessionProvider, dependencyInjector, adapterManager);
- if (facet.isValid()) {
- return facet;
- }
- }
-
- return null;
- }
-
-
- // ////////////////////////////////////////////////////////////////////
- // Dependencies (injected via setters since *Aware)
- // ////////////////////////////////////////////////////////////////////
-
- public IsisConfiguration getIsisConfiguration() {
- return configuration;
- }
- /**
- * Injected since {@link IsisConfigurationAware}.
- */
+
+ public ParseableFacetFactory() {
+ super(FeatureType.OBJECTS_ONLY);
+ }
+
@Override
- public void setIsisConfiguration(final IsisConfiguration configuration) {
- this.configuration = configuration;
- }
+ public void process(final ProcessClassContext processClassContaxt) {
+ FacetUtil.addFacet(create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder()));
+ }
+
+ private ParseableFacetAbstract create(final Class<?> cls, final FacetHolder holder) {
+ final Parseable annotation = getAnnotation(cls, Parseable.class);
+
+ // create from annotation, if present
+ if (annotation != null) {
+ final ParseableFacetAnnotation facet =
+ new ParseableFacetAnnotation(cls, getIsisConfiguration(), holder, authenticationSessionProvider,
+ adapterManager, dependencyInjector);
+ if (facet.isValid()) {
+ return facet;
+ }
+ }
+
+ // otherwise, try to create from configuration, if present
+ final String parserName = ParserUtil.parserNameFromConfiguration(cls, getIsisConfiguration());
+ if (!StringUtils.isNullOrEmpty(parserName)) {
+ final ParseableFacetFromConfiguration facet =
+ new ParseableFacetFromConfiguration(parserName, holder, authenticationSessionProvider,
+ dependencyInjector, adapterManager);
+ if (facet.isValid()) {
+ return facet;
+ }
+ }
+
+ return null;
+ }
+
+ // ////////////////////////////////////////////////////////////////////
+ // Dependencies (injected via setters since *Aware)
+ // ////////////////////////////////////////////////////////////////////
+
+ public IsisConfiguration getIsisConfiguration() {
+ return configuration;
+ }
+
+ /**
+ * Injected since {@link IsisConfigurationAware}.
+ */
+ @Override
+ public void setIsisConfiguration(final IsisConfiguration configuration) {
+ this.configuration = configuration;
+ }
@Override
- public void setAuthenticationSessionProvider(AuthenticationSessionProvider authenticationSessionProvider) {
+ public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
this.authenticationSessionProvider = authenticationSessionProvider;
}
+
@Override
- public void setAdapterMap(AdapterMap adapterManager) {
+ public void setAdapterMap(final AdapterMap adapterManager) {
this.adapterManager = adapterManager;
}
+
@Override
- public void setDependencyInjector(DependencyInjector dependencyInjector) {
+ public void setDependencyInjector(final DependencyInjector dependencyInjector) {
this.dependencyInjector = dependencyInjector;
- }
-
-}
+ }
+
+}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFromConfiguration.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/ParseableFacetFromConfiguration.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetFromConfiguration.java Tue Apr 26 22:03:43 2011
@@ -17,24 +17,18 @@
* 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.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;
-
-
-public class ParseableFacetFromConfiguration extends ParseableFacetAbstract {
-
- public ParseableFacetFromConfiguration(
- final String candidateParserName,
- final FacetHolder holder,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final DependencyInjector dependencyInjector,
- final AdapterMap adapterManager) {
- super(candidateParserName, null, holder, authenticationSessionProvider, dependencyInjector, adapterManager);
- }
-}
-
+
+public class ParseableFacetFromConfiguration extends ParseableFacetAbstract {
+
+ public ParseableFacetFromConfiguration(final String candidateParserName, final FacetHolder holder,
+ final AuthenticationSessionProvider authenticationSessionProvider, final DependencyInjector dependencyInjector,
+ final AdapterMap adapterManager) {
+ super(candidateParserName, null, holder, authenticationSessionProvider, dependencyInjector, adapterManager);
+ }
+}