[Eugene-commits] r1194 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java

28 Oct 2012

Author: tchemit
Date: 2012-10-28 11:40:57 +0100 (Sun, 28 Oct 2012)
New Revision: 1194

Url: http://nuiton.org/repositories/revision/eugene/1194

Log:
fixes #2385: Improve JavaBean generation template

Modified:
   trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java

Modified: trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java
===================================================================

--- trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java	2012-10-28 09:06:36 UTC (rev 1193)
+++ trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java	2012-10-28 10:40:57 UTC (rev 1194)
@@ -457,9 +457,9 @@
                 ObjectModelJavaModifier.PUBLIC
         );
         setOperationBody(getChild, ""
-     /*{
-         return <%=attrName%> == null ? 0 : <%=attrName%>.size();
-     }*/
+    /*{
+        return <%=attrName%> == null ? 0 : <%=attrName%>.size();
+    }*/
         );
     }
     protected void createAddChildMethod(ObjectModelClass output,
@@ -483,8 +483,7 @@
         );
         if (usePCS) {
             buffer.append(""
-    /*{
-        firePropertyChange(<%=constantName%>, null, <%=attrName%>);
+    /*{    firePropertyChange(<%=constantName%>, null, <%=attrName%>);
     }*/
             );
         }
@@ -512,8 +511,7 @@
         );
         if (usePCS) {
             buffer.append(""
-    /*{
-        firePropertyChange(<%=constantName%>, null, <%=attrName%>);
+    /*{    firePropertyChange(<%=constantName%>, null, <%=attrName%>);
     }*/
             );
         }
@@ -536,8 +534,7 @@
         StringBuilder buffer = new StringBuilder();
         buffer.append(""
     /*{
-        boolean  removed = <%=methodName%>().remove(<%=attrName%>);
-    }*/
+        boolean removed = <%=methodName%>().remove(<%=attrName%>);}*/
         );
 
         if (usePCS) {
@@ -545,8 +542,7 @@
     /*{
         if (removed) {
             firePropertyChange(<%=constantName%>, <%=attrName%>, null);
-      }
-    }*/
+        }}*/
             );
         }
         buffer.append(""
@@ -574,8 +570,7 @@
         String methodName = getJavaBeanMethodName("get", attrName);
         buffer.append(""
     /*{
-        boolean  removed = <%=methodName%>().removeAll(<%=attrName%>);
-    }*/
+        boolean  removed = <%=methodName%>().removeAll(<%=attrName%>);}*/
         );
 
         if (usePCS) {
@@ -583,8 +578,7 @@
     /*{
         if (removed) {
             firePropertyChange(<%=constantName%>, <%=attrName%>, null);
-      }
-    }*/
+        }}*/
             );
         }
         buffer.append(""
@@ -613,11 +607,6 @@
         buffer.append(""
     /*{
         boolean contains = <%=methodName%>().contains(<%=attrName%>);
-    }*/
-        );
-
-        buffer.append(""
-    /*{
         return contains;
     }*/
         );
@@ -642,11 +631,6 @@
         buffer.append(""
     /*{
         boolean  contains = <%=methodName%>().containsAll(<%=attrName%>);
-    }*/
-        );
-
-        buffer.append(""
-    /*{
         return contains;
     }*/
         );
@@ -695,16 +679,22 @@
         addParameter(getChild, "int", "index");
         setOperationBody(getChild, ""
     /*{
+        T result = null;
         if (childs != null) {
-            int i = 0;
-            for (T o : childs) {
-                if (index == i) {
-                    return o;
+            if (childs instanceof List) {
+                result = ((List<T>) childs).get(index);
+            } else {
+                int i = 0;
+                for (T o : childs) {
+                    if (index == i) {
+                        result = o;
+                        break;
+                    }
+                    i++;
                 }
-                i++;
             }
         }
-        return null;
+        return result;
     }*/
         );
     }

    

[Eugene-commits] r1194 - trunk/eugene-java-templates/src/main/java/org/nuiton/eugene/java

tchemit＠users.nuiton.org