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 2015/11/22 20:42:23 UTC
[5/8] isis git commit: ISIS-1259: ignore parent outer class name when
inferring name of property/parameter etc from type.
ISIS-1259: ignore parent outer class name when inferring name of property/parameter etc from type.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/222905c9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/222905c9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/222905c9
Branch: refs/heads/master
Commit: 222905c930c9333d5f40b3d6ed8029d957425fab
Parents: ed2499c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Nov 22 19:22:40 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Nov 22 19:22:40 2015 +0000
----------------------------------------------------------------------
.../isis/applib/services/dto/Dto_downloadXsd.java | 4 +++-
.../apache/isis/core/commons/lang/StringExtensions.java | 12 +++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/222905c9/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
index af17f30..a7ab4e7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
@@ -66,7 +66,9 @@ public class Dto_downloadXsd {
)
@MemberOrder(sequence = "500.2")
- public Object $$(final String fileName, final JaxbService.IsisSchemas isisSchemas) {
+ public Object $$(
+ final String fileName,
+ final JaxbService.IsisSchemas isisSchemas) {
final Map<String, String> map = jaxbService.toXsd(dto, isisSchemas);
http://git-wip-us.apache.org/repos/asf/isis/blob/222905c9/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
index 8c3dfb7..cf7f978 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/StringExtensions.java
@@ -45,15 +45,21 @@ public final class StringExtensions {
* between the words, where each word starts with a capital letter. E.g.,
* "NextAvailableDate" is returned as "Next Available Date".
*/
- public static String asNaturalName2(final String name) {
-
+ public static String asNaturalName2(String name) {
+
+ // handle any nested class names, eg 'Foo$Bar'
+ final int idx = name.lastIndexOf("$");
+ if(idx != -1) {
+ name = name.substring(idx+1);
+ }
+
final int length = name.length();
if (length <= 1) {
return name.toUpperCase();// ensure first character is upper case
}
- final StringBuffer naturalName = new StringBuffer(length);
+ final StringBuilder naturalName = new StringBuilder(length);
char previousCharacter;
char character = Character.toUpperCase(name.charAt(0));// ensure first