You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/12/25 14:08:48 UTC
[33/50] isis git commit: ISIS-1221: simplification.
ISIS-1221: simplification.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4eb54286
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4eb54286
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4eb54286
Branch: refs/heads/ISIS-1223-upgrade-to-wicket-7
Commit: 4eb5428682a998bd625725c38e2844cb2ef9e523
Parents: a52024d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Dec 22 15:58:28 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Dec 22 15:58:28 2015 +0000
----------------------------------------------------------------------
.../json/LayoutMetadataReaderFromJson.java | 4 ++--
.../metamodel/spec/feature/ObjectAssociation.java | 15 +++++----------
.../entity/properties/EntityPropertiesForm.java | 14 +++++---------
3 files changed, 12 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4eb54286/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
index 0b344fd..215c202 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
@@ -481,8 +481,8 @@ public class LayoutMetadataReaderFromJson implements LayoutMetadataReader2 {
private static void updateColumnMemberGroups(final ObjectSpecification objectSpec, final MemberGroupLayoutHint hint, final ColumnRepr columnRepr, final Set<String> actionIdsForAssociations) {
final List<ObjectAssociation> objectAssociations = propertiesOf(objectSpec);
- final Map<String, List<ObjectAssociation>> associationsByGroup = ObjectAssociation.Util.groupByMemberOrderName(objectAssociations,
- Lists.<String>newArrayList());
+ final Map<String, List<ObjectAssociation>> associationsByGroup = ObjectAssociation.Util.groupByMemberOrderName(objectAssociations
+ );
final List<String> groupNames = ObjectSpecifications.orderByMemberGroups(objectSpec, associationsByGroup.keySet(), hint);
http://git-wip-us.apache.org/repos/asf/isis/blob/4eb54286/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
----------------------------------------------------------------------
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 5fe92bd..5e74780 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
@@ -399,27 +399,22 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
private Util(){}
public static Map<String, List<ObjectAssociation>> groupByMemberOrderName(
- final List<ObjectAssociation> associations,
- final List<String> groupLayoutNames) {
+ final List<ObjectAssociation> associations) {
Map<String, List<ObjectAssociation>> associationsByGroup = Maps.newHashMap();
for(ObjectAssociation association: associations) {
- addAssociationIntoGroup(associationsByGroup, association, groupLayoutNames);
+ addAssociationIntoGroup(associationsByGroup, association);
}
return associationsByGroup;
}
private static void addAssociationIntoGroup(
final Map<String, List<ObjectAssociation>> associationsByGroup,
- final ObjectAssociation association,
- final List<String> groupLayoutNames) {
+ final ObjectAssociation association) {
final MemberOrderFacet memberOrderFacet = association.getFacet(MemberOrderFacet.class);
if(memberOrderFacet != null) {
- final String name = memberOrderFacet.name();
final String untranslatedName = memberOrderFacet.untranslatedName();
- // correlate with the untranslated name, if possible
- final String groupName = groupLayoutNames.contains(untranslatedName)? untranslatedName: name;
- if(!Strings.isNullOrEmpty(groupName)) {
- getFrom(associationsByGroup, groupName).add(association);
+ if(!Strings.isNullOrEmpty(untranslatedName)) {
+ getFrom(associationsByGroup, untranslatedName).add(association);
return;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4eb54286/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
index 3edf5fa..1f7f638 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
@@ -159,8 +159,7 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> implements
boolean addedProperties;
if(columnSpans.getLeft() > 0) {
- List<String> groupLayoutNames = memberGroupLayoutFacet.getLeft();
- addedProperties = addPropertiesInColumn(leftColumn, MemberGroupLayoutHint.LEFT, columnSpans, groupLayoutNames);
+ addedProperties = addPropertiesInColumn(leftColumn, MemberGroupLayoutHint.LEFT, columnSpans);
addButtons(leftColumn);
addFeedbackGui(leftColumn);
} else {
@@ -176,20 +175,18 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> implements
// middle column
if(columnSpans.getMiddle() > 0) {
- List<String> groupLayoutNames = memberGroupLayoutFacet.getMiddle();
MarkupContainer middleColumn = new WebMarkupContainer(ID_MIDDLE_COLUMN);
add(middleColumn);
- addPropertiesInColumn(middleColumn, MemberGroupLayoutHint.MIDDLE, columnSpans, groupLayoutNames);
+ addPropertiesInColumn(middleColumn, MemberGroupLayoutHint.MIDDLE, columnSpans);
} else {
Components.permanentlyHide(this, ID_MIDDLE_COLUMN);
}
// right column
if(columnSpans.getRight() > 0) {
- List<String> groupLayoutNames = memberGroupLayoutFacet.getRight();
MarkupContainer rightColumn = new WebMarkupContainer(ID_RIGHT_COLUMN);
add(rightColumn);
- addPropertiesInColumn(rightColumn, MemberGroupLayoutHint.RIGHT, columnSpans, groupLayoutNames);
+ addPropertiesInColumn(rightColumn, MemberGroupLayoutHint.RIGHT, columnSpans);
} else {
Components.permanentlyHide(this, ID_RIGHT_COLUMN);
}
@@ -223,8 +220,7 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> implements
private boolean addPropertiesInColumn(
final MarkupContainer markupContainer,
final MemberGroupLayoutHint hint,
- final ColumnSpans columnSpans,
- final List<String> groupLayoutNames) {
+ final ColumnSpans columnSpans) {
final int span = hint.from(columnSpans);
final EntityModel entityModel = (EntityModel) getModel();
@@ -236,7 +232,7 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> implements
final RepeatingView memberGroupRv = new RepeatingView(ID_MEMBER_GROUP);
markupContainer.add(memberGroupRv);
- final Map<String, List<ObjectAssociation>> associationsByGroup = ObjectAssociation.Util.groupByMemberOrderName(associations, groupLayoutNames);
+ final Map<String, List<ObjectAssociation>> associationsByGroup = ObjectAssociation.Util.groupByMemberOrderName(associations);
final List<String> groupNames = ObjectSpecifications.orderByMemberGroups(objSpec, associationsByGroup.keySet(), hint);