ontomde-java 2.0.0 → 2.0.4

data/lib/ontomde-java/frontend/defaultOptions.rb

@@ -2,16 +2,22 @@
 # return an option array field with default values
 def getDefaultOptions(options={}) 
   #options = {}
+  options[:dbSchemaName] = 'testschema' 
   options[:multiTenant] = false
-  options[:testRelativeDir]="src/test/java"
   options[:jspUseXmdaTaglib]=true
   options[:backTrace] = false
   options[:selfTestAndExit] = false
   options[:verbose]=false
-  options[:targetDir]="."
-  options[:javaRelativeDir]="src/main/java/"
-  options[:flexRelativeDir]="webapp/src/main/flex/"
+
+  # Path related defaults
+  options[:targetDir]='.'
+  options[:defaultRootDir ]='' # examples: domain or webapp
+  options[:testRelativeDir]='src/test/java/'
+  options[:javaRelativeDir]='src/main/java/'
+  options[:flexRelativeDir]='webapp/src/main/flex/'
   options[:webResourcesDir]=options[:javaRelativeDir]
+  options[:webContentRelativeDir]='./WebContent/'
+
   options[:flex]=false
   options[:mysql]=false
   options[:nt]=[]
@@ -30,7 +36,7 @@ def getDefaultOptions(options={})
   options[:withGenerateMethodForm]=false
   options[:makeCompositionBiNavigable]=false
   options[:salvage]=false
-  options[:useUnzip]=false
+  #options[:useUnzip]=false
   options[:messageCheck]=true
   options[:struts]=false
   options[:crank]=false 
@@ -43,7 +49,6 @@ def getDefaultOptions(options={})
   #options[:installRessources]=true
   options[:target_ejbconf] = nil
   options[:autoNewFileCreation]=true
-  options[:webContentRelativeDir]="./WebContent/"
   options[:javaClassRelDir]=nil
   options[:generateAntBuildFile]=false
   options[:silentlyForceUnknownDatatypeToString]=false
@@ -104,7 +109,7 @@ def getDefaultOptions(options={})
   options[:globalReverseFile]=nil
   options[:hasGlobalReverse]=false
   options[:dataModel]=nil
-  
+  options[:vsoTargetFile]=nil  
   #  options[:hib_dialect]="org.hibernate.dialect.MySQL5InnoDBDialect"
   #
   #

data/lib/ontomde-java/frontend/options.rb

@@ -115,6 +115,12 @@ def populateSourceAndTarget(opts,options)
     options[:javaRelativeDir] = v
   end
 
+  opts.on("--defaultRootDir ROOT_DIR_NAME",": Default root dir used for package without a root dir (a package stereotyped root). (examples: webapp, domain, ...)","default: --defaultRootDir #{options[:defaultRootDir]}") do |v|
+    options[:defaultRootDir] = v
+  end
+
+
+
   opts.on("--webResourcesDir DIRECTORY",": Relative destination directory for generated Web Resources properties, ...","relative to --targetDir","default: --webResourcesDir #{options[:webResourcesDir]}") do |v|
     options[:webResourcesDir] = v
   end
@@ -271,6 +277,7 @@ def populateCrank(opts,options)
   opts.on("--[no-]crank","Enable crank generation.","default: --#{options[:crank]?'':'no-'}crank") do |v|
     options[:crank] = v
     options[:java_addJavaEnumInterface]=true
+    #options[:db_autonomousDAO] = v    
   end
 end
 def populateFlex(opts,options)
@@ -307,6 +314,10 @@ def populatePersistence(opts,options)
     options[:ddl_mode] = v
   end
 
+  opts.on("--dbSchemaName [SCHEMA_NAME]",": Name of the schema used in configuration files",%{default: --dbSchemaName #{options[:dbSchemaName]}}) do |v|
+    options[:dbSchemaName] = v
+  end
+
   opts.on("-s","--[no-]simulateNotImplementedMethods",": Replace unimplemeted method with a simulation method.",%{default: --#{options[:simulateNotImplementedMethods]?"":"no-"}simulateNotImplementedMethods}) do |v|
     options[:simulateNotImplementedMethods] = v
   end
@@ -348,7 +359,8 @@ def populateStruts(opts,options)
     options[:java_addJavaEnumInterface] = v
   end
   opts.on("-u","--[no-]useUnzip",": Use unzip to install resources.","default: --#{options[:useUnzip]?'':'no-'}useUnzip") do |v|
-    options[:useUnzip] = v
+	  puts "#WARNING --useUnzip option deprecated. Please remove from your setup file"
+    #options[:useUnzip] = v
   end
 
   opts.on("-c","--[no-]message-check",": Check message ressources consistency.","default: --#{options[:messageCheck]?'':'no-'}message-check") do |v|
@@ -424,6 +436,11 @@ def populateMisc(opts,options)
   opts.on("--[no-]generateDebugLauncher",": generates ruby script helper for launching ontomde-java from a ruby debugger. (netbeans, ruby, ...)",%{default: --#{options[:generateDebugLauncher]?"":"no-"}generateDebugLauncher}) do |v|
     options[:generateDebugLauncher] = v 
   end
+
+  opts.on("--vsoTargetFile VSO_TARGET_FILE",": if sets, generate a file containing VmWare VSO file mapping for inclusion into VMO","default: -- #{options[:vsoTargetFile]}") do |v|
+    options[:vsoTargetFile] = v
+  end
+
 end
 
 def populateDocumentation(opts,options)
@@ -463,7 +480,7 @@ def populateDebug(opts,options)
     options[:allowAutomaticCodeDeletion] = v
   end
 
-  opts.on("-s","--[no-]dry-run",": Do a dry run without executing actions..","No file will be changed neither created on disk",%{default: --#{options[:dryRun]?"":"no-"}dry-run}) do |v|
+  opts.on("-s","--[no-]dryRun",": Do a dry run without executing actions..","No file will be changed neither created on disk",%{default: --#{options[:dryRun]?"":"no-"}dryRun}) do |v|
     options[:dryRun] = v
   end
 

data/lib/ontomde-java/frontend/steps.rb

@@ -7,14 +7,17 @@
 # #step_generate_struts,  #step_generate_crank,  #step_generate_misc,  #step_generate_flex, #step_clean
 DEFAULT_GENERATION_CHAIN=[
   [:load , :step_load],
+  [:nocode, :step_removeNoCode],
   [:tenant , :step_addTenant],  
   [:kb , :step_generateKb],  
   [:bpm , :step_bpm],
   [:tests , :step_generate_tests],
+  [:dto1 , :step_generateCustomDTO_step1 ],
+  [:dto2 , :step_generateCustomDTO_step2 ],
   [:mda1 , :step_transform10],
   [:mda2 , :step_transform20],
+  [:vso	,:step_vso ],
   [:initComponent, :step_initComponent],
-  [:dto , :step_generateCustomDTO ],
   [:mda3 , :step_transform30],
   [:mda4 , :step_transform40],
   [:java , :step_generate_java],
@@ -95,8 +98,24 @@ def step_generateKb(model)
     say "loading KB project data"
     ignoreheader=true
     data_model=Crdf_ProtegeDataModel.new
-    data_model.loadMetaModelFromFile(model.context[:testDataRDFS],ignoreheader)
-    data_model.loadModelFromFile(model.context[:testDataRDF],ignoreheader)
+    begin 
+	    failOnWarn=true
+    data_model.loadMetaModelFromFile(model.context[:testDataRDFS],ignoreheader,failOnWarn)
+      #data_model.loadFail_on_warn=true
+      data_model.loadModelFromFile(model.context[:testDataRDF],ignoreheader,failOnWarn)
+    rescue Exception => z
+	    puts <<END 
+
+* PLEASE READ: An error occured while reading tests data.
+* PLEASE READ: This is most likely caused by tests data out of sync
+* PLEASE READ: with model due to a change in source model.
+* PLEASE READ: You should open test project with Protege/2000
+* PLEASE READ: (.pprj file associated to: #{model.context[:testDataRDFS]})
+* PLEASE READ: remove offending data, save and rerun generation.
+
+END
+	    raise z
+    end
     data_model.kbjava_umlSourceModel = model
     model[:dataModel]=data_model
   end
@@ -114,8 +133,12 @@ end
 
 # generate custom DTO based on business objects 
 # and setup from protege.
-def step_generateCustomDTO(model)
-  model.dto_generateCustomDTO()
+def step_generateCustomDTO_step1(model)
+  model.dto_generateCustomDTO_step1()
+end
+
+def step_generateCustomDTO_step2(model)
+  model.dto_generateCustomDTO_step2()
 end
 
 # Enhance UML model
@@ -275,6 +298,10 @@ def step_generate_crank(model)
   end
 end
 
+def  step_removeNoCode(model)
+	model.umlx_removeNoCode!()
+end
+
 def step_initComponent(model)
   model.java_autoGenerateCrudComponents! if model.context[:webservice]
   model.umlx_autoCreateImplicitComponent! if model.context[:withGenerateImplicitComponent]
@@ -285,3 +312,7 @@ def step_clean(model)
   mtk_deleteTempFiles
 end
 
+def step_vso(model)
+  model.vso_generateMapping
+end
+

data/lib/ontomde-java/java/accessorCode.rb

@@ -11,7 +11,7 @@ module Muml_Classifier
   # (this method is often overwritten, especially by persistence module).
   def java_writeSuggesterBody(oa)
     #TODO: recherche du composite commun
-    write("return null;\n")
+    write("\t\treturn null;\n")
   end
 
   # Write code for a composition createAndAdd suggester
@@ -29,14 +29,21 @@ module Muml_Classifier
   # Write code for a suggester returning enum given has parameter
   #Note: if lowerValue is zero, null is also added (except if createAndAdd)
   def java_writeSuggesterBodyEnumWithType(oa,enum,isCreateAndAddSuggester=false)
+    if(true)
     write <<END
-	java.util.ArrayList<#{enum.java_qualifiedName}> ret=new java.util.ArrayList<#{enum.java_qualifiedName}>();
-	#{ (oa.umlx_lowerValueIsZero? && (!isCreateAndAddSuggester))  ? %{ret.add(null);} : %{} }
-	for(int i=java.lang.reflect.Array.getLength(#{enum.java_qualifiedName}.values())-1; i>=0 ; i--){
-		ret.add(#{enum.java_qualifiedName}.values()[i]);
+		 return xmda.crud.Helper.arrayToList#{%{PlusNull} if (oa.umlx_lowerValueIsZero? && (!isCreateAndAddSuggester))}(#{enum.java_qualifiedName}\n\t\t\t\t\t\t.values());
+END
+    else
+    write <<END
+		ret=new java.util.ArrayList<#{enum.java_qualifiedName}>();
+		#{ (oa.umlx_lowerValueIsZero? && (!isCreateAndAddSuggester))  ? %{ret.add(null);} : %{} }
+		for (int i = java.lang.reflect.Array
+				.getLength(#{enum.java_qualifiedName}\n\t\t\t\t\t\t.values()) - 1; i >= 0; i--) {
+			ret.add(#{enum.java_qualifiedName}\n\t\t\t\t\t.values()[i]);
 		}
-	return ret;
+		return ret;
 END
+    end
   end
 
   # Returns an UML LiteralInteger initialized with val value.
@@ -85,20 +92,20 @@ END
       #no code when derived
     elsif oe.nil? || !oe.umlx_isNavigable?
       set.java_code=<<END
-	#{java_this(oa)}#{oa.java_NameProperty}.remove(#{getterParameterName(oa)});
+\t\t#{java_this(oa)}#{oa.java_NameProperty}.remove(#{getterParameterName(oa)});
 END
     elsif oe.umlx_upperValueIsOne?
       set.java_code=<<END
-  #{qualInit}
-  if(#{java_this(oa)}#{oa.java_NameProperty}.remove(#{getterParameterName(oa)})#{qualCheckRemove}) {
-		#{getterParameterName(oa)}#{qualCall}.set#{oe.java_NameBean}(null);
+\t\t#{qualInit}
+\tif(#{java_this(oa)}#{oa.java_NameProperty}.remove(#{getterParameterName(oa)})#{qualCheckRemove}) {
+\t\t\t#{getterParameterName(oa)}#{qualCall}.set#{oe.java_NameBean}(null);
 	}
 END
     else
       set.java_code=<<END
-	if(#{java_this(oa)}#{oa.java_NameProperty}.remove(#{getterParameterName(oa)})) {
-		#{getterParameterName(oa)}#{qualCall}.remove#{oe.java_NameBean}(this);
-	}
+\t\tif(#{java_this(oa)}#{oa.java_NameProperty}.remove(#{getterParameterName(oa)})) {
+\t\t\t#{getterParameterName(oa)}#{qualCall}.remove#{oe.java_NameBean}(this);
+\t\t}
 END
     end
 
@@ -185,18 +192,22 @@ END
     elsif oe.umlx_upperValueIsOne?
       #*-1
       add.java_code=<<END
-	if(#{ip.java_Name}==null) { return; }
-	if(#{java_this(oa)}#{oa.java_NameProperty}#{qualCall}.add(#{ip.java_Name})){
-		#{ip.java_Name}.set#{oe.java_NameBean}(this);
-		}
+\t\tif (#{ip.java_Name} == null) {
+\t\t\treturn; 
+\t\t}
+\t\tif (#{java_this(oa)}#{oa.java_NameProperty}#{qualCall}.add(#{ip.java_Name})) {
+\t\t\t#{ip.java_Name}.set#{oe.java_NameBean}(this);
+\t\t}
 END
     else
       #*-*
       add.java_code=<<END
-	if(#{ip.java_Name}==null) { return; }
-	if(#{java_this(oa)}#{oa.java_NameProperty}#{qualCall}.add(#{ip.java_Name})) {
-		#{ip.java_Name}.remove#{oe.java_NameBean}(this);
-		}
+\t\tif (#{ip.java_Name} == null) {
+\t\t\treturn; 
+\t\t}
+\t\tif (#{java_this(oa)}#{oa.java_NameProperty}#{qualCall}.add(#{ip.java_Name})) {
+\t\t\t#{ip.java_Name}.remove#{oe.java_NameBean}(this);
+\t\t}
 END
     end
   end
@@ -217,11 +228,11 @@ END
     tenantClause=""
     if context[:multiTenant]
       #call constructor with tenant
-      tenantClause="(#{TENANT_FIELD_NAME})"
+      tenantClause="(get#{TENANT_FIELD_BEAN_NAME}())"
     end
     
     rp=Cuml_Parameter.new(rdf_Repository,get.rdf_uri+"_p1")
-    rp.uml_name="return"
+    rp.uml_name="\t\treturn"
     rp.uml_direction=Cuml_ParameterDirectionKind::Return
     rp.uml_upperValue=oa.uml_upperValue
     rp.uml_lowerValue=oa.uml_lowerValue
@@ -240,6 +251,134 @@ END
     end
   end
 
+  def java_getCrudHelperClass!
+	helper=umlx_getOrCreateClass('xmda.crud.Helper')
+	return helper unless helper.uml_ownedOperation.empty?
+	helper.db_isTransient=RDF_TRUE
+	helper.umlx_external=RDF_FALSE
+	helper.java_customCode=<<END
+
+public static Object createFromEnum(#{java_getJavaEnumAssignInterface.java_qualifiedName} requestedType) {
+	if (requestedType == null) {
+		return null;
+	}
+
+	Class<?> t = requestedType.getType();
+	try {
+		Class<?>[] p = new Class[0];
+		Object[]initArgs =new Object[0];
+		java.lang.reflect.Constructor<?>  c=t.getConstructor(p);
+		Object ret=c.newInstance(initArgs);
+		return ret;
+	} catch (NoSuchMethodException e) {
+		e.printStackTrace();
+		throw new RuntimeException("Missing default constructor for"+t.getName(),e);
+	} catch (IllegalAccessException e) {
+		e.printStackTrace();
+		throw new RuntimeException("Illegal access Exception on "+t.getName(),e);
+	} catch (InstantiationException e) {
+		e.printStackTrace();
+		throw new RuntimeException("Instantiation exception on "+t.getName(),e);
+	} catch (java.lang.reflect.InvocationTargetException e) {
+		e.printStackTrace();
+		throw new RuntimeException("Invocation Target Exception on "+t.getName(),e);
+	}
+}
+
+	/*
+	 * Helper for compacting code in add operations
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> T[] genericUnidirAdd(final T t, T[] oldVal) {
+		T[] newArray = null;
+		if (oldVal == null) {
+			newArray = (T[]) new Object[1];
+			newArray[0] = t;
+		} else {
+			newArray = (T[]) new Object[1 + oldVal.length];
+			System.arraycopy(oldVal, 0, newArray, 0, oldVal.length);
+			newArray[oldVal.length] = t;
+		}
+		return newArray;
+	}
+
+	public static <T> java.util.List<T> arrayToList(T[] t) {
+		java.util.List<T> ret = null;
+		if (t == null) {
+			ret=new java.util.ArrayList<T>();
+		} else {
+			ret=java.util.Arrays.asList(t);
+			//if RW: ret=new java.util.ArrayList<T>(ret);
+		}
+		return ret;
+	}
+
+	public static <T> java.util.List<T> arrayToListPlusNull(T[] t) {
+		java.util.List<T> ret = null;
+		if (t == null) {
+			ret=new java.util.ArrayList<T>();
+		} else {
+			ret=java.util.Arrays.asList(t);
+			ret=new java.util.ArrayList<T>(ret);
+		}
+		ret.add(0,null);
+		return ret;
+	}
+
+	public static <T> boolean genericAddIgnoreNull(java.util.Collection<T> lst,
+			T elt) {
+		if (elt != null) {
+			return lst.add(elt);
+		}
+		return false; // no change
+	}
+
+	/** 
+	* replace null Long by 0 Long
+	* Method used by jpa module.
+	*/
+	public static Long longObjZeroForNull(Long id) {
+		if (id == null) {
+			return Long.valueOf(0);
+		} else {
+			return id;
+		}
+	}
+
+	/* method to be used by jpa */
+	public static<T> java.util.List<T> addMissingItems(java.util.List<T> lstInOut,java.util.Collection<T> missings) {
+		for (java.util.Iterator<T> iterator = missings.iterator(); iterator.hasNext();) {
+			T item = (T) iterator.next();
+			if (!lstInOut.contains(item)) {
+				lstInOut.add(item);
+			}
+		}
+		return lstInOut;
+	}
+
+	/* returns lst if no null, or a newly created set otherwise */
+	public static <T> java.util.Set<T> emptyNewCollectionIfNull(java.util.Set<T> lst) {
+		if (lst != null) {
+			return lst;
+		} else {
+			return new java.util.HashSet<T>();
+		}
+	}
+
+	/* returns lst if no null, or a newly created List otherwise */
+	public static <T> java.util.List<T> emptyNewCollectionIfNull(java.util.List<T> lst) {
+		if (lst != null) {
+			return lst;
+		} else {
+			return new java.util.ArrayList<T>();
+		}
+	}
+
+END
+	
+	return helper
+  end
+
   #Adds a createAndAdd method for parameter oa using a model transformation.
   #
   #NOTE:
@@ -279,38 +418,17 @@ END
     # no java code generated
 
     #TODO: factorize in helper class
-    add.java_code=%{
-		if (requestedType==null) {
-			return null;
-		}
-		String qname=requestedType.name().replaceAll("#{JAVA_MAGIC_DOT_STRING}",".");
-		try {
-			// c=#{java_this(oa)}getClass().getClassLoader().loadClass(requestedType.name());
-    Class<?> t = Class.forName(qname);
-    Class<?>[] p = new Class[0];
-    Object[]initArgs =new Object[0];
-    java.lang.reflect.Constructor<?>  c=t.getConstructor(p);
-    #{oa.uml_type_one.java_qualifiedName} ret=(#{oa.uml_type_one.java_qualifiedName})c.newInstance(initArgs);
-    #{%{ret.setTenantOwner(getTenantOwner());} if context[:multiTenant]}
-    #{oa.umlx_upperValueIsOne? ? "set" : "add"}#{oa.java_NameBean}(ret);
-    return ret;
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-			throw new RuntimeException("Missing type "+qname,e);
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-			throw new RuntimeException("Missing default constructor for"+qname,e);
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-			throw new RuntimeException("Illegal access Exception on "+qname,e);
-		} catch (InstantiationException e) {
-			e.printStackTrace();
-			throw new RuntimeException("Instantiation exception on "+qname,e);
-		} catch (java.lang.reflect.InvocationTargetException e) {
-			e.printStackTrace();
-			throw new RuntimeException("Invocation Target Exception on "+qname,e);
-		}}
+
+    
+ 
+    add.java_code=%{\t\t#{oa.uml_type_one.java_qualifiedName} ret = (#{oa.uml_type_one.java_qualifiedName})#{java_getCrudHelperClass!.java_qualifiedName}.createFromEnum(requestedType);#{%{
+\t\tret.setTenantOwner(getTenantOwner());} if context[:multiTenant]}
+\t\t#{oa.umlx_upperValueIsOne? ? "set" : "add"}#{oa.java_NameBean}(ret);
+\t\treturn ret;}
   end
+  
+# generate add/... using helper instead of inlining
+USE_HELPER_FOR_ACCESSORS=true
 
   # Adds an appender for parameter oa using a model transformation.
   #
@@ -340,41 +458,58 @@ END
       # no code generated
     elsif (oe.nil? || !oe.umlx_isNavigable?) && !oa.java_use_Arrays?
       add.java_code=<<END
-	if(#{getterParameterName(oa)}==null) { return; }
-	#{java_this(oa)}#{oa.java_NameProperty}.add(#{getterParameterName(oa)});
+\t\txmda.crud.Helper.genericAddIgnoreNull(#{java_this(oa)}#{oa.java_NameProperty},#{getterParameterName(oa)} ); 
 END
+#      add.java_code=<<END
+#\t\tif (#{getterParameterName(oa)} == null) {
+#\t\t\treturn;
+#\t\t}
+#\t\t#{java_this(oa)}#{oa.java_NameProperty}.add(#{getterParameterName(oa)});
+#END
     elsif (oe.nil? || !oe.umlx_isNavigable?) && oa.java_use_Arrays?
       add.java_code=<<END
-	if(#{getterParameterName(oa)}==null) { return; }
-	#{oa.uml_type_one.java_qualifiedName}[] newArray=null;
-	if (#{java_this(oa)}#{oa.java_NameProperty}==null) {
-		newArray=new #{oa.uml_type_one.java_qualifiedName}[1];
-		newArray[0]=#{getterParameterName(oa)};
-	} else {
-		newArray=new #{oa.uml_type_one.java_qualifiedName}[1+#{java_this(oa)}#{oa.java_NameProperty}.length];
-		System.arraycopy(#{java_this(oa)}#{oa.java_NameProperty}, 0, newArray,0, #{java_this(oa)}#{oa.java_NameProperty}.length);
-		newArray[#{java_this(oa)}#{oa.java_NameProperty}.length]=#{getterParameterName(oa)};
-	}
-	#{java_this(oa)}#{oa.java_NameProperty}=newArray;
+\t\tif (#{getterParameterName(oa)} == null) {
+\t\t\treturn;
+\t\t}
+\t\t#{oa.uml_type_one.java_qualifiedName}[] newArray = null;
+\t\tif (#{java_this(oa)}#{oa.java_NameProperty} == null) {
+\t\t\tnewArray = new #{oa.uml_type_one.java_qualifiedName}[1];
+\t\t\tnewArray[0] = #{getterParameterName(oa)};
+\t\t} else {
+\t\t\tnewArray = new #{oa.uml_type_one.java_qualifiedName}[1+#{java_this(oa)}#{oa.java_NameProperty}.length];
+\t\t\tSystem.arraycopy(#{java_this(oa)}#{oa.java_NameProperty}, 0, newArray,0, #{java_this(oa)}#{oa.java_NameProperty}.length);
+\t\t\tnewArray[#{java_this(oa)}#{oa.java_NameProperty}.length] = #{getterParameterName(oa)};
+\t\t}
+\t\t#{java_this(oa)}#{oa.java_NameProperty} = newArray;
 END
 
 
     elsif oe.umlx_upperValueIsOne?
       #*-1
       add.java_code=<<END
-	if(#{getterParameterName(oa)}==null) { return; }
-	if(#{java_this(oa)}#{oa.java_NameProperty}.add(#{getterParameterName(oa)})){
-		#{getterParameterName(oa)}.set#{oe.java_NameBean}(this);
-		}
+\t\tif (xmda.crud.Helper.genericAddIgnoreNull(#{java_this(oa)}#{oa.java_NameProperty},#{getterParameterName(oa)} )) {
+\t\t\t#{getterParameterName(oa)}.set#{oe.java_NameBean}(this);
+\t\t}
 END
+
+#      add.java_code= <<END
+#\t\tif (#{getterParameterName(oa)} == null) {
+#\t\t\treturn;
+#\t\t}
+#\t\tif (#{java_this(oa)}#{oa.java_NameProperty}.add(#{getterParameterName(oa)})){
+#\t\t\t#{getterParameterName(oa)}.set#{oe.java_NameBean}(this);
+#\t\t}
+#END
     else
       #*-*
       # second test avoids loop
       add.java_code=<<END
-	if(#{getterParameterName(oa)}==null) { return; }
-	if(#{java_this(oa)}#{oa.java_NameProperty}.add(#{getterParameterName(oa)})) {
-		#{getterParameterName(oa)}.add#{oe.java_NameBean}(this);
-		}
+\t\tif (#{getterParameterName(oa)} == null) {
+\t\t\treturn;
+\t\t}
+\t\tif (#{java_this(oa)}#{oa.java_NameProperty}.add(#{getterParameterName(oa)})) {
+\t\t\t#{getterParameterName(oa)}.add#{oe.java_NameBean}(this);
+\t\t}
 END
     end
 
@@ -400,13 +535,22 @@ END
   # * #java_writeEnumStringMappingGetterCode
   # * #java_getCollectionMapping
   def java_writeGlobalGetterBody(oa)
-    return if oa.uml_isDerived?  && oa.umlx_stringMappingForEnum.empty?
-
-    if java_isEnumStringMapping?(oa)
+    if oa.uml_isDerived?  && oa.umlx_stringMappingForEnum.empty?
+      # provide an implementation because a getter
+      # should never throw an exception.
+      write ("\t\t//TODO: implement this derived attribute\n")
+      if oa.umlx_oneSide?
+              v=DatatypeMapping.instance.getMapping(oa.uml_type_one)
+	      write ("\t\treturn #{v.java_getUndefinedValue};");
+      else
+	      cm=oa.java_getCollectionMapping
+	      write ("\t\treturn #{cm.addNew(oa.uml_type_one.java_qualifiedName)};");
+      end
+    elsif java_isEnumStringMapping?(oa)
       java_writeEnumStringMappingGetterCode(oa)
 
     elsif oa.umlx_upperValueIsOne?  || !oa.uml_qualifier.empty?
-      j="return #{oa.java_NameProperty}"
+      j="\t\treturn #{oa.java_NameProperty}"
       sep_next=".get("
       sep_end=""
       #oa.uml_qualifier.each { |key|
@@ -416,14 +560,20 @@ END
       #}
       j=j+sep_end  +";"
       write j
-    else
+    elsif ! oa.java_use_Arrays?
       #on ne peut pas permettre la modification de la liste en direct
       write %{
-if(#{oa.java_NameProperty}!=null){
-	return #{oa.java_NameProperty};
-} else {
-	return #{oa.java_getCollectionMapping.addNew(oa.uml_type_one.java_qualifiedName)};
-}}
+	        return xmda.crud.Helper.emptyNewCollectionIfNull(#{oa.java_NameProperty});
+		}
+       else
+	       # code same as above bu could not get it to work with generic Array
+      write %{
+		if(#{oa.java_NameProperty}!=null){
+			return #{oa.java_NameProperty};
+		} else {
+			return #{oa.java_getCollectionMapping.addNew(oa.uml_type_one.java_qualifiedName)};
+		}}
+		
     end
   end
 
@@ -449,7 +599,7 @@ if(#{oa.java_NameProperty}!=null){
       # other end is non navigable.
       #begin
       #if oa.uml_qualifier.empty?
-      write "#{java_this(oa)}#{oa.java_NameProperty}=#{getterParameterName(oa)};"
+      write "\t\t#{java_this(oa)}#{oa.java_NameProperty} = #{getterParameterName(oa)};"
       #else
       #	j="{ #{oa.java_NameProperty}.put("
       #	sep=""
@@ -478,19 +628,25 @@ END
     elsif oa.umlx_upperValueIsOne? && (!oe.umlx_upperValueIsOne?)
       # 1<->*
       write <<END
-		if(#{oa.java_NameProperty}!=null && #{oa.java_NameProperty}.equals(#{getterParameterName(oa)})) { return ;}
-		#{oa.uml_type_one.java_qualifiedName} previous=#{oa.java_NameProperty};
+		if (#{oa.java_NameProperty} != null && #{oa.java_NameProperty}.equals(#{getterParameterName(oa)})) {
+			return;
+		}
+		#{oa.uml_type_one.java_qualifiedName} previous = #{oa.java_NameProperty};
 		
-		#{oa.java_NameProperty}=null;
-		if(previous!=null) { previous.remove#{oe.java_NameBean}(this); }
+		#{oa.java_NameProperty} = null;
+		if (previous != null) {
+			previous.remove#{oe.java_NameBean}(this);
+		}
 
-		#{java_this(oa)}#{oa.java_NameProperty}=#{getterParameterName(oa)};
-		if(#{getterParameterName(oa)}!=null) { #{getterParameterName(oa)}.add#{oe.java_NameBean}(this); }
+		#{java_this(oa)}#{oa.java_NameProperty} = #{getterParameterName(oa)};
+		if (#{getterParameterName(oa)} != null) {
+			#{getterParameterName(oa)}.add#{oe.java_NameBean}(this);
+		}
 END
     else # *<->1 and *<->*
       write <<END
 		#{oa.java_propertyAssociationType} toBeRemoved=new #{oa.java_propertyAssociationConcreteType}();
-		for(#{oa.uml_type_one.java_qualifiedName} item:#{oa.java_NameProperty}) {
+		for(#{oa.uml_type_one.java_qualifiedName} item:this.#{oa.java_NameProperty}) {
 			if(#{getterParameterName(oa)}!=null && #{getterParameterName(oa)}.contains(item)) { continue;}
 			toBeRemoved.add(item);
 		}
@@ -516,7 +672,7 @@ END
   # * #java_writeEnumStringMappingSetterCode
   # * #java_getCollectionMapping
   def java_writeQualifiedGetterBody(oa)
-    write("return   #{oa.java_NameProperty}.get(")
+    write("\t\treturn   #{oa.java_NameProperty}.get(")
     sep=""
     oa.uml_qualifier.each { |key|
       write(sep)