You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/08/27 14:30:22 UTC
[isis] 01/05: ISIS-1841: moving MemberGroupLayout to -legacy
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7dd440add54569b30b206979cbd326952cff6999
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Aug 27 13:58:15 2018 +0200
ISIS-1841: moving MemberGroupLayout to -legacy
---
.../main/java/org/apache/isis/applib/services/grid/GridService.java | 6 ++----
.../java/org/apache/isis/applib/services/layout/LayoutService.java | 4 ++--
.../java/org/apache/isis/applib/annotation/MemberGroupLayout.java | 1 +
.../isis/applib/annotation/MemberGroupLayoutColumnSpansTest.java | 0
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java b/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
index 02125ab..249a5bb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
@@ -19,7 +19,6 @@ package org.apache.isis.applib.services.grid;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.PropertyLayout;
@@ -63,7 +62,7 @@ public interface GridService {
*
* <p>
* If a "normalized" grid is persisted as the <code>layout.xml</code>, then the expectation is that
- * the {@link MemberOrder} and {@link MemberGroupLayout} annotations can be removed from the domain class
+ * the {@link MemberOrder} annotation can be removed from the domain class
* because the binding of properties/collections/actions will be within the XML. However, the layout
* annotations ({@link DomainObjectLayout}, {@link ActionLayout}, {@link PropertyLayout} and
* {@link CollectionLayout}) (if present) will continue to be used to provide additional layout metadata. Of
@@ -81,7 +80,7 @@ public interface GridService {
*
* <p>
* If a "completed" grid is persisted as the <code>layout.xml</code>, then there should be no need
- * for any of the layout annotations, nor the {@link MemberOrder} or {@link MemberGroupLayout} annotations,
+ * for any of the layout annotations, nor the {@link MemberOrder} annotations,
* to be required in the domain class itself.
* </p>
*/
@@ -95,7 +94,6 @@ public interface GridService {
* If a "minimal" grid is persisted as the <code>layout.xml</code>, then the expectation is that
* most of the layout annotations ({@link DomainObjectLayout}, {@link ActionLayout}, {@link PropertyLayout},
* {@link CollectionLayout}, but also {@link MemberOrder}) will still be retained in the domain class code.
- * The only annotation that can be removed and is no longer used {@link MemberGroupLayout}.
* </p>
*
* @param grid
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService.java
index 992905b..aca743e 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutService.java
@@ -16,9 +16,9 @@
*/
package org.apache.isis.applib.services.layout;
-import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.layout.grid.Grid;
public interface LayoutService {
@@ -49,7 +49,7 @@ public interface LayoutService {
* and unused/empty regions are removed/trimmed.
* <p/>
* <p>
- * It should be possible to remove any {@link MemberOrder} and {@link MemberGroupLayout} annotations but
+ * It should be possible to remove any {@link MemberOrder} annotation but
* any layout annotations would need to be retained.
* </p>
*/
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java b/core/legacy/applib-legacy/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
similarity index 99%
rename from core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
rename to core/legacy/applib-legacy/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
index 1df58e9..deddc6d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
+++ b/core/legacy/applib-legacy/src/main/java/org/apache/isis/applib/annotation/MemberGroupLayout.java
@@ -49,6 +49,7 @@ import org.apache.isis.commons.internal.base._Strings;
@Inherited
@Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
+@Deprecated
public @interface MemberGroupLayout {
/**
diff --git a/core/applib/src/test/java/org/apache/isis/applib/annotation/MemberGroupLayoutColumnSpansTest.java b/core/legacy/applib-legacy/src/test/java/org/apache/isis/applib/annotation/MemberGroupLayoutColumnSpansTest.java
similarity index 100%
rename from core/applib/src/test/java/org/apache/isis/applib/annotation/MemberGroupLayoutColumnSpansTest.java
rename to core/legacy/applib-legacy/src/test/java/org/apache/isis/applib/annotation/MemberGroupLayoutColumnSpansTest.java