[Wikitty-commits] r496 - in trunk: . wikitty-api wikitty-dto wikitty-generators/src/main/java/org/nuiton/wikitty/generator

23 Nov 2010

Author: jcouteau
Date: 2010-11-23 10:49:32 +0100 (Tue, 23 Nov 2010)
New Revision: 496

Url: http://nuiton.org/repositories/revision/wikitty/496

Log:
Add setter on multiplicity attributes
Put wikitty-dto in overall build


Modified:
   trunk/pom.xml
   trunk/wikitty-api/pom.xml
   trunk/wikitty-dto/pom.xml
   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/WikittyHelperGenerator.java

Modified: trunk/pom.xml
===================================================================

--- trunk/pom.xml	2010-11-23 07:43:11 UTC (rev 495)
+++ trunk/pom.xml	2010-11-23 09:49:32 UTC (rev 496)
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -23,6 +25,7 @@
     <module>wikitty-api</module>
     <module>wikitty-solr-impl</module>
     <module>wikitty-jdbc-impl</module>
+    <module>wikitty-dto</module>
 
     <module>wikitty-ui-zk</module>
     <module>wikitty-hessian-client</module>
@@ -512,7 +515,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <platform>nuiton</platform>
+    <platform>nuiton.org</platform>
     <projectId>wikitty</projectId>
 
     <!-- common versions used in sub-poms -->

Modified: trunk/wikitty-api/pom.xml
===================================================================
--- trunk/wikitty-api/pom.xml	2010-11-23 07:43:11 UTC (rev 495)
+++ trunk/wikitty-api/pom.xml	2010-11-23 09:49:32 UTC (rev 496)
@@ -184,7 +184,7 @@
             <phase>generate-sources</phase>
             <configuration>
               <inputs>
-                <input>zargo:src/main/xmi:*.zargo</input>
+                <input>zargo:src/main/xmi/:*.zargo</input>
               </inputs>
               <fullPackagePath>org.nuiton.wikitty.entities</fullPackagePath>
               <defaultPackage>org.nuiton.wikitty.entities</defaultPackage>

Modified: trunk/wikitty-dto/pom.xml
===================================================================
--- trunk/wikitty-dto/pom.xml	2010-11-23 07:43:11 UTC (rev 495)
+++ trunk/wikitty-dto/pom.xml	2010-11-23 09:49:32 UTC (rev 496)
@@ -82,18 +82,6 @@
 
     <build>
 
-        <pluginManagement>
-            <plugins>
-                <!-- eugene plugin -->
-                <plugin>
-                    <groupId>org.nuiton.eugene</groupId>
-                    <artifactId>maven-eugene-plugin</artifactId>
-                    <version>${eugeneVersion}</version>
-                </plugin>
-                
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <!-- processor plugin -->
             <plugin>

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-23 07:43:11 UTC (rev 495)
+++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java	2010-11-23 09:49:32 UTC (rev 496)
@@ -332,6 +332,17 @@
         return result;
 }*/;            
                     setOperationBody(getter, getterBody);
+
+                    String setterName = "set" + StringUtils.capitalize(attributeName);
+                    ObjectModelOperation setter = addOperation(abstractClass, setterName, "void");
+                    addAnnotation(abstractClass, setter, "Override");
+                    addParameter(setter, attributeTypeSimpleNameInSet, attributeName);
+                    String setterBody = ""
+/*{
+        <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>);
+        getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%= getter.getName() %>());
+}*/;
+                    setOperationBody(setter, setterBody);
             
                     String addName = "add" + StringUtils.capitalize(attributeName);
                     ObjectModelOperation adder = addOperation(abstractClass, addName, "void");
@@ -561,17 +572,18 @@
                     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
     
                     String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true);
                     String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute);
+                    String attributeNameCapitalized = StringUtils.capitalize(attributeName);
             
                     // now, for this attribute, we will generate add, remove and clear methods
                     // adding operations to contract
-                    getterName = "get" + StringUtils.capitalize(attributeName);
+                    getterName = "get" + attributeNameCapitalized;
                     ObjectModelOperation getter = addOperation(abstractClassForThisMetaExtension, getterName, attributeTypeSimpleNameInSet);
                     addAnnotation(abstractClassForThisMetaExtension, getter, "Override");
                     String getterBody = ""
@@ -585,8 +597,22 @@
         return result;
 }*/;            
                     setOperationBody(getter, getterBody);
+
+                    String setterName = "set" + attributeNameCapitalized;
+                    ObjectModelOperation setter = addOperation(abstractClassForThisMetaExtension, setterName, "void");
+                    addAnnotation(abstractClassForThisMetaExtension, setter, "Override");
+                    addParameter(setter,"Set<String>","values");
+                    String setterBody = ""
+/*{
+        for (String value:values){
+            add<%=attributeNameCapitalized%>(value);
+        }
+}*/;
+                    setOperationBody(setter, setterBody);
+
+
             
-                    String addName = "add" + StringUtils.capitalize(attributeName);
+                    String addName = "add" + attributeNameCapitalized;
                     ObjectModelOperation adder = addOperation(abstractClassForThisMetaExtension, addName, "void");
                     addAnnotation(abstractClassForThisMetaExtension, adder, "Override");
                     addParameter(adder, "String", "element");
@@ -603,7 +629,7 @@
 }*/;
                     setOperationBody(adder, adderBody);
                     
-                    String removeName = "remove" + StringUtils.capitalize(attributeName);
+                    String removeName = "remove" + attributeNameCapitalized;
                     ObjectModelOperation remover = addOperation(abstractClassForThisMetaExtension, removeName, "void");
                     addAnnotation(abstractClassForThisMetaExtension, remover, "Override");
                     addParameter(remover, "String", "element");
@@ -620,7 +646,7 @@
 }*/;
                     setOperationBody(remover, removerBody);
                     
-                    String clearName = "clear" + StringUtils.capitalize(attributeName);
+                    String clearName = "clear" + attributeNameCapitalized;
                     ObjectModelOperation clear = addOperation(abstractClassForThisMetaExtension, clearName, "void");
                     addAnnotation(abstractClassForThisMetaExtension, clear, "Override");
                     String clearBody = ""

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-23 07:43:11 UTC (rev 495)
+++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java	2010-11-23 09:49:32 UTC (rev 496)
@@ -218,6 +218,10 @@
                     String getterName = "get" + StringUtils.capitalize(attributeName);
                     getter = addOperation(contract, getterName, attributeTypeSimpleNameInSet);
 
+                    String setterName = "set" + StringUtils.capitalize(attributeName);
+                    ObjectModelOperation setter = addOperation(contract, setterName, "void");
+                    addParameter(setter, attributeTypeSimpleNameInSet, attributeName);
+
                     String addName = "add" + StringUtils.capitalize(attributeName);
                     ObjectModelOperation adder = addOperation(contract, addName, "void");
                     addParameter(adder, "String", "element");

Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java
===================================================================
--- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java	2010-11-23 07:43:11 UTC (rev 495)
+++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java	2010-11-23 09:49:32 UTC (rev 496)
@@ -106,10 +106,11 @@
 
                     String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true);
                     String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute);
+                    String attributeNameCapitalized = StringUtils.capitalize(attributeName);
 
                     // now, for this attribute, we will generate add, remove and clear methods
                     // adding operations to contract
-                    String getterName = "get" + StringUtils.capitalize(attributeName);
+                    String getterName = "get" + attributeNameCapitalized;
                     ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet, ObjectModelModifier.STATIC);
                     addParameter(getter, "Wikitty", "wikitty");
                     String getterBody = ""
@@ -119,7 +120,19 @@
 }*/;
                     setOperationBody(getter, getterBody);
 
-                    String addName = "add" + StringUtils.capitalize(attributeName);
+                    String setterName = "set" + attributeNameCapitalized;
+                    ObjectModelOperation setter = addOperation(helper, setterName, "void", ObjectModelModifier.STATIC);
+                    addParameter(setter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty");
+                    addParameter(setter, attributeTypeSimpleNameInSet, attributeName);
+                    String setterBody = ""
+/*{
+        for (String id:<%=attributeName%>){
+            add<%=attributeNameCapitalized%>(wikitty, id);
+        }
+}*/;
+                    setOperationBody(setter, setterBody);
+
+                    String addName = "add" + attributeNameCapitalized;
                     ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC);
                     addParameter(adder, "Wikitty", "wikitty");
                     addParameter(adder, attributeType, "element");
@@ -330,22 +343,36 @@
 
                     String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true);
                     String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute);
+                    String capitalizedAttributeName = StringUtils.capitalize(attributeName);
 
                     // now, for this attribute, we will generate add, remove and clear methods
                     // adding operations to contract
-                    String getterName = "get" + StringUtils.capitalize(attributeName);
+                    String getterName = "get" + capitalizedAttributeName;
                     ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet, ObjectModelModifier.STATIC);
                     addParameter(getter, "String", "extensionName");
                     addParameter(getter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty");
                     String getterBody = ""
 /*{
         String fieldName = getMetaFieldName(extensionName, "<%=attributeName%>");
-        <%=attributeTypeSimpleNameInSet%> result = (<%=attributeTypeSimpleNameInSet%>) wikitty.getFqField(fieldName);        
+        <%=attributeTypeSimpleNameInSet%> result = (<%=attributeTypeSimpleNameInSet%>) wikitty.getFqField(fieldName);
         return result;
 }*/;
                     setOperationBody(getter, getterBody);
 
-                    String addName = "add" + StringUtils.capitalize(attributeName);
+                    String setterName = "set" + capitalizedAttributeName;
+                    ObjectModelOperation setter = addOperation(helper, setterName, "void", ObjectModelModifier.STATIC);
+                    addParameter(setter, "String", "extensionName");
+                    addParameter(setter, attributeTypeSimpleNameInSet, attributeName);
+                    addParameter(setter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty");
+                    String setterBody = ""
+/*{
+        for (String id:<%=attributeName%>){
+            add<%=capitalizedAttributeName%>(extensionName, wikitty, id);
+        }
+}*/;
+                    setOperationBody(setter, setterBody);
+
+                    String addName = "add" + capitalizedAttributeName;
                     ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC);
                     addParameter(adder, "String", "extensionName");
                     addParameter(adder, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty");
@@ -357,7 +384,7 @@
 }*/;
                     setOperationBody(adder, adderBody);
 
-                    String removeName = "remove" + StringUtils.capitalize(attributeName);
+                    String removeName = "remove" + capitalizedAttributeName;
                     ObjectModelOperation remover = addOperation(helper, removeName, "void", ObjectModelModifier.STATIC);
                     addParameter(remover, "String", "extensionName");
                     addParameter(remover, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty");
@@ -369,7 +396,7 @@
 }*/;
                     setOperationBody(remover, removerBody);
                     
-                    String clearName = "clear" + StringUtils.capitalize(attributeName);
+                    String clearName = "clear" + capitalizedAttributeName;
                     ObjectModelOperation clear = addOperation(helper, clearName, "void", ObjectModelModifier.STATIC);
                     addParameter(clear, "String", "extensionName");
                     addParameter(clear, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty");

    

[Wikitty-commits] r496 - in trunk: . wikitty-api wikitty-dto wikitty-generators/src/main/java/org/nuiton/wikitty/generator

jcouteau＠users.nuiton.org