Author: bleny Date: 2010-08-16 18:58:46 +0200 (Mon, 16 Aug 2010) New Revision: 265 Url: http://nuiton.org/repositories/revision/wikitty/265 Log: abstract delegate to helper ; all setters now return old value Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 16:12:57 UTC (rev 264) +++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-08-16 16:58:46 UTC (rev 265) @@ -59,12 +59,10 @@ } for (ObjectModelClass businessEntity : model.getClasses()) { - - addImports(processedClasses.get(businessEntity)); - - addConstructors(processedClasses.get(businessEntity)); - - addConstants(businessEntity, processedClasses.get(businessEntity)); + ObjectModelClass abstractClassForThisEntity = processedClasses.get(businessEntity); + addImports(abstractClassForThisEntity); + addConstructors(abstractClassForThisEntity); + addConstants(businessEntity, abstractClassForThisEntity); } processedClasses.clear(); @@ -228,6 +226,7 @@ protected void addOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, true); + String helperClassName = businessEntity.getName() + "Helper"; // generating operations with bodies to realize contract for (ObjectModelAttribute attribute : businessEntity.getAttributes()) { @@ -255,9 +254,9 @@ addAnnotation(abstractClass, getter, "Override"); String getterBody = "" /*{ - <%= attributeTypeSimpleNameInSet %> result = getWikitty().<%=getFieldMethodName%>(<%= extensionVariableName %>, <%= fieldVariableName %>, <%= attributeType %>.class); + <%=attributeTypeSimpleNameInSet%> result = <%=helperClassName%>.<%=getterName%>(getWikitty()); return result; -}*/; +}*/; setOperationBody(getter, getterBody); String addName = "add" + StringUtils.capitalize(attributeName); @@ -266,7 +265,7 @@ addParameter(adder, "String", "element"); String adderBody = "" /*{ - getWikitty().addToField(<%=extensionVariableName%>, <%=fieldVariableName%>, element); + <%=helperClassName%>.<%=addName%>(getWikitty(), element); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%= getter.getName() %>()); }*/; setOperationBody(adder, adderBody); @@ -277,7 +276,7 @@ addParameter(remover, "String", "element"); String removerBody = "" /*{ - getWikitty().removeFromField(<%=extensionVariableName%>, <%=fieldVariableName%>, element); + <%=helperClassName%>.<%=removeName%>(getWikitty(), element); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); }*/; setOperationBody(remover, removerBody); @@ -287,7 +286,7 @@ addAnnotation(abstractClass, clear, "Override"); String clearBody = "" /*{ - getWikitty().clearField(<%=extensionVariableName%>, <%=fieldVariableName%>); + <%=helperClassName%>.<%=clearName%>(getWikitty()); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); }*/; setOperationBody(clear, clearBody); @@ -302,24 +301,23 @@ addAnnotation(abstractClass, getter, "Override"); setOperationBody(getter, "" /*{ - <%=attributeType%> result = getWikitty().<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>); - return result; + <%=attributeType%> value = <%=helperClassName%>.<%=getterName%>(getWikitty()); + return value; }*/); String setterName = "set" + StringUtils.capitalize(attributeName); - ObjectModelOperation setter = addOperation(abstractClass, setterName, "void"); + ObjectModelOperation setter = addOperation(abstractClass, setterName, attributeType); addAnnotation(abstractClass, setter, "Override"); addParameter(setter, attributeType, attributeName); setOperationBody(setter, "" /*{ - Object oldValue = getField(<%=extensionVariableName%>, <%=fieldVariableName%>); - getWikitty().setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeName%>); - getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=attributeName%>); + <%=attributeType%> oldValue = <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=getter.getName()%>()); + return oldValue; }*/); } } } - } protected void addInheritedOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-16 16:12:57 UTC (rev 264) +++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-08-16 16:58:46 UTC (rev 265) @@ -151,7 +151,7 @@ getter = addOperation(contract, getterName, attributeType); String setterName = "set" + StringUtils.capitalize(attributeName); - ObjectModelOperation setter = addOperation(contract, setterName, "void"); + ObjectModelOperation setter = addOperation(contract, setterName, attributeType); addParameter(setter, attributeType, attributeName); } Modified: branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 16:12:57 UTC (rev 264) +++ branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-08-16 16:58:46 UTC (rev 265) @@ -70,7 +70,7 @@ // now, for this attribute, we will generate add, remove and clear methods // adding operations to contract String getterName = "get" + StringUtils.capitalize(attributeName); - ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet); + ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet, ObjectModelModifier.STATIC); addParameter(getter, "Wikitty", "wikitty"); String getterBody = "" /*{ @@ -80,7 +80,7 @@ setOperationBody(getter, getterBody); String addName = "add" + StringUtils.capitalize(attributeName); - ObjectModelOperation adder = addOperation(helper, addName, "void"); + ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC); addParameter(adder, "Wikitty", "wikitty"); addParameter(adder, attributeType, "element"); String adderBody = "" @@ -90,7 +90,7 @@ setOperationBody(adder, adderBody); String removeName = "remove" + StringUtils.capitalize(attributeName); - ObjectModelOperation remover = addOperation(helper, removeName, "void"); + ObjectModelOperation remover = addOperation(helper, removeName, "void", ObjectModelModifier.STATIC); addParameter(remover, "Wikitty", "wikitty"); addParameter(remover, attributeType, "element"); String removerBody = "" @@ -100,7 +100,7 @@ setOperationBody(remover, removerBody); String clearName = "clear" + StringUtils.capitalize(attributeName); - ObjectModelOperation clear = addOperation(helper, clearName, "void"); + ObjectModelOperation clear = addOperation(helper, clearName, "void", ObjectModelModifier.STATIC); addParameter(clear, "Wikitty", "wikitty"); String clearBody = "" /*{ @@ -114,21 +114,23 @@ // adding getter and setter to contract String getterName = "get" + StringUtils.capitalize(attributeName); - ObjectModelOperation getter = addOperation(helper, getterName, attributeType); + ObjectModelOperation getter = addOperation(helper, getterName, attributeType, ObjectModelModifier.STATIC); addParameter(getter, "Wikitty", "wikitty"); setOperationBody(getter, "" /*{ - <%=attributeType%> result = wikitty.<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>); - return result; + <%=attributeType%> value = wikitty.<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>); + return value; }*/); String setterName = "set" + StringUtils.capitalize(attributeName); - ObjectModelOperation setter = addOperation(helper, setterName, "void"); + ObjectModelOperation setter = addOperation(helper, setterName, attributeType, ObjectModelModifier.STATIC); addParameter(setter, "Wikitty", "wikitty"); addParameter(setter, attributeType, attributeName); setOperationBody(setter, "" /*{ + <%=attributeType%> oldValue = <%=getter.getName()%>(wikitty); wikitty.setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeName%>); + return oldValue; }*/); } }