Author: tchemit Date: 2009-12-14 03:53:36 +0100 (Mon, 14 Dec 2009) New Revision: 750 Removed: branches/eugene-2.0/eugene-test/ Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java Log: - fix getSimpleName for variable array type - remove module eugene-test Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-12-14 01:57:24 UTC (rev 749) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-12-14 02:53:36 UTC (rev 750) @@ -588,11 +588,21 @@ * @return the simple name associated to the str given */ public static String getSimpleName(String str) { + // variable array type + boolean variableArrayType=false; + if (str.endsWith("...")) { + variableArrayType = true; + str = str.substring(0, str.length() - 3); + } if (str.startsWith("\"") && str.endsWith("\"")) { return str; } //return str.replaceAll("[a-zA-Z]\\w*\\.",""); - return str.replaceAll("\\p{Alpha}\\w*\\.",""); + String result = str.replaceAll("\\p{Alpha}\\w*\\.", ""); + if (variableArrayType) { + result += "..."; + } + return result; } public static Set<String> getTypesList(String str) { Modified: branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2009-12-14 01:57:24 UTC (rev 749) +++ branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2009-12-14 02:53:36 UTC (rev 750) @@ -132,6 +132,24 @@ result = GeneratorUtil.getSimpleName(str); log.info(str + " -> " + result); assertEquals(expResult, result); + + str = "Object..."; + expResult = "Object..."; + result = GeneratorUtil.getSimpleName(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "Class<A>..."; + expResult = "Class<A>..."; + result = GeneratorUtil.getSimpleName(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); + + str = "java.lang.Class<A>..."; + expResult = "Class<A>..."; + result = GeneratorUtil.getSimpleName(str); + log.info(str + " -> " + result); + assertEquals(expResult, result); } @Test