Author: jcouteau Date: 2010-11-05 09:08:27 +0100 (Fri, 05 Nov 2010) New Revision: 466 Url: http://nuiton.org/repositories/revision/wikitty/466 Log: Clean code Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-11-02 15:08:03 UTC (rev 465) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-11-05 08:08:27 UTC (rev 466) @@ -303,7 +303,7 @@ attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); } - String getterName = null; + String getterName; if (WikittyTransformerUtil.isAttributeCollection(attribute)) { // attributed is a collection, we will generate operations get, add, remove and clear Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-11-02 15:08:03 UTC (rev 465) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-11-05 08:08:27 UTC (rev 466) @@ -175,18 +175,21 @@ if (attribute.isNavigable()) { // two variables needed below String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, false); + + //Get proper name + String name = attribute.getName(); // adding constants to contract addConstant(contract, fieldVariableName, "String", - "\"" + attribute.getName() + "\"", + "\"" + name + "\"", ObjectModelModifier.PUBLIC); // adding public static final String FQ_FIELD_CLIENT_NAME = EXT_CLIENT + ".name"; addConstant(contract, "FQ_" + fieldVariableName, "String", - extensionVariableName + " + \"." + attribute.getName() + "\"", + extensionVariableName + " + \"." + name + "\"", ObjectModelModifier.PUBLIC); } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-11-02 15:08:03 UTC (rev 465) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-11-05 08:08:27 UTC (rev 466) @@ -81,11 +81,15 @@ */ protected static String attributeToFielVariableName(ObjectModelAttribute attribute, boolean withClassNamePrefix) { + + //Get attribute name + String name = attribute.getName(); + String fieldVariableName = ""; if (withClassNamePrefix) { fieldVariableName += attribute.getDeclaringElement().getName() + "."; } - fieldVariableName += "FIELD_" + attribute.getDeclaringElement().getName().toUpperCase() + "_" + attribute.getName().toUpperCase(); + fieldVariableName += "FIELD_" + attribute.getDeclaringElement().getName().toUpperCase() + "_" + name.toUpperCase(); return fieldVariableName; } @@ -119,7 +123,7 @@ * @return the name of a method "getFieldAsInt" for example */ protected static String generateGetFieldAsCall(ObjectModelAttribute attribute) { - String asWhat = null; + String asWhat; if (isAttributeCollection(attribute)) { asWhat = getCollectionTypeName(attribute); } else { @@ -149,7 +153,7 @@ } protected static String getCollectionTypeName(ObjectModelAttribute attribute) { - String result = null; + String result; if (attribute.isUnique()) { result = "Set"; } else {