[isis] 05/09: ISIS-1810: uncomments @Column on @Name annotation for simpleapp

[danhaywood]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit f2ce4c920be347c7ca7b64be0e49517f4e381281
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Tue Jul 17 07:14:45 2018 +0100

    ISIS-1810: uncomments @Column on @Name annotation for simpleapp
---
 .../main/java/domainapp/modules/simple/dom/impl/SimpleObject.java    | 3 +--
 .../src/main/java/domainapp/modules/simple/dom/types/Name.java       | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
 
b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index c52a832..cf208b9 100644
--- 
a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ 
b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -24,7 +24,6 @@ import javax.jdo.annotations.VersionStrategy;
 import com.google.common.collect.ComparisonChain;
 
 import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
 import org.apache.isis.applib.annotation.Auditing;
 import org.apache.isis.applib.annotation.CommandReification;
 import org.apache.isis.applib.annotation.DomainObject;
@@ -53,7 +52,7 @@ import lombok.AccessLevel;
 public class SimpleObject implements Comparable<SimpleObject> {
 
 
-    @javax.jdo.annotations.Column(allowsNull = "false", length = Name.MAX_LEN)
+    @javax.jdo.annotations.Column(allowsNull = "false")
     @lombok.Getter @lombok.Setter @lombok.NonNull
     @Title(prepend = "Object: ")
     @Name private String name;
diff --git 
a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
 
b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
index b2db377..254422d 100644
--- 
a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
+++ 
b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
@@ -5,13 +5,15 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import javax.jdo.annotations.Column;
+
 import org.apache.isis.applib.annotation.Parameter;
 import org.apache.isis.applib.annotation.ParameterLayout;
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.spec.AbstractSpecification2;
 
-// @Column(length = Name.MAX_LEN) // requires DN 5.x
+@Column(length = Name.MAX_LEN)
 @Property(mustSatisfy = Name.NoExclamationMarks.class, maxLength = 
Name.MAX_LEN)
 @Parameter(mustSatisfy = Name.NoExclamationMarks.class, maxLength = 
Name.MAX_LEN)
 @ParameterLayout(named = "Name")
@@ -20,6 +22,7 @@ import org.apache.isis.applib.spec.AbstractSpecification2;
 public @interface Name {
 
     int MAX_LEN = 40;
+
     class NoExclamationMarks extends AbstractSpecification2<String> {
 
         @Override