[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs EditQualifiersDialog.java,1.1,1.2

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

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

Modified Files:
	EditQualifiersDialog.java 
Log Message:
Qualifiers tab is refreshed after edit qualifiers dialog is left.
Qualifiers of association properties which are not ownedEnds 
of the associationcan now be show and edited

Index: EditQualifiersDialog.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs/EditQualifiersDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EditQualifiersDialog.java	10 May 2005 09:11:54 -0000	1.1
+++ EditQualifiersDialog.java	19 May 2005 09:17:49 -0000	1.2
@@ -1015,8 +1015,9 @@
 		if(element instanceof Property){
 			Property prop = (Property)element;
 			Property oppositeProp = null;
+			boolean isOwnedEnd = propertyIsOwnedEnd(prop);
 			// get the property of the other association end
-			if (prop.getOwner() instanceof AssociationClass){
+			if (isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){
 				AssociationClass parentClass = (AssociationClass)prop.getOwner();
 				List ends = parentClass.getOwnedEnds();
 				if ((Property)ends.get(0) == prop){
@@ -1061,7 +1062,7 @@
 				allAvailableQualifers.remove(qualifierObject);
 			}
 			//Qualifier: Max, Min
-			if(prop.getOwner() instanceof AssociationClass){
+			if(isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){
 				if(((AssociationClass)prop.getOwner()).getOwnedEnds().contains(prop)){
 					if(prop.getUpper() != MultiplicityElement.UNLIMITED_UPPER_BOUND){
 						qualifierName = "Max";
@@ -1174,6 +1175,24 @@
 		}
 	}
 	
+    private boolean propertyIsOwnedEnd(Property prop){
+    	
+    	boolean isOwnedEnd = false;
+    	if (prop.getOwner() instanceof AssociationClass){
+    		AssociationClass parentClass = (AssociationClass)prop.getOwner();
+    		List ends = parentClass.getOwnedEnds();
+    		if ((Property)ends.get(0) == prop){
+    			isOwnedEnd = true;
+    		}
+    		if ((Property)ends.get(1) == prop){
+    			isOwnedEnd = true;
+    		}
+    		return isOwnedEnd;
+    	} else {
+    		return false;
+    	}
+    }
+	
 	private int addQualiferToValueTable(String qualifierName, String qualifierValue, String definedIn, Qualifier qualifier, int index, boolean isDefaultQualifier)
 	{
 		String name = "";