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

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

Modified Files:
	EditQualifiersDialog.java 
Log Message:
the disableOverride check should work now for all elements

Index: EditQualifiersDialog.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs/EditQualifiersDialog.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- EditQualifiersDialog.java	5 Aug 2005 07:55:14 -0000	1.12
+++ EditQualifiersDialog.java	5 Aug 2005 13:44:07 -0000	1.13
@@ -1585,8 +1585,8 @@
 			String octetstring_array = "octetstring[]";
 			Operation op = (Operation)element;
 			Type type = null;
-			if(op.getReturnResult("ReturnType") != null){
-				type = op.getReturnResult("ReturnType").getType();
+			if(op.getReturnResults().get(0) != null){
+				type = ((Parameter)op.getReturnResults().get(0)).getType();
 			}
 			if(type != null){
 				if(type.getName().equalsIgnoreCase(octetstring) || type.getName().equalsIgnoreCase(octetstring_array)){
@@ -3408,7 +3408,7 @@
     			if(stereo == null){
     				stereo = property.getApplicableStereotype("CIM::Key");
     			}
-    			if(newValue.equalsIgnoreCase("false")){
+    			if(stereo != null && newValue.equalsIgnoreCase("false")){
     				property.unapply(stereo);
     			} else if(newValue.equalsIgnoreCase("true")){
     				property.apply(stereo);
@@ -4124,12 +4124,14 @@
 		
 		for(int i = 0; i < removedValuesIndex; i++){
 			QualifierValueObject object = removedValues[i];
-			// get effective inherited qualifier value
-			EffectiveInheritedValue eiValue = FlavorsHelper.effectiveInheritedValue(element, object.name);
-			object.value = eiValue.getValue();
-			
-			// set default value
-			editValue(object, false);
+			if(FlavorsHelper.isNativeMappedQualifier(object.name)){
+				// get effective inherited qualifier value
+				EffectiveInheritedValue eiValue = FlavorsHelper.effectiveInheritedValue(element, object.name);
+				object.value = eiValue.getValue();
+				editValue(object, false);
+			} else {
+				editValue(object, true);
+			}
 		}
 		resetRemovedValues();
 	}