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

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

Modified Files:
	EditQualifiersDialog.java 
Log Message:
fixes in flavor presentation and modification

Index: EditQualifiersDialog.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs/EditQualifiersDialog.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- EditQualifiersDialog.java	21 Jul 2005 15:19:33 -0000	1.9
+++ EditQualifiersDialog.java	25 Jul 2005 07:57:19 -0000	1.10
@@ -75,6 +75,7 @@
 import com.ibm.ecute.EcuteEclipsePlugin;
 import com.ibm.ecute.Qualifiers.Qualifier;
 import com.ibm.ecute.Qualifiers.QualifiersList;
+import com.ibm.ecute.rsa.core.internal.properties.EffectiveInheritedValue;
 import com.ibm.ecute.rsa.core.internal.properties.FlavorsHelper;
 import com.ibm.ecute.rsa.core.internal.properties.QualifierDefinitionObject;
 import com.ibm.ecute.rsa.core.internal.properties.QualifierValueObject;
@@ -1476,6 +1477,7 @@
 					
 			         if((prop.getUpper() != MultiplicityElement.UNLIMITED_UPPER_BOUND) ||
                     		(prop.getUpper() == MultiplicityElement.UNLIMITED_UPPER_BOUND 
+                    				&& FlavorsHelper.effectiveInheritedValue(element, "Max") != null
                     				&&prop.getUpper() != (FlavorsHelper.effectiveInheritedValue(element, "Max")).getIntValue())){
                         qualifierName = "Max";
                         String value = new Integer(prop.getUpper()).toString();
@@ -1487,6 +1489,7 @@
                         allAvailableQualifers.remove(qualifierObject);
                     }
                     if((prop.getLower() != 0) || (prop.getLower() == 0 
+                    		&& FlavorsHelper.effectiveInheritedValue(element, "Min") != null
                     		&& prop.getLower() != (FlavorsHelper.effectiveInheritedValue(element, "Min")).getIntValue())){
                         qualifierName = "Min";
                         String value = new Integer(prop.getLower()).toString();
@@ -1585,6 +1588,11 @@
         for(int k = 0; k < inheritedQualifiers.size(); k++){
         	qualifierName = ((QualifierValueObject)inheritedQualifiers.get(k)).name;
         	String qualifierValue = ((QualifierValueObject)inheritedQualifiers.get(k)).value;
+        	if(qualifierName.equalsIgnoreCase("Max") && qualifierValue.equalsIgnoreCase("-1")){
+        		qualifierValue = "null";
+        	} else if(qualifierName.equalsIgnoreCase("Min") && qualifierValue.equalsIgnoreCase("-1")){
+        		qualifierValue = "0";
+        	}
         	definedIn = ((QualifierValueObject)inheritedQualifiers.get(k)).definedIn;
         	Qualifier qualifierObject = qualifiersList.GetElement(qualifierName);
             addQualiferToValueTable(qualifierName, qualifierValue, definedIn, qualifierObject, -1, false);
@@ -3862,9 +3870,12 @@
 			QualifierValueObject object = editedValues[i];
 			// flavors patch *******
 			boolean setDefault = false;
-			String effectiveInheritedValue = FlavorsHelper.effectiveInheritedValue(element, object.name).getValue();
-			if(object.value.equalsIgnoreCase(effectiveInheritedValue) && !object.name.equalsIgnoreCase("Min")){
-				setDefault = true;
+			EffectiveInheritedValue inheritedValue = FlavorsHelper.effectiveInheritedValue(element, object.name);
+			if(inheritedValue != null){
+				String effectiveInheritedValue = inheritedValue.getValue();
+				if(object.value.equalsIgnoreCase(effectiveInheritedValue) && !object.name.equalsIgnoreCase("Min")){
+					setDefault = true;
+				}
 			}
 			//**********************
 			if(object.name.equalsIgnoreCase("Max")){