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/03/08 00:15:55 UTC
[1/2] isis git commit: ISIS-993: fixing compile issue from stale
javadoc ref.
Repository: isis
Updated Branches:
refs/heads/ISIS-993 41a534db9 -> d57b10024
ISIS-993: fixing compile issue from stale javadoc ref.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3b5da6bd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3b5da6bd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3b5da6bd
Branch: refs/heads/ISIS-993
Commit: 3b5da6bd73bbd8e1b62670b5bfaebb9e9af87583
Parents: 41a534d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 7 22:48:39 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 7 22:48:39 2016 +0000
----------------------------------------------------------------------
.../isis/core/metamodel/facets/object/grid/GridFacet.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3b5da6bd/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacet.java
index 1ad43ec..a9cc0da 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacet.java
@@ -18,9 +18,8 @@
*/
package org.apache.isis.core.metamodel.facets.object.grid;
-
import org.apache.isis.applib.layout.component.Grid;
-import org.apache.isis.applib.services.layout.GridImplementationService;
+import org.apache.isis.applib.services.grid.GridSystemService;
import org.apache.isis.applib.services.layout.LayoutService;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -29,7 +28,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
* existing layout metadata (annotations or <code>layout.json</code>).
*
* <p>
- * Most of the heavy lifting is done by delegating to the {@link LayoutService} and {@link GridImplementationService}
+ * Most of the heavy lifting is done by delegating to the {@link LayoutService} and {@link GridSystemService}
* services.
* </p>
*/
[2/2] isis git commit: ISIS-993: fixing java7 compile issues.
Posted by da...@apache.org.
ISIS-993: fixing java7 compile issues.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d57b1002
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d57b1002
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d57b1002
Branch: refs/heads/ISIS-993
Commit: d57b100245e7e39a5da0d03d393d1d9f66e46788
Parents: 3b5da6b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 7 23:10:34 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 7 23:10:34 2016 +0000
----------------------------------------------------------------------
.../grid/bootstrap3/GridSystemServiceBS3.java | 23 +++++++++--------
core/pom.xml | 27 ++++++++++++++++++++
2 files changed, 39 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d57b1002/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.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 2efa284..06ad48e 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
@@ -17,12 +17,12 @@
package org.apache.isis.core.metamodel.services.grid.bootstrap3;
import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
import javax.annotation.Nullable;
@@ -401,7 +401,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
.filter(Predicates.<OneToOneAssociation>notNull())
);
- associations.sort(ObjectAssociation.Comparators.byMemberOrderSequence());
+ Collections.sort(associations, ObjectMember.Comparators.byMemberOrderSequence());
addPropertiesTo(fieldSet,
FluentIterable.from(associations)
.transform(ObjectAssociation.Functions.toId())
@@ -474,18 +474,18 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
.toList();
FluentIterable.from(sortedPossiblyMissingActionIds)
- .forEach(
- new Consumer<String>() {
- @Override
- public void accept(final String actionId) {
+ .transform(
+ new Function<String, Void>() {
+ @Nullable @Override
+ public Void apply(@Nullable final String actionId) {
final ObjectAction oa = objectActionById.get(actionId);
final MemberOrderFacet memberOrderFacet = oa.getFacet(MemberOrderFacet.class);
if(memberOrderFacet == null) {
- return;
+ return null;
}
final String memberOrderName = memberOrderFacet.name();
if (memberOrderName == null) {
- return;
+ return null;
}
final String id = asId(memberOrderName);
@@ -515,7 +515,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
addActionTo(owner, actionLayoutData);
}
- return;
+ return null;
}
if (oneToManyAssociationById.containsKey(id)) {
associatedActionIds.add(actionId);
@@ -527,7 +527,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
final ActionLayoutData actionLayoutData = new ActionLayoutData(actionId);
addActionTo(collectionLayoutData, actionLayoutData);
}
- return;
+ return null;
}
// if the @MemberOrder for the action references a field set (that has bound
// associations), then don't mark it as missing, but instead explicitly add it to the
@@ -542,8 +542,9 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
actionLayoutData.setPosition(ActionLayout.Position.PANEL_DROPDOWN);
final FieldSet fieldSet = fieldSetIds.get(id);
addActionTo(fieldSet, actionLayoutData);
- return;
+ return null;
}
+ return null;
}
});
http://git-wip-us.apache.org/repos/asf/isis/blob/d57b1002/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 0f609dd..f1181b6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1980,6 +1980,33 @@ ${license.additional-notes}
<profiles>
<profile>
+ <id>jdk7</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.7</version>
+ <vendor>oracle</vendor>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>apache-release</id>
<build>
<plugins>