r950 - in trunk/eugene/src/main/java/org/nuiton/eugene: java models/object - Eugene-commits

12 Aug 2010

Author: tchemit
Date: 2010-08-12 12:24:38 +0200 (Thu, 12 Aug 2010)
New Revision: 950

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

Log:
clean code

Modified:
   trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java
   trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java

Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java
===================================================================

--- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java	2010-08-11 18:26:10 UTC (rev 949)
+++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java	2010-08-12 10:24:38 UTC (rev 950)
@@ -28,18 +28,15 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.eugene.GeneratorUtil;
-import org.nuiton.eugene.models.object.ObjectModel;
 import org.nuiton.eugene.models.object.ObjectModelAttribute;
 import org.nuiton.eugene.models.object.ObjectModelBuilder;
 import org.nuiton.eugene.models.object.ObjectModelClass;
 import org.nuiton.eugene.models.object.ObjectModelClassifier;
 import org.nuiton.eugene.models.object.ObjectModelElement;
 import org.nuiton.eugene.models.object.ObjectModelEnumeration;
-import org.nuiton.eugene.models.object.ObjectModelInterface;
 import org.nuiton.eugene.models.object.ObjectModelModifier;
 import org.nuiton.eugene.models.object.ObjectModelOperation;
 import org.nuiton.eugene.models.object.ObjectModelParameter;
-import org.nuiton.eugene.models.object.ObjectModelType;
 import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl;
 import org.nuiton.eugene.models.object.xml.ObjectModelOperationImpl;
 
@@ -107,7 +104,6 @@
      *
      * @param classifier             the classifier on which to add the interface
      * @param interfaceQualifiedName fully qualified name of the interface
-     * @see ObjectModelBuilder#addInterface(ObjectModelClassifier, String)
      */
     @Override
     public void addInterface(ObjectModelClassifier classifier,
@@ -133,7 +129,6 @@
      * @param value      initializer value of attribute
      * @param modifiers  modifiers of the attribute
      * @return a new ObjectModelAttribute
-     * @see ObjectModelBuilder#addAttribute(ObjectModelClassifier, String, String, String, ObjectModelModifier...)
      */
     @Override
     public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier,
@@ -183,7 +178,6 @@
      * @param type       the return type of the operation
      * @param modifiers  the modifiers of the operation
      * @return a new ObjectModelOperation
-     * @see ObjectModelBuilder#addOperation(ObjectModelClassifier, String, String, ObjectModelModifier...)
      */
     @Override
     public ObjectModelOperation addOperation(ObjectModelClassifier classifier,
@@ -201,7 +195,6 @@
      * @param type      the type of the parameter
      * @param name      the name of the parameter
      * @return a new ObjectModelParameter
-     * @see ObjectModelBuilder#addParameter(ObjectModelOperation, String, String)
      */
     @Override
     public ObjectModelParameter addParameter(ObjectModelOperation operation,
@@ -217,7 +210,6 @@
      *
      * @param operation the operation on which to add a exeception
      * @param exception the exception to add
-     * @see ObjectModelBuilder#addException(ObjectModelOperation, String)
      */
     @Override
     public void addException(ObjectModelOperation operation, String exception) {
@@ -232,7 +224,6 @@
      * @param operation the operation on which to add the body code
      * @param body      the body code to set on the operation
      * @throws IllegalArgumentException if operation is abstract
-     * @see ObjectModelBuilder#setOperationBody(ObjectModelOperation, String)
      */
     @Override
     public void setOperationBody(ObjectModelOperation operation, String body)

Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java
===================================================================
--- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java	2010-08-11 18:26:10 UTC (rev 949)
+++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java	2010-08-12 10:24:38 UTC (rev 950)
@@ -51,8 +51,8 @@
      * @param name model name
      */
     public ObjectModelBuilder(String name) {
-        this.model = new ObjectModelImpl();
-        this.model.setName(name);
+        model = new ObjectModelImpl();
+        model.setName(name);
     }
 
     /**
@@ -61,7 +61,7 @@
      * @return the ObjectModel which is currently built
      */
     public ObjectModel getModel() {
-        return this.model;
+        return model;
     }
 
     /**
@@ -198,7 +198,7 @@
      * @param modifiers  attribute modifiers
      * @return the new ObjectModelAttribute added
      * @throws IllegalArgumentException illegal Modifier
-     * @see org.nuiton.eugene.models.object.ObjectModelModifier#isVisibility()
+     * @see ObjectModelModifier#isVisibility()
      */
     public ObjectModelAttribute addAttribute(ObjectModelClassifier classifier, String name, String type, String value,
                                              ObjectModelModifier... modifiers) throws IllegalArgumentException {
@@ -239,7 +239,7 @@
      * Add an association A to B. Create only attribute association for classifierA.
      * MODIFIERS allowed : PUBLIC, PRIVATE, PACKAGE, PROTECTED, AGGREGATE, COMPOSITE, ORDERED, UNIQUE
      * STATIC, NAVIGABLE.
-     * You have to use method {@link #addReverseAssociation(org.nuiton.eugene.models.object.ObjectModelAttribute,java.lang.String, int, int, org.nuiton.eugene.models.object.ObjectModelModifier...)}
+     * You have to use method {@link #addReverseAssociation(ObjectModelAttribute, String, int, int, ObjectModelModifier...)}
      * to create attribute association for classifierB.
      *
      * @param classifierA     classifier from
@@ -303,7 +303,7 @@
      * @param maxMultiplicity maximum multiplicity of B in association
      * @param modifiers       for the association
      * @return the attribute corresponding to the association for classifierB
-     * @see #addAssociation(org.nuiton.eugene.models.object.ObjectModelClassifier, org.nuiton.eugene.models.object.ObjectModelClassifier,java.lang.String, int, int, org.nuiton.eugene.models.object.ObjectModelModifier...)
+     * @see #addAssociation(ObjectModelClassifier, ObjectModelClassifier, String, int, int, ObjectModelModifier...)
      */
     public ObjectModelAttribute addReverseAssociation(ObjectModelAttribute attrAssociation, String roleName,
                                                       int minMultiplicity, int maxMultiplicity, ObjectModelModifier... modifiers) {
@@ -472,6 +472,7 @@
      * @param clazz where the superclass will be added
      * @param type  type of inner classifier to create
      * @param name  superclass qualified name
+     * @param modifiers modifiers of the inner classifier
      * @return the new instanciated inner classifier
      * @throws IllegalArgumentException if given {@code type} is not a concrete classifier type
      */

    

r950 - in trunk/eugene/src/main/java/org/nuiton/eugene: java models/object

tchemit＠users.nuiton.org

tags

participants (1)