[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties FlavorsHelper.java,1.10,1.11

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31463/Plugin/com/ibm/ecute/rsa/core/internal/properties

Modified Files:
	FlavorsHelper.java 
Log Message:
fixed aggregate qualifier for the export

Index: FlavorsHelper.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties/FlavorsHelper.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- FlavorsHelper.java	10 Aug 2005 17:26:00 -0000	1.10
+++ FlavorsHelper.java	11 Aug 2005 16:10:49 -0000	1.11
@@ -528,7 +528,7 @@
 				  ((Class)parentClasses.get(i)).getOwnedAttribute(property.getName()) != null){
 					return ((Class)parentClasses.get(i)).getOwnedAttribute(property.getName());
 				}
-				if(property.getOwner() instanceof AssociationClass && 
+				if(property.getOwner() instanceof AssociationClass && parentClasses.get(i) instanceof AssociationClass &&
 				  ((AssociationClass)parentClasses.get(i)).getOwnedEnd(property.getName()) != null){
 							return ((AssociationClass)parentClasses.get(i)).getOwnedEnd(property.getName());
 						}
@@ -1411,7 +1411,7 @@
 				}
 				return "false";
 			} else {
-				return null;
+				return "false";
 			}	
 		}
 		
@@ -1428,7 +1428,7 @@
 				}
 				return "false";
 			} else {
-				return null;
+				return "false";
 			}	
 		}
 		
@@ -1743,6 +1743,7 @@
 		if(removed){
 			int index = applicableQualifiers.size()-1;
 			applicableQualifiers.remove(index);
+			removed = false;
 		}
 		
 		boolean isComposition = false;
@@ -1751,8 +1752,9 @@
 		int maxValue = -1;
 		
 		for(int i = 0; i < applicableQualifiers.size(); i++){
-			if(isNativeMappedQualifier((Qualifier)applicableQualifiers.get(i))){
-				String qualifierName = ((Qualifier)applicableQualifiers.get(i)).name;
+			Qualifier thisQualifier = (Qualifier)applicableQualifiers.get(i);
+			if(isNativeMappedQualifier(thisQualifier)){
+				String qualifierName = thisQualifier.name;
 				String qualifierValue = null;
 				if(effectiveInheritedValue(element, qualifierName) != null){
 					qualifierValue = effectiveInheritedValue(element, qualifierName).getValue();
@@ -1777,7 +1779,7 @@
 					isComposition = true;
 					
 				} else if(qualifierValue != null && qualifierName.equalsIgnoreCase("Aggregation") 
-						&& isComposition){
+						&& (isComposition || qualifierValue(element, thisQualifier).equalsIgnoreCase("true"))){
 					continue;
 				}