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 2015/10/09 19:00:33 UTC
[3/3] isis git commit: ISIS-1195: recreating simpleapp archetype
ISIS-1195: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/24c40bf9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/24c40bf9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/24c40bf9
Branch: refs/heads/master
Commit: 24c40bf9fb950121a2de90ba044417ca51520266
Parents: c5aeadd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 9 17:34:18 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 9 17:34:18 2015 +0100
----------------------------------------------------------------------
.../java/domainapp/dom/simple/SimpleObject.java | 48 ++++++--------------
.../integtests/translations.pot | 2 +-
.../projects/basic/archetype.properties | 2 +-
3 files changed, 15 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/24c40bf9/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
index 5c337c8..af19a3c 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
@@ -26,7 +26,7 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.IsisApplibModule;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.DomainObject;
@@ -35,7 +35,6 @@ import org.apache.isis.applib.annotation.Editing;
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.annotation.Title;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.util.ObjectContracts;
@@ -71,86 +70,65 @@ import org.apache.isis.applib.util.ObjectContracts;
)
public class SimpleObject implements Comparable<SimpleObject> {
+ public static final int NAME_LENGTH = 40;
- //region > identificatiom
public TranslatableString title() {
return TranslatableString.tr("Object: {name}", "name", getName());
}
- //endregion
- //region > name (property)
- private String name;
-
- @javax.jdo.annotations.Column(allowsNull="false", length = 40)
- @Title(sequence="1")
+ public static class NameDomainEvent extends IsisApplibModule.PropertyDomainEvent<SimpleObject,String> {}
+ @javax.jdo.annotations.Column(
+ allowsNull="false",
+ length = NAME_LENGTH
+ )
@Property(
editing = Editing.DISABLED
)
+ private String name;
public String getName() {
return name;
}
-
public void setName(final String name) {
this.name = name;
}
- // endregion
-
- //region > updateName (action)
-
- public static class UpdateNameDomainEvent extends ActionDomainEvent<SimpleObject> {
- public UpdateNameDomainEvent(final SimpleObject source, final Identifier identifier, final Object... arguments) {
- super(source, identifier, arguments);
- }
- }
+ public static class UpdateNameDomainEvent extends ActionDomainEvent<SimpleObject> {}
@Action(
domainEvent = UpdateNameDomainEvent.class
)
public SimpleObject updateName(
- @Parameter(maxLength = 40)
+ @Parameter(maxLength = NAME_LENGTH)
@ParameterLayout(named = "New name")
final String name) {
setName(name);
return this;
}
-
public String default0UpdateName() {
return getName();
}
-
public TranslatableString validateUpdateName(final String name) {
return name.contains("!")? TranslatableString.tr("Exclamation mark is not allowed"): null;
}
- //endregion
- //region > version (derived property)
-// public Long getVersionSequence() {
-// return (Long) JDOHelper.getVersion(this);
-// }
+ /**
+ * version (derived property)
+ */
public java.sql.Timestamp getVersionSequence() {
return (java.sql.Timestamp) JDOHelper.getVersion(this);
}
- //endregion
- //region > compareTo
@Override
public int compareTo(final SimpleObject other) {
return ObjectContracts.compare(this, other, "name");
}
- //endregion
-
- //region > injected services
@javax.inject.Inject
@SuppressWarnings("unused")
private DomainObjectContainer container;
- //endregion
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/24c40bf9/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot
index 5198559..37c02a4 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot
@@ -4,7 +4,7 @@
#
# .pot file
#
-# generated at: 2015-10-08 22:52:08
+# generated at: 2015-10-09 17:20:47
# generated by: TranslationServicePo
#
# Translate this file to each required language and place in WEB-INF, eg:
http://git-wip-us.apache.org/repos/asf/isis/blob/24c40bf9/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index 15a62fa..783d295 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Thu Oct 08 23:36:39 BST 2015
+#Fri Oct 09 17:34:13 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it