[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated: ISIS-1742: un-deprecated @MemberGroupLayout

[da...@apache.org]

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

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/dev/2.0.0/ISIS-1742-remove-deprecations by this push:
     new ebb7fbf  ISIS-1742: un-deprecated @MemberGroupLayout
ebb7fbf is described below

commit ebb7fbf26d4f5f30b6fe64a8a671875788955108
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Oct 4 04:39:29 2017 +0100

    ISIS-1742: un-deprecated @MemberGroupLayout
---
 .../src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc      | 7 -------
 .../java/org/apache/isis/applib/annotation/MemberGroupLayout.java  | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
index 575e019..c9e01ba 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
@@ -116,13 +116,6 @@ Actions can still be invoked.
 |UI
 |Yes
 
-|@MemberGroupLayout`
-|Grouping of properties into groups, and organizing of properties, collections into columns.
-|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[dynamic `.layout.xml`] files
-|UI
-|Yes
-
-
 |`@MustSatisfy`
 |Specify arbitrary specification constraints on a property or action parameter.
 |`#mustSatisfy()` attribute for xref:../rgant/rgant.adoc#_rgant-Property_mustSatisfy[`@Property`] or xref:../rgant/rgant.adoc#_rgant-Parameter_mustSatisfy[`@Parameter`]
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
index 5d6f224..96a5ce8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
@@ -43,16 +43,9 @@ import com.google.common.collect.Lists;
  * determined by the collection's {@link MemberOrder#sequence() MemberOrder.sequence} attribute
  * 
  * <p>
- * If both this annotation, {@link MemberGroupLayout}, and {@link MemberGroups} annotation
- * are present on an entity, then this one takes precedence.
- *
- * <p>
  *     The recommended alternative is to use the <code>Xxx.layout.xml</code> file, where <code>Xxx</code> is the domain object name.
  * </p>
- *
- * @deprecated
  */
-@Deprecated
 @Inherited
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].