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 2019/01/09 07:25:57 UTC
[isis] 02/04: ISIS-2080: changes naming convention for alternative
layout file name
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b7ebfb6ffa99f24507bd08acf5744154cf937ae4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 8 15:22:23 2019 +0000
ISIS-2080: changes naming convention for alternative layout file name
to avoid clashes with existing "fallback" (Customer-edit.layout.xml / Customer.layout.xml / Customer.layout.fallback.xml)
---
.../services/grid/GridLoaderServiceDefault.java | 24 +---------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 28bf78a..3f09631 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -267,7 +267,7 @@ public class GridLoaderServiceDefault implements GridLoaderService2 {
final List<String> candidateResourceNames = Lists.newArrayList();
if(dcal.layoutIfAny != null) {
candidateResourceNames.add(
- String.format("%s.layout.%s.xml", dcal.domainClass.getSimpleName(), dcal.layoutIfAny));
+ String.format("%s-%s.layout.xml", dcal.domainClass.getSimpleName(), dcal.layoutIfAny));
}
candidateResourceNames.add(
String.format("%s.layout.xml", dcal.domainClass.getSimpleName()));
@@ -287,28 +287,6 @@ public class GridLoaderServiceDefault implements GridLoaderService2 {
}
- enum Type {
- DEFAULT {
- @Override
- protected String suffix() {
- return ".xml";
- }
- },
- FALLBACK {
- @Override
- protected String suffix() {
- return ".fallback.xml";
- }
- };
-
- private String resourceNameFor(final DomainClassAndLayout dcal) {
- return dcal.domainClass.getSimpleName() + ".layout" + (dcal.layoutIfAny != null ? dcal
- .layoutIfAny + "." : "") + suffix();
- }
-
- protected abstract String suffix();
- }
-
//region > injected dependencies
@javax.inject.Inject