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 2016/06/16 10:42:38 UTC
[47/50] [abbrv] isis git commit: ISIS-1442: adds @Value to some of
the applib classes,
so that these don't get mixins added to them within the metamodel.
ISIS-1442: adds @Value to some of the applib classes, so that these don't get mixins added to them within the metamodel.
There is no functional effect to doing this; we never interact with these classes via the metamodel.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bff240ee
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bff240ee
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bff240ee
Branch: refs/heads/master
Commit: bff240eef05f4d5353cc33a4b70b3ea20893f593
Parents: 25149b0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 16 10:03:53 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 16 10:26:16 2016 +0100
----------------------------------------------------------------------
.../services/i18n/TranslatableString.java | 2 ++
.../isis/applib/services/iactn/Interaction.java | 2 ++
.../services/appfeat/ApplicationFeature.java | 28 --------------------
.../services/appfeat/ApplicationFeatureId.java | 2 ++
4 files changed, 6 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bff240ee/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
index 515a2b7..8cf6762 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
@@ -25,7 +25,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Value;
+@Value
public final class TranslatableString {
//region > tr, trn (factory methods); constructor
http://git-wip-us.apache.org/repos/asf/isis/blob/bff240ee/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index 25a1e45..d665088 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -31,6 +31,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
@@ -77,6 +78,7 @@ import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCal
* </p>
*
*/
+@Value
public class Interaction implements HasTransactionId {
//region > transactionId (property)
http://git-wip-us.apache.org/repos/asf/isis/blob/bff240ee/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
index 53a92ed..1eb2466 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
@@ -49,8 +49,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<ApplicationFeature> {}
- // //////////////////////////////////////
-
//region > constants
// using same value for all to neaten up rendering
@@ -59,8 +57,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
public static final int TYPICAL_LENGTH_MEMBER_NAME = 50;
//endregion
- // //////////////////////////////////////
-
//region > constructors
public ApplicationFeature() {
this(null);
@@ -70,8 +66,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > featureId
private ApplicationFeatureId featureId;
@@ -85,8 +79,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > memberType
private ApplicationMemberType memberType;
@@ -103,8 +95,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > returnTypeName (for: properties, collections, actions)
private String returnTypeName;
@@ -121,8 +111,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > contributed (for: properties, collections, actions)
private boolean contributed;
@@ -136,8 +124,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > derived (properties and collections)
private Boolean derived;
@@ -154,8 +140,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > propertyMaxLength (properties only)
private Integer propertyMaxLength;
@@ -172,8 +156,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > propertyTypicalLength (properties only)
private Integer propertyTypicalLength;
@@ -190,8 +172,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > actionSemantics (actions only)
private SemanticsOf actionSemantics;
@@ -208,8 +188,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > packages: Contents
private final SortedSet<ApplicationFeatureId> contents = Sets.newTreeSet();
@@ -227,8 +205,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > classes: Properties, Collections, Actions
private final SortedSet<ApplicationFeatureId> properties = Sets.newTreeSet();
@@ -277,8 +253,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > Functions
public static class Functions {
@@ -320,8 +294,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
//endregion
- // //////////////////////////////////////
-
//region > equals, hashCode, compareTo, toString
private final static String propertyNames = "featureId";
http://git-wip-us.apache.org/repos/asf/isis/blob/bff240ee/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
index cae36e6..5e9abde 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
@@ -33,6 +33,7 @@ import com.google.common.collect.Lists;
import com.google.common.io.BaseEncoding;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.TitleBuffer;
@@ -45,6 +46,7 @@ import org.apache.isis.applib.util.TitleBuffer;
* {@link #getPackageName() package name}, {@link #getClassName() class name} and {@link #getMemberName() member name}.
* </p>
*/
+@Value
public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, Serializable {