[Topia-commits] r2749 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator

11 Jul 2013

Author: tchemit
Date: 2013-07-11 17:25:09 +0200 (Thu, 11 Jul 2013)
New Revision: 2749

Url: http://nuiton.org/projects/topia/repository/revisions/2749

Log:
better usage of the addAnnotation method + fix missing exception import

Modified:
   trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java
===================================================================

--- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java	2013-07-11 15:24:42 UTC (rev 2748)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java	2013-07-11 15:25:09 UTC (rev 2749)
@@ -538,7 +538,7 @@
             addParameter(operation, "Class<U>", "type");
             addParameter(operation, "E", "entity");
             addException(operation, TopiaException.class);
-            addAnnotation(result, operation, "Override");
+            addAnnotation(result, operation, Override.class);
             setOperationBody(operation, ""
 /*{
         return new ArrayList<U>();
@@ -552,7 +552,7 @@
 
             addParameter(operation, "E", "entity");
             addException(operation, TopiaException.class);
-            addAnnotation(result, operation, "Override");
+            addAnnotation(result, operation, Override.class);
             setOperationBody(operation, ""
 /*{
         return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>();
@@ -581,7 +581,7 @@
         addParameter(operation, "Class<U>", "type");
         addParameter(operation, "E", "entity");
         addException(operation, TopiaException.class);
-        addAnnotation(result, operation, "Override");
+        addAnnotation(result, operation, Override.class);
         StringBuilder buffer = new StringBuilder(300);
         buffer.append(""
 /*{
@@ -664,7 +664,7 @@
 
         addParameter(operation, "E", "entity");
         addException(operation, TopiaException.class);
-        addAnnotation(result, operation, "Override");
+        addAnnotation(result, operation, Override.class);
 
         buffer = new StringBuilder(300);
         buffer.append(""

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java	2013-07-11 15:24:42 UTC (rev 2748)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java	2013-07-11 15:25:09 UTC (rev 2749)
@@ -384,7 +384,7 @@
 
         // getContract method
         op = addOperation(entityEnum, "getContract", "Class<? extends TopiaEntity>", ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum,op,Override.class);
         setOperationBody(op, ""
 /*{
             return contract;
@@ -393,7 +393,7 @@
 
         // getNaturalIds method
         op = addOperation(entityEnum, "getNaturalIds", "String[]", ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum,op,Override.class);
         setOperationBody(op, ""
 /*{
             return naturalIds;
@@ -402,7 +402,7 @@
 
         // isUseNaturalIds method
         op = addOperation(entityEnum, "isUseNaturalIds", "boolean", ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum,op,Override.class);
         setOperationBody(op, ""
 /*{
             return naturalIds.length > 0;
@@ -411,7 +411,7 @@
 
         // getNotNulls method
         op = addOperation(entityEnum, "getNotNulls", "String[]", ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum,op,Override.class);
         setOperationBody(op, ""
 /*{
             return notNulls;
@@ -420,7 +420,7 @@
 
         // isUseNotNulls method
         op = addOperation(entityEnum, "isUseNotNulls", "boolean", ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum,op,Override.class);
         setOperationBody(op, ""
 /*{
             return notNulls.length > 0;
@@ -429,7 +429,7 @@
 
         // getImplementationFQN method
         op = addOperation(entityEnum, "getImplementationFQN","String",ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum, op, Override.class);
         setOperationBody(op, ""
 /*{
             return implementationFQN;
@@ -438,7 +438,7 @@
 
         // setImplementationFQN method
         op = addOperation(entityEnum, "setImplementationFQN","void",ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum,op,Override.class);
         addParameter(op,"String","implementationFQN");
         if (generateOperator) {
                setOperationBody(op, ""
@@ -460,7 +460,7 @@
 
         // accept method
         op = addOperation(entityEnum, "accept","boolean",ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum,op,Override.class);
         addParameter(op,"Class<? extends TopiaEntity>","klass");
         setOperationBody(op, ""
 /*{
@@ -470,7 +470,8 @@
 
         // getImplementation method
         op = addOperation(entityEnum, "getImplementation","Class<? extends TopiaEntity>",ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(entityEnum,op,Override.class.getSimpleName());
+        addAnnotation(entityEnum,op,Override.class);
+        addImport(entityEnum, TopiaException.class);
         setOperationBody(op, ""
 /*{
             if (implementation == null) {
@@ -486,7 +487,7 @@
 
         // valueOf method
         op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelJavaModifier.PUBLIC,ObjectModelJavaModifier.STATIC);
-        addParameter(op,"TopiaEntity","entity");
+        addParameter(op,"TopiaEntity", "entity");
         setOperationBody(op, ""
 /*{
             return valueOf(entity.getClass());
@@ -495,7 +496,7 @@
 
         // valueOf method
         op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelJavaModifier.PUBLIC,ObjectModelJavaModifier.STATIC);
-        addParameter(op,"Class<?>","klass");
+        addParameter(op,"Class<?>", "klass");
         setOperationBody(op, ""
 /*{
             if (klass.isInterface()) {

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java	2013-07-11 15:24:42 UTC (rev 2748)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java	2013-07-11 15:25:09 UTC (rev 2749)
@@ -398,7 +398,7 @@
                 "getEntityClass",
                 "Class<E>",
                 ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(daoAbstractClass, op,Override.class.getSimpleName());
+        addAnnotation(daoAbstractClass, op,Override.class);
         setOperationBody(op, ""
 /*{
         return (Class<E>)<%=clazzName%>.class;
@@ -411,7 +411,7 @@
                 "getTopiaEntityEnum",
                 entityEnumName,
                 ObjectModelJavaModifier.PUBLIC);
-        addAnnotation(daoAbstractClass, op,Override.class.getSimpleName());
+        addAnnotation(daoAbstractClass, op,Override.class);
         setOperationBody(op, ""
 /*{
         return <%=entityEnumName%>.<%=clazzName%>;
@@ -683,7 +683,7 @@
             // something specific was done, need to generate the method
             ObjectModelOperation op;
             op = addOperation(result, "delete", "void", ObjectModelJavaModifier.PUBLIC);
-            addAnnotation(result, op,Override.class.getSimpleName());
+            addAnnotation(result, op,Override.class);
             addException(op, TopiaException.class);
             addParameter(op, "E", "entity");
             body.append(""
@@ -720,7 +720,7 @@
             addParameter(operation, "Class<U>", "type");
             addParameter(operation, "E", "entity");
             addException(operation, TopiaException.class);
-            addAnnotation(result, operation, "Override");
+            addAnnotation(result, operation, Override.class);
             setOperationBody(operation, ""
 /*{
         return new ArrayList<U>();
@@ -734,7 +734,7 @@
 
             addParameter(operation, "E", "entity");
             addException(operation, TopiaException.class);
-            addAnnotation(result, operation, "Override");
+            addAnnotation(result, operation, Override.class);
             setOperationBody(operation, ""
 /*{
         return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>();
@@ -763,7 +763,7 @@
         addParameter(operation, "Class<U>", "type");
         addParameter(operation, "E", "entity");
         addException(operation, TopiaException.class);
-        addAnnotation(result, operation, "Override");
+        addAnnotation(result, operation, Override.class);
         StringBuilder buffer = new StringBuilder(300);
         buffer.append(""
 /*{
@@ -845,7 +845,7 @@
 
         addParameter(operation, "E", "entity");
         addException(operation, TopiaException.class);
-        addAnnotation(result, operation, "Override");
+        addAnnotation(result, operation, Override.class);
 
         buffer = new StringBuilder(300);
         buffer.append(""

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java	2013-07-11 15:24:42 UTC (rev 2748)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java	2013-07-11 15:25:09 UTC (rev 2749)
@@ -358,7 +358,7 @@
                     "getTopiaContext", TopiaContext.class,
                     ObjectModelJavaModifier.PUBLIC);
             setDocumentation(op,"@since 3.0");
-            addAnnotation(outputAbstract, op, Override.class.getSimpleName());
+            addAnnotation(outputAbstract, op, Override.class);
             setOperationBody(op, ""
 /*{
         return topiaContext;
@@ -374,7 +374,7 @@
 //                    "@param context The context to set.\n" +
 //                    "@throws TopiaException if trying to replace a context\n" +
                     "@since 3.0");
-            addAnnotation(outputAbstract, op, Override.class.getSimpleName());
+            addAnnotation(outputAbstract, op, Override.class);
             setOperationBody(op, ""
 /*{
         if (topiaContext == null) {
@@ -389,7 +389,7 @@
                     ObjectModelJavaModifier.PUBLIC);
             addException(op, TopiaException.class);
 //            setDocumentation(op,"@since 2.5.3");
-            addAnnotation(outputAbstract, op, Override.class.getSimpleName());
+            addAnnotation(outputAbstract, op, Override.class);
             setOperationBody(op, ""
 /*{
         ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).update(this);
@@ -399,7 +399,7 @@
             op = addOperation(outputAbstract, "delete", "void", ObjectModelJavaModifier.PUBLIC);
             addException(op, TopiaException.class);
 //            setDocumentation(op,"@since 2.5.3");
-            addAnnotation(outputAbstract, op, Override.class.getSimpleName());
+            addAnnotation(outputAbstract, op, Override.class);
             setOperationBody(op, ""
 /*{
         ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).delete(this);
@@ -1237,7 +1237,7 @@
 
         // Declaration
         acceptOperation = addOperation(outputAbstract, "accept", void.class);
-        addAnnotation(outputAbstract, acceptOperation , Override.class.getSimpleName());
+        addAnnotation(outputAbstract, acceptOperation , Override.class);
         ObjectModelParameter param =
                 addParameter(acceptOperation, EntityVisitor.class, "visitor");
 
@@ -1290,7 +1290,7 @@
         ObjectModelOperation operation =
                 addOperation(outputAbstract, "toString", String.class);
 
-        addAnnotation(outputAbstract, operation, Override.class.getSimpleName());
+        addAnnotation(outputAbstract, operation, Override.class);
 
         addImport(outputAbstract, ToStringBuilder.class);
 
@@ -1339,7 +1339,7 @@
                 List.class.getName() + '<' + TopiaEntity.class.getName() + '>');
 
         addException(operation, TopiaException.class);
-        addAnnotation(outputAbstract, operation, Override.class.getSimpleName());
+        addAnnotation(outputAbstract, operation, Override.class);
 
         StringBuilder body;
         if (!TopiaGeneratorUtil.isContextable(input)) {
@@ -1452,7 +1452,7 @@
                 List.class.getName() + '<' + TopiaEntity.class.getName() + '>');
 
         addException(operation, TopiaException.class);
-        addAnnotation(outputAbstract, operation, Override.class.getSimpleName());
+        addAnnotation(outputAbstract, operation, Override.class);
 
         addImport(outputAbstract, ArrayList.class);
         addImport(outputAbstract, List.class);
@@ -1568,7 +1568,7 @@
     protected ObjectModelOperation createImplOperation(ObjectModelOperation interfaceOperation) {
         ObjectModelOperation implOperation =
                 cloneOperationSignature(interfaceOperation, outputAbstract, false);
-        addAnnotation(outputAbstract, implOperation, Override.class.getSimpleName());
+        addAnnotation(outputAbstract, implOperation, Override.class);
         return implOperation;
     }

    

[Topia-commits] r2749 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator

tchemit＠users.nuiton.org