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 2021/07/23 09:22:18 UTC
[isis] 01/02: ISIS-2819: in retrospect,
don't override the name in meta-annotations
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2819
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ee4c83b4200ed58ba5fb647d41d151da9c6eaf60
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 23 10:17:45 2021 +0100
ISIS-2819: in retrospect, don't override the name in meta-annotations
---
.../apache/isis/persistence/jdo/applib/types/AddressLine.java | 8 --------
.../apache/isis/persistence/jdo/applib/types/Description.java | 8 --------
.../org/apache/isis/persistence/jdo/applib/types/Email.java | 8 --------
.../org/apache/isis/persistence/jdo/applib/types/Fqcn.java | 8 --------
.../isis/persistence/jdo/applib/types/LogicalTypeName.java | 8 --------
.../org/apache/isis/persistence/jdo/applib/types/Money.java | 8 --------
.../org/apache/isis/persistence/jdo/applib/types/Name.java | 8 --------
.../org/apache/isis/persistence/jdo/applib/types/Notes.java | 8 --------
.../isis/persistence/jdo/applib/types/ObjectIdentifier.java | 8 --------
.../apache/isis/persistence/jdo/applib/types/Percentage.java | 8 --------
.../apache/isis/persistence/jdo/applib/types/PhoneNumber.java | 8 --------
.../apache/isis/persistence/jdo/applib/types/PostalCode.java | 7 -------
.../apache/isis/persistence/jdo/applib/types/ProperName.java | 8 --------
.../apache/isis/persistence/jdo/applib/types/Reference.java | 8 --------
.../org/apache/isis/persistence/jdo/applib/types/Title.java | 8 --------
.../apache/isis/persistence/jdo/applib/types/UrlTemplate.java | 8 --------
.../apache/isis/persistence/jdo/applib/types/Username.java | 8 --------
.../apache/isis/subdomains/base/applib/types/AddressLine.java | 7 -------
.../apache/isis/subdomains/base/applib/types/Description.java | 8 --------
.../org/apache/isis/subdomains/base/applib/types/Email.java | 11 -----------
.../org/apache/isis/subdomains/base/applib/types/Fqcn.java | 8 --------
.../isis/subdomains/base/applib/types/LogicalTypeName.java | 8 --------
.../org/apache/isis/subdomains/base/applib/types/Money.java | 8 --------
.../org/apache/isis/subdomains/base/applib/types/Name.java | 8 --------
.../org/apache/isis/subdomains/base/applib/types/Notes.java | 8 --------
.../isis/subdomains/base/applib/types/ObjectIdentifier.java | 8 --------
.../apache/isis/subdomains/base/applib/types/Percentage.java | 8 --------
.../apache/isis/subdomains/base/applib/types/PhoneNumber.java | 8 --------
.../apache/isis/subdomains/base/applib/types/PostalCode.java | 7 -------
.../apache/isis/subdomains/base/applib/types/ProperName.java | 8 --------
.../apache/isis/subdomains/base/applib/types/Reference.java | 8 --------
.../org/apache/isis/subdomains/base/applib/types/Title.java | 8 --------
.../apache/isis/subdomains/base/applib/types/UrlTemplate.java | 8 --------
.../apache/isis/subdomains/base/applib/types/Username.java | 8 --------
34 files changed, 272 deletions(-)
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/AddressLine.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/AddressLine.java
index b435ad6..263baf2 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/AddressLine.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/AddressLine.java
@@ -40,14 +40,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = AddressLine.NAMED
)
@Parameter(
maxLength = AddressLine.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = AddressLine.NAMED
)
@javax.jdo.annotations.Column(length = AddressLine.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -70,10 +68,4 @@ public @interface AddressLine {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Address Line";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default "";
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default "";
-
}
\ No newline at end of file
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Description.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Description.java
index 865424c..81e1df0 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Description.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Description.java
@@ -41,7 +41,6 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@PropertyLayout(
- named = Description.NAMED,
multiLine = Description.MULTI_LINE
)
@Parameter(
@@ -49,7 +48,6 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@ParameterLayout(
- named = Description.NAMED,
multiLine = Description.MULTI_LINE
)
@javax.jdo.annotations.Column(length = Description.MAX_LENGTH, allowsNull = "true")
@@ -73,12 +71,6 @@ public @interface Description {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Description";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
int MULTI_LINE = 1;
@AliasFor( annotation = PropertyLayout.class, attribute = "multiLine")
int propertyLayoutMultiLine() default MULTI_LINE;
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Email.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Email.java
index dd35749..0265a4e 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Email.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Email.java
@@ -43,7 +43,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = Email.REGEX_PATTERN_REPLACEMENT
)
@PropertyLayout(
- named = Email.NAMED
)
@Parameter(
maxLength = Email.MAX_LENGTH,
@@ -52,7 +51,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = Email.REGEX_PATTERN_REPLACEMENT
)
@ParameterLayout(
- named = Email.NAMED
)
@javax.jdo.annotations.Column(length = Email.MAX_LENGTH, allowsNull = "true")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -93,11 +91,5 @@ public @interface Email {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Email";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Fqcn.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Fqcn.java
index 4252f8a..16aa983 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Fqcn.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Fqcn.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = Fqcn.NAMED
)
@Parameter(
maxLength = Fqcn.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = Fqcn.NAMED
)
@javax.jdo.annotations.Column(length = Fqcn.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface Fqcn {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Fully qualified class name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/LogicalTypeName.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/LogicalTypeName.java
index fe00e71..e594808 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/LogicalTypeName.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/LogicalTypeName.java
@@ -48,14 +48,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = LogicalTypeName.NAMED
)
@Parameter(
maxLength = LogicalTypeName.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = LogicalTypeName.NAMED
)
@javax.jdo.annotations.Column(length = LogicalTypeName.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -78,10 +76,4 @@ public @interface LogicalTypeName {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Logical type name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Money.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Money.java
index 822c506..c018d14 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Money.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Money.java
@@ -40,13 +40,11 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@PropertyLayout(
- named = Money.NAMED
)
@Parameter(
optionality = Optionality.OPTIONAL
)
@ParameterLayout(
- named = Money.NAMED
)
@javax.validation.constraints.Digits(
integer = Money.INTEGER,
@@ -65,12 +63,6 @@ public @interface Money {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
String columnAllowsNull() default "true";
- String NAMED = "Amount";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
int INTEGER = 10;
@AliasFor( annotation = javax.validation.constraints.Digits.class, attribute = "integer")
int digitsInteger() default Money.INTEGER;
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Name.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Name.java
index f306745..d3375c7 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Name.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Name.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = Name.NAMED
)
@Parameter(
maxLength = Name.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = Name.NAMED
)
@javax.jdo.annotations.Column(length = Name.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface Name {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
\ No newline at end of file
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Notes.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Notes.java
index a8144cf..dcc148d 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Notes.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Notes.java
@@ -41,7 +41,6 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@PropertyLayout(
- named = Notes.NAMED,
multiLine = Notes.MULTI_LINE
)
@Parameter(
@@ -49,7 +48,6 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@ParameterLayout(
- named = Notes.NAMED,
multiLine = Notes.MULTI_LINE
)
@javax.jdo.annotations.Column(length = Notes.MAX_LENGTH, allowsNull = "true")
@@ -73,12 +71,6 @@ public @interface Notes {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Notes";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
int MULTI_LINE = 10;
@AliasFor( annotation = PropertyLayout.class, attribute = "multiLine")
int propertyLayoutMultiLine() default MULTI_LINE;
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/ObjectIdentifier.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/ObjectIdentifier.java
index e4200ad..7439b53 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/ObjectIdentifier.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/ObjectIdentifier.java
@@ -46,14 +46,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = ObjectIdentifier.NAMED
)
@Parameter(
maxLength = ObjectIdentifier.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = ObjectIdentifier.NAMED
)
@javax.jdo.annotations.Column(length = ObjectIdentifier.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -76,10 +74,4 @@ public @interface ObjectIdentifier {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Object identifier";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Percentage.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Percentage.java
index 305c910..7d9db80 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Percentage.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Percentage.java
@@ -40,13 +40,11 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@PropertyLayout(
- named = Percentage.NAMED
)
@Parameter(
optionality = Optionality.OPTIONAL
)
@ParameterLayout(
- named = Percentage.NAMED
)
@javax.validation.constraints.Digits(
integer = Percentage.INTEGER,
@@ -65,12 +63,6 @@ public @interface Percentage {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
String columnAllowsNull() default "true";
- String NAMED = "Percentage (%)";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
int INTEGER = 3;
@AliasFor( annotation = javax.validation.constraints.Digits.class, attribute = "integer")
int digitsInteger() default Money.INTEGER;
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/PhoneNumber.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/PhoneNumber.java
index fe67938..88e4204 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/PhoneNumber.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/PhoneNumber.java
@@ -43,7 +43,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = PhoneNumber.REGEX_PATTERN_REPLACEMENT
)
@PropertyLayout(
- named = PhoneNumber.NAMED
)
@Parameter(
maxLength = PhoneNumber.MAX_LENGTH,
@@ -52,7 +51,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = PhoneNumber.REGEX_PATTERN_REPLACEMENT
)
@ParameterLayout(
- named = PhoneNumber.NAMED
)
@javax.jdo.annotations.Column(length = PhoneNumber.MAX_LENGTH, allowsNull = "true")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -87,10 +85,4 @@ public @interface PhoneNumber {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Phone Number";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/PostalCode.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/PostalCode.java
index a89c622..9c4ab6c 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/PostalCode.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/PostalCode.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = PostalCode.NAMED
)
@Parameter(
maxLength = PostalCode.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = PostalCode.NAMED
)
@javax.jdo.annotations.Column(length = PostalCode.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,9 +69,4 @@ public @interface PostalCode {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Postal code";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
}
\ No newline at end of file
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/ProperName.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/ProperName.java
index e3ba407..1b62061 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/ProperName.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/ProperName.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = ProperName.NAMED
)
@Parameter(
maxLength = ProperName.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = ProperName.NAMED
)
@javax.jdo.annotations.Column(length = ProperName.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface ProperName {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Proper (or formal) name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Reference.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Reference.java
index c8ece86..533eebe 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Reference.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Reference.java
@@ -43,7 +43,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = Reference.REGEX_PATTERN_REPLACEMENT
)
@PropertyLayout(
- named = Reference.NAMED
)
@Parameter(
maxLength = Reference.MAX_LENGTH,
@@ -52,7 +51,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = Reference.REGEX_PATTERN_REPLACEMENT
)
@ParameterLayout(
- named = Reference.NAMED
)
@javax.jdo.annotations.Column(length = Reference.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -87,10 +85,4 @@ public @interface Reference {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Reference";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Title.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Title.java
index 55e75a4..e526d3b 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Title.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Title.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = Title.NAMED
)
@Parameter(
maxLength = Title.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = Title.NAMED
)
@javax.jdo.annotations.Column(length = Title.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface Title {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/UrlTemplate.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/UrlTemplate.java
index 6762df8..ed2f989 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/UrlTemplate.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/UrlTemplate.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = UrlTemplate.NAMED
)
@Parameter(
maxLength = UrlTemplate.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = UrlTemplate.NAMED
)
@javax.jdo.annotations.Column(length = UrlTemplate.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface UrlTemplate {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "URL Template";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Username.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Username.java
index 916cc35..88613bf 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Username.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/types/Username.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = Username.NAMED
)
@Parameter(
maxLength = Username.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = Username.NAMED
)
@javax.jdo.annotations.Column(length = Username.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface Username {
@AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
int columnLength() default MAX_LENGTH;
- String NAMED = "Name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/AddressLine.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/AddressLine.java
index c288234..5e03eff 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/AddressLine.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/AddressLine.java
@@ -40,14 +40,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = AddressLine.NAMED
)
@Parameter(
maxLength = AddressLine.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = AddressLine.NAMED
)
//@javax.jdo.annotations.Column(length = AddressLine.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -70,10 +68,5 @@ public @interface AddressLine {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Address Line";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default "";
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default "";
}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Description.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Description.java
index 82dafc9..de5baf3 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Description.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Description.java
@@ -41,7 +41,6 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@PropertyLayout(
- named = Description.NAMED,
multiLine = Description.MULTI_LINE
)
@Parameter(
@@ -49,7 +48,6 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@ParameterLayout(
- named = Description.NAMED,
multiLine = Description.MULTI_LINE
)
//@javax.jdo.annotations.Column(length = Description.MAX_LENGTH, allowsNull = "true")
@@ -73,12 +71,6 @@ public @interface Description {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Description";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
int MULTI_LINE = 1;
@AliasFor( annotation = PropertyLayout.class, attribute = "multiLine")
int propertyLayoutMultiLine() default MULTI_LINE;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Email.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Email.java
index c946b4d..f6120dc 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Email.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Email.java
@@ -43,7 +43,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = Email.REGEX_PATTERN_REPLACEMENT
)
@PropertyLayout(
- named = Email.NAMED
)
@Parameter(
maxLength = Email.MAX_LENGTH,
@@ -52,7 +51,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = Email.REGEX_PATTERN_REPLACEMENT
)
@ParameterLayout(
- named = Email.NAMED
)
//@javax.jdo.annotations.Column(length = Email.MAX_LENGTH, allowsNull = "true")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -93,13 +91,4 @@ public @interface Email {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Email";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
-
-
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Fqcn.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Fqcn.java
index 180efe8..645f302 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Fqcn.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Fqcn.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = Fqcn.NAMED
)
@Parameter(
maxLength = Fqcn.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = Fqcn.NAMED
)
//@javax.jdo.annotations.Column(length = Fqcn.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface Fqcn {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Fully qualified class name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/LogicalTypeName.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/LogicalTypeName.java
index 8e73bb2..c3807dd 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/LogicalTypeName.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/LogicalTypeName.java
@@ -48,14 +48,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = LogicalTypeName.NAMED
)
@Parameter(
maxLength = LogicalTypeName.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = LogicalTypeName.NAMED
)
//@javax.jdo.annotations.Column(length = LogicalTypeName.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -78,10 +76,4 @@ public @interface LogicalTypeName {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Logical type name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Money.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Money.java
index 1eb6687..585dd14 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Money.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Money.java
@@ -40,13 +40,11 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@PropertyLayout(
- named = Money.NAMED
)
@Parameter(
optionality = Optionality.OPTIONAL
)
@ParameterLayout(
- named = Money.NAMED
)
@javax.validation.constraints.Digits(
integer = Money.INTEGER,
@@ -65,12 +63,6 @@ public @interface Money {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
// String columnAllowsNull() default "true";
- String NAMED = "Amount";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
int INTEGER = 10;
@AliasFor( annotation = javax.validation.constraints.Digits.class, attribute = "integer")
int digitsInteger() default Money.INTEGER;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Name.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Name.java
index 75b720e..8da3a4d 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Name.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Name.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = Name.NAMED
)
@Parameter(
maxLength = Name.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = Name.NAMED
)
//@javax.jdo.annotations.Column(length = Name.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface Name {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Notes.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Notes.java
index 2ac053a..c3edb47 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Notes.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Notes.java
@@ -41,7 +41,6 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@PropertyLayout(
- named = Notes.NAMED,
multiLine = Notes.MULTI_LINE
)
@Parameter(
@@ -49,7 +48,6 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@ParameterLayout(
- named = Notes.NAMED,
multiLine = Notes.MULTI_LINE
)
//@javax.jdo.annotations.Column(length = Notes.MAX_LENGTH, allowsNull = "true")
@@ -73,12 +71,6 @@ public @interface Notes {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Notes";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
int MULTI_LINE = 10;
@AliasFor( annotation = PropertyLayout.class, attribute = "multiLine")
int propertyLayoutMultiLine() default MULTI_LINE;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ObjectIdentifier.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ObjectIdentifier.java
index 0625d71..ef30b9a 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ObjectIdentifier.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ObjectIdentifier.java
@@ -46,14 +46,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = ObjectIdentifier.NAMED
)
@Parameter(
maxLength = ObjectIdentifier.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = ObjectIdentifier.NAMED
)
//@javax.jdo.annotations.Column(length = ObjectIdentifier.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -76,10 +74,4 @@ public @interface ObjectIdentifier {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Object identifier";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Percentage.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Percentage.java
index 8c3f9a2..9e2d25d 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Percentage.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Percentage.java
@@ -40,13 +40,11 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.OPTIONAL
)
@PropertyLayout(
- named = Percentage.NAMED
)
@Parameter(
optionality = Optionality.OPTIONAL
)
@ParameterLayout(
- named = Percentage.NAMED
)
@javax.validation.constraints.Digits(
integer = Percentage.INTEGER,
@@ -65,12 +63,6 @@ public @interface Percentage {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "allowsNull")
// String columnAllowsNull() default "true";
- String NAMED = "Percentage (%)";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
int INTEGER = 3;
@AliasFor( annotation = javax.validation.constraints.Digits.class, attribute = "integer")
int digitsInteger() default Money.INTEGER;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PhoneNumber.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PhoneNumber.java
index 4d60225..bbe2986 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PhoneNumber.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PhoneNumber.java
@@ -43,7 +43,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = PhoneNumber.REGEX_PATTERN_REPLACEMENT
)
@PropertyLayout(
- named = PhoneNumber.NAMED
)
@Parameter(
maxLength = PhoneNumber.MAX_LENGTH,
@@ -52,7 +51,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = PhoneNumber.REGEX_PATTERN_REPLACEMENT
)
@ParameterLayout(
- named = PhoneNumber.NAMED
)
//@javax.jdo.annotations.Column(length = PhoneNumber.MAX_LENGTH, allowsNull = "true")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -87,10 +85,4 @@ public @interface PhoneNumber {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Phone Number";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PostalCode.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PostalCode.java
index 93edb87..d2ddb6b 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PostalCode.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PostalCode.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = PostalCode.NAMED
)
@Parameter(
maxLength = PostalCode.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = PostalCode.NAMED
)
//@javax.jdo.annotations.Column(length = PostalCode.MAX_LENGTH, allowsNull = "true")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,9 +69,4 @@ public @interface PostalCode {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Postal code";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ProperName.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ProperName.java
index b2573d8..a7fe91e 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ProperName.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ProperName.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = ProperName.NAMED
)
@Parameter(
maxLength = ProperName.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = ProperName.NAMED
)
//@javax.jdo.annotations.Column(length = ProperName.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface ProperName {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Proper (or formal) name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Reference.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Reference.java
index 64e610d..d9dcb34 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Reference.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Reference.java
@@ -43,7 +43,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = Reference.REGEX_PATTERN_REPLACEMENT
)
@PropertyLayout(
- named = Reference.NAMED
)
@Parameter(
maxLength = Reference.MAX_LENGTH,
@@ -52,7 +51,6 @@ import org.springframework.core.annotation.AliasFor;
regexPatternReplacement = Reference.REGEX_PATTERN_REPLACEMENT
)
@ParameterLayout(
- named = Reference.NAMED
)
//@javax.jdo.annotations.Column(length = Reference.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -87,10 +85,4 @@ public @interface Reference {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Reference";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Title.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Title.java
index 324d582..2cf5ab6 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Title.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Title.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = Title.NAMED
)
@Parameter(
maxLength = Title.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = Title.NAMED
)
//@javax.jdo.annotations.Column(length = Title.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface Title {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UrlTemplate.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UrlTemplate.java
index e30fad4..2a2faa1 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UrlTemplate.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UrlTemplate.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = UrlTemplate.NAMED
)
@Parameter(
maxLength = UrlTemplate.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = UrlTemplate.NAMED
)
//@javax.jdo.annotations.Column(length = UrlTemplate.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface UrlTemplate {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "URL Template";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Username.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Username.java
index 1c64f60..ce31b05 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Username.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/Username.java
@@ -41,14 +41,12 @@ import org.springframework.core.annotation.AliasFor;
optionality = Optionality.MANDATORY
)
@PropertyLayout(
- named = Username.NAMED
)
@Parameter(
maxLength = Username.MAX_LENGTH,
optionality = Optionality.MANDATORY
)
@ParameterLayout(
- named = Username.NAMED
)
//@javax.jdo.annotations.Column(length = Username.MAX_LENGTH, allowsNull = "false")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@@ -71,10 +69,4 @@ public @interface Username {
// @AliasFor( annotation = javax.jdo.annotations.Column.class, attribute = "length")
// int columnLength() default MAX_LENGTH;
- String NAMED = "Name";
- @AliasFor( annotation = PropertyLayout.class, attribute = "named")
- String propertyLayoutNamed() default NAMED;
- @AliasFor( annotation = ParameterLayout.class, attribute = "named")
- String parameterLayoutNamed() default NAMED;
-
}