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:26 UTC
[isis] 05/05: ISIS-1841: remove deprecated MemberGroupLayout
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 fc1971905af48195b34ca533f2a9eaafa23c5dd5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Aug 27 16:30:15 2018 +0200
ISIS-1841: remove deprecated MemberGroupLayout
Task-Url: https://issues.apache.org/jira/browse/ISIS-1841
---
.../membergroups/MemberGroupLayoutFacet.java | 0
.../MemberGroupLayoutFacetAbstract.java | 0
.../MemberGroupLayoutFacetAnnotation.java | 0
.../annotprop/MemberGroupLayoutFacetFactory.java | 0
.../annotprop/MemberGroupLayoutFacetFallback.java | 0
.../MemberGroupLayoutFacetProperties.java | 0
.../services/grid/fixedcols/applib/Hint.java | 1 +
.../core/metamodel/spec/ObjectSpecifications.java | 0
...ugin.java => ProgrammingModelLegacyPlugin.java} | 5 ++-
...core.metamodel.progmodel.ProgrammingModelPlugin | 2 +-
.../MemberGroupLayoutFacetFactoryTest.java | 0
...oupLayoutFacetPropertiesTest_asColumnSpans.java | 0
...GroupLayoutFacetPropertiesTest_asGroupList.java | 0
.../metamodel/spec/ObjectSpecificationsTest.java | 0
.../grid/bootstrap3/GridSystemServiceBS3.java | 46 +++++++++++-----------
.../metamodel/spec/feature/ObjectAssociation.java | 7 ++--
.../specimpl/ObjectSpecificationAbstract.java | 27 ++++++-------
.../dflt/ProgrammingModelFacetsJava5.java | 8 +---
18 files changed, 46 insertions(+), 50 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/MemberGroupLayoutFacet.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/MemberGroupLayoutFacet.java
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/MemberGroupLayoutFacet.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/MemberGroupLayoutFacet.java
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/MemberGroupLayoutFacetAbstract.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/MemberGroupLayoutFacetAbstract.java
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/MemberGroupLayoutFacetAbstract.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/MemberGroupLayoutFacetAbstract.java
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetAnnotation.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetAnnotation.java
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetAnnotation.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetAnnotation.java
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactory.java
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFallback.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFallback.java
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFallback.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFallback.java
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetProperties.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetProperties.java
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetProperties.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetProperties.java
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java
similarity index 99%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java
index 8ac2c32..fd2ea70 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java
+++ b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/services/grid/fixedcols/applib/Hint.java
@@ -20,6 +20,7 @@ package org.apache.isis.core.metamodel.services.grid.fixedcols.applib;
import org.apache.isis.applib.annotation.MemberGroupLayout;
+@Deprecated
public enum Hint {
LEFT,
MIDDLE,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecifications.java
diff --git a/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelIsisTimePlugin.java b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelLegacyPlugin.java
similarity index 89%
rename from core/legacy/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelIsisTimePlugin.java
rename to core/legacy/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelLegacyPlugin.java
index c0a497e..0c305d0 100644
--- a/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelIsisTimePlugin.java
+++ b/core/legacy/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelLegacyPlugin.java
@@ -17,6 +17,7 @@
package org.apache.isis.progmodels.plugins;
import org.apache.isis.core.metamodel.facets.object.encodeable.annotcfg.EncodableFacetAnnotationElseConfigurationFactory;
+import org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.object.parseable.annotcfg.ParseableFacetAnnotationElseConfigurationFactory;
import org.apache.isis.core.metamodel.facets.value.date.DateValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.datetime.DateTimeValueFacetUsingSemanticsProviderFactory;
@@ -24,10 +25,12 @@ import org.apache.isis.core.metamodel.facets.value.time.TimeValueFacetUsingSeman
import org.apache.isis.core.metamodel.facets.value.timestamp.TimeStampValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin;
-public class ProgrammingModelIsisTimePlugin implements ProgrammingModelPlugin {
+public class ProgrammingModelLegacyPlugin implements ProgrammingModelPlugin {
@Override
public void plugin(FactoryCollector collector) {
+
+ collector.addFactory(new MemberGroupLayoutFacetFactory(), FacetFactoryCategory.VALUE);
collector.addFactory(new DateValueFacetUsingSemanticsProviderFactory(), FacetFactoryCategory.VALUE);
collector.addFactory(new DateTimeValueFacetUsingSemanticsProviderFactory(), FacetFactoryCategory.VALUE);
diff --git a/core/legacy/metamodel-legacy/src/main/resources/META-INF/services/org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin b/core/legacy/metamodel-legacy/src/main/resources/META-INF/services/org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin
index 4a74f84..f62c316e 100644
--- a/core/legacy/metamodel-legacy/src/main/resources/META-INF/services/org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin
+++ b/core/legacy/metamodel-legacy/src/main/resources/META-INF/services/org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin
@@ -1 +1 @@
-org.apache.isis.progmodels.plugins.ProgrammingModelIsisTimePlugin
\ No newline at end of file
+org.apache.isis.progmodels.plugins.ProgrammingModelLegacyPlugin
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactoryTest.java b/core/legacy/metamodel-legacy/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactoryTest.java
similarity index 100%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactoryTest.java
rename to core/legacy/metamodel-legacy/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetFactoryTest.java
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetPropertiesTest_asColumnSpans.java b/core/legacy/metamodel-legacy/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetPropertiesTest_asColumnSpans.java
similarity index 100%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetPropertiesTest_asColumnSpans.java
rename to core/legacy/metamodel-legacy/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetPropertiesTest_asColumnSpans.java
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetPropertiesTest_asGroupList.java b/core/legacy/metamodel-legacy/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetPropertiesTest_asGroupList.java
similarity index 100%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetPropertiesTest_asGroupList.java
rename to core/legacy/metamodel-legacy/src/test/java/org/apache/isis/core/metamodel/facets/object/membergroups/annotprop/MemberGroupLayoutFacetPropertiesTest_asGroupList.java
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationsTest.java b/core/legacy/metamodel-legacy/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationsTest.java
similarity index 100%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationsTest.java
rename to core/legacy/metamodel-legacy/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationsTest.java
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index af09df7..1a37216 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -38,7 +38,6 @@ import com.google.common.collect.Sets;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ActionLayoutData;
@@ -57,7 +56,6 @@ import org.apache.isis.applib.layout.grid.bootstrap3.Size;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
-import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet;
import org.apache.isis.core.metamodel.services.grid.GridSystemServiceAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -100,27 +98,29 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
final BS3Row propsRow = new BS3Row();
bs3Grid.getRows().add(propsRow);
- final MemberGroupLayoutFacet memberGroupLayoutFacet =
- objectSpec.getFacet(MemberGroupLayoutFacet.class);
- if(memberGroupLayoutFacet != null) {
- // if have @MemberGroupLayout (or equally, a .layout.json file)
- final MemberGroupLayout.ColumnSpans columnSpans = memberGroupLayoutFacet.getColumnSpans();
- addFieldSetsToColumn(propsRow, columnSpans.getLeft(), memberGroupLayoutFacet.getLeft(), true);
- addFieldSetsToColumn(propsRow, columnSpans.getMiddle(), memberGroupLayoutFacet.getMiddle(), false);
- addFieldSetsToColumn(propsRow, columnSpans.getRight(), memberGroupLayoutFacet.getRight(), false);
-
- final BS3Col col = new BS3Col();
- final int collectionSpan = columnSpans.getCollections();
- col.setUnreferencedCollections(true);
- col.setSpan(collectionSpan > 0? collectionSpan: 12);
- propsRow.getCols().add(col);
-
- // will already be sorted per @MemberOrder
- final List<OneToManyAssociation> collections = objectSpec.getCollections(Contributed.INCLUDED);
- for (OneToManyAssociation collection : collections) {
- col.getCollections().add(new CollectionLayoutData(collection.getId()));
- }
- } else {
+//TODO [ahuber] marked for removal (breaks legacy functionality) ...
+// final MemberGroupLayoutFacet memberGroupLayoutFacet =
+// objectSpec.getFacet(MemberGroupLayoutFacet.class);
+// if(memberGroupLayoutFacet != null) {
+// // if have @MemberGroupLayout (or equally, a .layout.json file)
+// final MemberGroupLayout.ColumnSpans columnSpans = memberGroupLayoutFacet.getColumnSpans();
+// addFieldSetsToColumn(propsRow, columnSpans.getLeft(), memberGroupLayoutFacet.getLeft(), true);
+// addFieldSetsToColumn(propsRow, columnSpans.getMiddle(), memberGroupLayoutFacet.getMiddle(), false);
+// addFieldSetsToColumn(propsRow, columnSpans.getRight(), memberGroupLayoutFacet.getRight(), false);
+//
+// final BS3Col col = new BS3Col();
+// final int collectionSpan = columnSpans.getCollections();
+// col.setUnreferencedCollections(true);
+// col.setSpan(collectionSpan > 0? collectionSpan: 12);
+// propsRow.getCols().add(col);
+//
+// // will already be sorted per @MemberOrder
+// final List<OneToManyAssociation> collections = objectSpec.getCollections(Contributed.INCLUDED);
+// for (OneToManyAssociation collection : collections) {
+// col.getCollections().add(new CollectionLayoutData(collection.getId()));
+// }
+// } else
+ {
// if no layout hints other than @MemberOrder
addFieldSetsToColumn(propsRow, 4, Arrays.asList("General"), true);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
index 3777e34..e45f7f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
@@ -32,17 +32,14 @@ import com.google.common.collect.Maps;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.WhereValueFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderComparator;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
import org.apache.isis.core.metamodel.util.DeweyOrderComparator;
/**
@@ -234,6 +231,8 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
public static class Util {
private Util(){}
+
+ public final static String LAYOUT_DEFAULT_GROUP = "General";
public static Map<String, List<ObjectAssociation>> groupByMemberOrderName(
final List<ObjectAssociation> associations) {
@@ -258,7 +257,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
return;
}
}
- getFrom(associationsByGroup, MemberGroupLayoutFacet.DEFAULT_GROUP).add(association);
+ getFrom(associationsByGroup, LAYOUT_DEFAULT_GROUP).add(association);
}
private static List<ObjectAssociation> getFrom(Map<String, List<ObjectAssociation>> associationsByGroup, final String groupName) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 0f9a355..b798abd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -24,9 +24,9 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.stream.Stream;
import com.google.common.base.Function;
+import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
@@ -39,8 +39,6 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import com.google.common.base.Predicate;
-
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.ClassExtensions;
@@ -65,7 +63,6 @@ import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceF
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet;
import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
import org.apache.isis.core.metamodel.facets.object.navparent.NavigableParentFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
@@ -93,7 +90,6 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
-import org.apache.isis.core.metamodel.util.pchain.ParentChain;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
@@ -817,16 +813,17 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
protected List<ObjectAssociation> sortAssociations(final List<ObjectAssociation> associations) {
final DeweyOrderSet orderSet = DeweyOrderSet.createOrderSet(associations);
- final MemberGroupLayoutFacet memberGroupLayoutFacet = this.getFacet(MemberGroupLayoutFacet.class);
-
- if(memberGroupLayoutFacet != null) {
- final List<String> groupOrder = Lists.newArrayList();
- groupOrder.addAll(memberGroupLayoutFacet.getLeft());
- groupOrder.addAll(memberGroupLayoutFacet.getMiddle());
- groupOrder.addAll(memberGroupLayoutFacet.getRight());
-
- orderSet.reorderChildren(groupOrder);
- }
+//TODO [ahuber] marked for removal (breaks legacy functionality) ...
+// final MemberGroupLayoutFacet memberGroupLayoutFacet = this.getFacet(MemberGroupLayoutFacet.class);
+//
+// if(memberGroupLayoutFacet != null) {
+// final List<String> groupOrder = Lists.newArrayList();
+// groupOrder.addAll(memberGroupLayoutFacet.getLeft());
+// groupOrder.addAll(memberGroupLayoutFacet.getMiddle());
+// groupOrder.addAll(memberGroupLayoutFacet.getRight());
+//
+// orderSet.reorderChildren(groupOrder);
+// }
final List<ObjectAssociation> orderedAssociations = Lists.newArrayList();
sortAssociations(orderSet, orderedAssociations);
return orderedAssociations;
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 2898637..5254cbe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -20,6 +20,8 @@ package org.apache.isis.progmodels.dflt;
import java.util.List;
import java.util.Set;
+import com.google.common.collect.Lists;
+
import org.apache.isis.commons.internal.context._Plugin;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
@@ -80,7 +82,6 @@ import org.apache.isis.core.metamodel.facets.object.ignore.javalang.RemoveMethod
import org.apache.isis.core.metamodel.facets.object.ignore.jdo.RemoveJdoEnhancementTypesFacetFactory;
import org.apache.isis.core.metamodel.facets.object.ignore.jdo.RemoveJdoPrefixedMethodsFacetFactory;
import org.apache.isis.core.metamodel.facets.object.immutable.immutableannot.CopyImmutableFacetOntoMembersFactory;
-import org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacetForMixinAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.navparent.annotation.NavigableParentAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassNameFactory;
@@ -168,8 +169,6 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin.FacetFactoryCategory;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin.FactoryCollector;
-import com.google.common.collect.Lists;
-
public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract {
public ProgrammingModelFacetsJava5(final IsisConfiguration configuration) {
@@ -262,11 +261,8 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new ValidateObjectFacetMethodFactory());
addFactory(new ObjectValidPropertiesFacetImplFactory());
-
addFactory(new MemberOrderFacetFactory());
- addFactory(new MemberGroupLayoutFacetFactory());
-
addFactory(new BookmarkPolicyFacetFallbackFactory());
addFactory(new HomePageFacetAnnotationFactory());