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 2013/10/28 17:20:10 UTC
[2/3] git commit: ISIS-577: specify length of cols for PublishedEvent,
*Settings
ISIS-577: specify length of cols for PublishedEvent, *Settings
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6ad65ffb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6ad65ffb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6ad65ffb
Branch: refs/heads/master
Commit: 6ad65ffb9fcb2c0914f73b38a00f5cbae62b3dfa
Parents: b258ca1
Author: Dan Haywood <da...@apache.org>
Authored: Mon Oct 28 16:18:15 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Oct 28 16:18:15 2013 +0000
----------------------------------------------------------------------
.../jdo/applib/service/publish/PublishedEvent.java | 8 +++++---
.../service/settings/ApplicationSettingJdo.java | 10 ++++++----
.../jdo/applib/service/settings/UserSettingJdo.java | 16 +++++++++-------
3 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6ad65ffb/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java
index 1b0c65c..f641d12 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java
@@ -54,7 +54,7 @@ public class PublishedEvent {
private String title;
- @javax.jdo.annotations.Column(allowsNull="false")
+ @javax.jdo.annotations.Column(allowsNull="false", length=50)
@Title
@Hidden
public String getTitle() {
@@ -82,6 +82,7 @@ public class PublishedEvent {
private String id;
+ @javax.jdo.annotations.Column(length=32)
@javax.jdo.annotations.PrimaryKey
@MemberOrder(sequence = "2")
public String getId() {
@@ -99,6 +100,7 @@ public class PublishedEvent {
/**
* Programmatic because information also available in the {@link #getId() id}.
*/
+ @javax.jdo.annotations.Column(length=32)
@Programmatic
public String getTransactionId() {
return transactionId;
@@ -142,7 +144,7 @@ public class PublishedEvent {
private String user;
- @javax.jdo.annotations.Column(allowsNull="false")
+ @javax.jdo.annotations.Column(allowsNull="false", length=50)
@MemberOrder(sequence = "4")
public String getUser() {
return user;
@@ -156,7 +158,7 @@ public class PublishedEvent {
private State state;
- @javax.jdo.annotations.Column(allowsNull="false")
+ @javax.jdo.annotations.Column(allowsNull="false", length=20)
@MemberOrder(sequence = "5")
public State getState() {
return state;
http://git-wip-us.apache.org/repos/asf/isis/blob/6ad65ffb/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingJdo.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingJdo.java
index 8e66bf7..aa9a55a 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingJdo.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/ApplicationSettingJdo.java
@@ -44,6 +44,7 @@ import org.apache.isis.applib.services.settings.SettingType;
@Named("Application Setting")
public class ApplicationSettingJdo extends SettingAbstractJdo implements ApplicationSetting {
+ @javax.jdo.annotations.Column(length=128)
@javax.jdo.annotations.PrimaryKey
public String getKey() {
return super.getKey();
@@ -55,7 +56,8 @@ public class ApplicationSettingJdo extends SettingAbstractJdo implements Applica
// //////////////////////////////////////
- @Persistent
+ @javax.jdo.annotations.Column(length=254)
+ @javax.jdo.annotations.Persistent
@Override
public String getDescription() {
return super.getDescription();
@@ -68,7 +70,7 @@ public class ApplicationSettingJdo extends SettingAbstractJdo implements Applica
// //////////////////////////////////////
@javax.jdo.annotations.Column(allowsNull="false")
- @Persistent
+ @javax.jdo.annotations.Persistent
@Override
public String getValueRaw() {
return super.getValueRaw();
@@ -80,8 +82,8 @@ public class ApplicationSettingJdo extends SettingAbstractJdo implements Applica
// //////////////////////////////////////
- @javax.jdo.annotations.Column(allowsNull="false")
- @Persistent
+ @javax.jdo.annotations.Column(allowsNull="false", length=20)
+ @javax.jdo.annotations.Persistent
@Override
public SettingType getType() {
return super.getType();
http://git-wip-us.apache.org/repos/asf/isis/blob/6ad65ffb/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingJdo.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingJdo.java
index c46e7a4..128777d 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingJdo.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/settings/UserSettingJdo.java
@@ -61,8 +61,9 @@ public class UserSettingJdo extends SettingAbstractJdo implements UserSetting {
private String user;
+ @javax.jdo.annotations.Column(length=50)
+ @javax.jdo.annotations.PrimaryKey
@Title(sequence="5", append=": ")
- @PrimaryKey
@MemberOrder(sequence = "5")
public String getUser() {
return user;
@@ -74,8 +75,9 @@ public class UserSettingJdo extends SettingAbstractJdo implements UserSetting {
// //////////////////////////////////////
+ @javax.jdo.annotations.Column(length=128)
+ @javax.jdo.annotations.PrimaryKey
@Title(sequence="10")
- @PrimaryKey
@Override
public String getKey() {
return super.getKey();
@@ -87,7 +89,8 @@ public class UserSettingJdo extends SettingAbstractJdo implements UserSetting {
// //////////////////////////////////////
- @Persistent
+ @javax.jdo.annotations.Column(length=254)
+ @javax.jdo.annotations.Persistent
@Override
public String getDescription() {
return super.getDescription();
@@ -100,13 +103,12 @@ public class UserSettingJdo extends SettingAbstractJdo implements UserSetting {
// //////////////////////////////////////
@javax.jdo.annotations.Column(allowsNull="false")
+ @javax.jdo.annotations.Persistent
@Title(prepend=" = ", sequence="30")
- @Persistent
@Override
public String getValueRaw() {
return super.getValueRaw();
}
- @Persistent
@Override
public void setValueRaw(String valueAsRaw) {
super.setValueRaw(valueAsRaw);
@@ -114,8 +116,8 @@ public class UserSettingJdo extends SettingAbstractJdo implements UserSetting {
// //////////////////////////////////////
- @javax.jdo.annotations.Column(allowsNull="false")
- @Persistent
+ @javax.jdo.annotations.Column(allowsNull="false", length=20)
+ @javax.jdo.annotations.Persistent
@Override
public SettingType getType() {
return super.getType();