Author: tchemit Date: 2013-12-18 23:52:14 +0100 (Wed, 18 Dec 2013) New Revision: 2939 Url: http://nuiton.org/projects/topia/repository/revisions/2939 Log: improve AbstractApplicationContext and his transformer Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/ApplicationContextTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-12-18 22:51:39 UTC (rev 2938) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-12-18 22:52:14 UTC (rev 2939) @@ -107,6 +107,16 @@ protected abstract Class<? extends TopiaEntity>[] getImplementationClasses(); + public abstract String getModelVersion() ; + + public abstract String getModelName() ; + + public abstract <T extends TopiaEntity> Class<T> getContractClass(Class<T> klass); + + public abstract <T extends TopiaEntity> Class<T> getImplementationClass(Class<T> klass); + + public abstract Class<? extends TopiaEntity>[] getContractClasses(); + protected String getImplementationClassesAsString() { StringBuilder buffer = new StringBuilder(); for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/ApplicationContextTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/ApplicationContextTransformer.java 2013-12-18 22:51:39 UTC (rev 2938) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/ApplicationContextTransformer.java 2013-12-18 22:52:14 UTC (rev 2939) @@ -176,6 +176,7 @@ // getModelVersion method String modelVersion = model.getVersion(); op = addOperation(output, "getModelVersion", "String", ObjectModelJavaModifier.PUBLIC); + addAnnotation(output, op, Override.class); setOperationBody(op, "" /*{ return "<%=modelVersion%>"; @@ -184,6 +185,7 @@ // getModelName method op = addOperation(output, "getModelName", "String", ObjectModelJavaModifier.PUBLIC); + addAnnotation(output, op, Override.class); setOperationBody(op, "" /*{ return "<%=modelName%>"; @@ -192,6 +194,7 @@ // getContractClass method op = addOperation(output, "getContractClass", "<T extends TopiaEntity> Class<T>", ObjectModelJavaModifier.PUBLIC); + addAnnotation(output, op, Override.class); addParameter(op, "Class<T>", "klass"); setOperationBody(op, "" /*{ @@ -202,6 +205,7 @@ // getImplementationClass method op = addOperation(output, "getImplementationClass", "<T extends TopiaEntity> Class<T>", ObjectModelJavaModifier.PUBLIC); + addAnnotation(output, op, Override.class); addParameter(op, "Class<T>", "klass"); setOperationBody(op, "" /*{ @@ -212,6 +216,7 @@ // getContractClasses method op = addOperation(output, "getContractClasses", "Class<? extends TopiaEntity>[]", ObjectModelJavaModifier.PUBLIC); + addAnnotation(output, op, Override.class); setOperationBody(op, "" /*{ <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); @@ -225,6 +230,7 @@ // getImplementationClasses method op = addOperation(output, "getImplementationClasses", "Class<? extends TopiaEntity>[]", ObjectModelJavaModifier.PUBLIC); + addAnnotation(output, op, Override.class); setOperationBody(op, "" /*{ <%=entityEnumName%>[] values = <%=entityEnumName%>.values();