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

[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-serv29558/Plugin/com/ibm/ecute/rsa/core/internal/properties

Modified Files:
	QualifiersPropertySection.java 
Log Message:
additional changes to previous bug fixes

Index: QualifiersPropertySection.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties/QualifiersPropertySection.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- QualifiersPropertySection.java	30 Mar 2005 07:37:34 -0000	1.9
+++ QualifiersPropertySection.java	30 Mar 2005 10:57:09 -0000	1.10
@@ -399,7 +399,6 @@
                     }
                     
                     //Qualifiers with Property Scope
-                    
                     if(element instanceof Property){
                         Property prop = (Property)element;
                         Property oppositeProp = null;
@@ -421,16 +420,22 @@
                         // SHARED or COMPOSITE
                         // so the aggregation kind of the opposite side has to be checked to set the aggregation
                         // qualifier of the aggregation property correct
-                        
+                        boolean exists = false;
                         if(oppositeProp.getAggregation().getValue()== AggregationKind.SHARED
                                 || oppositeProp.getAggregation().getValue()== AggregationKind.COMPOSITE){
                             Qualifier qualifierObject = qualifiersList.GetElement(qualifierName);
-                            addQualiferToTable(qualifierName, "true", definedIn, qualifierObject, -1, false);
+                            exists = existsQualifierInTable(qualifierName);
+                            if (!exists){
+                            	addQualiferToTable(qualifierName, "true", definedIn, qualifierObject, -1, false);
+                            }
                             allAvailableQualifers.remove(qualifierObject);
                         } else {
                         	Qualifier qualifierObject = qualifiersList.GetElement(qualifierName);
-                            addQualiferToTable(qualifierName, "false", definedIn, qualifierObject, -1, false);
-                            allAvailableQualifers.remove(qualifierObject);
+                        	exists = existsQualifierInTable(qualifierName);
+                        	if (!exists){
+                        		addQualiferToTable(qualifierName, "false", definedIn, qualifierObject, -1, false);
+                        	}
+                        	allAvailableQualifers.remove(qualifierObject);
                         }
                         //Qualifier: Key
                         qualifierName = "Key";
@@ -783,7 +788,6 @@
         };
         tableitem.setText(as);
         tableitem.setData(new QualifierValueObject(name, qualifierValue, defaultValue, index));
-        System.out.println("Qulifier " + name + " with value " + qualifierValue.toString() + " added");
 //        if(showAllButton.getSelection()){
 //	        if(!isDefaultQualifier){
 //	            tableitem.setFont(boldFont);