ASSIGNED - bug 413966: Handling of null-values should work everywhere!

https://bugs.eclipse.org/bugs/show_bug.cgi?id=413966

12 files changed, 34 insertions, 37 deletions

diff --git a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrUtil.java b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrUtil.java
index 51eb8d89..2e3feb5e 100644
--- a/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrUtil.java
+++ b/org.eclipse.rmf.reqif10.pror.edit/src/org/eclipse/rmf/reqif10/pror/util/ProrUtil.java
@@ -142,7 +142,7 @@ public final class ProrUtil {
 	 * case this method takes care of that as well.

 	 */

 	public static void setTheValue(final AttributeValue av, Object value,

-			SpecElementWithAttributes parent,

+			Object parent,

 			final Object affectedObject, EditingDomain ed) {

 

 		// The Command that sets the value

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellEditorProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellEditorProvider.java
index a973da3d..6e4fd4f7 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellEditorProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractProrCellEditorProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.rmf.reqif10.DatatypeDefinitionInteger;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionReal;

 import org.eclipse.rmf.reqif10.DatatypeDefinitionString;

 import org.eclipse.rmf.reqif10.DatatypeDefinitionXHTML;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.rmf.reqif10.SpecHierarchy;

 import org.eclipse.rmf.reqif10.common.util.ReqIF10Util;

 

@@ -71,20 +70,22 @@ public abstract class AbstractProrCellEditorProvider extends
 			return null;

 		}

 

-		// Parent may be SpecHierarchy or SpecElement, but we need SpecElement.

-		SpecElementWithAttributes specElement = parent instanceof SpecHierarchy ? ((SpecHierarchy) parent)

-				.getObject() : ((SpecElementWithAttributes) parent);

+		// Parent may be SpecHierarchy or SpecElement or Attribute (default value).

+		if (parent instanceof SpecHierarchy) parent = ((SpecHierarchy) parent)

+				.getObject();

+

 		if (dd instanceof DatatypeDefinitionBoolean) {

 			return new ProrCheckboxCellEditor(agileGrid, editingDomain,

-					specElement);

-		} else if (dd instanceof DatatypeDefinitionDate) {

+					parent);

+		}

+		else if (dd instanceof DatatypeDefinitionDate) {

 			return new ProrDateCellEditor(agileGrid, editingDomain,

-					(SpecElementWithAttributes) specElement,

+					parent,

 					affectedObject);

 		} else if (dd instanceof DatatypeDefinitionInteger) {

 			DatatypeDefinitionInteger ddi = (DatatypeDefinitionInteger) dd;

 			ProrIntegerCellEditor integerCellEditor = new ProrIntegerCellEditor(

-					agileGrid, (SpecElementWithAttributes) specElement,

+					agileGrid, parent,

 					editingDomain, affectedObject);

 			integerCellEditor.setRange(ddi.getMin(), ddi.getMax());

 			return integerCellEditor;

@@ -92,14 +93,14 @@ public abstract class AbstractProrCellEditorProvider extends
 			DatatypeDefinitionReal ddr = (DatatypeDefinitionReal) dd;

 			ProrRealCellEditor realCellEditor = new ProrRealCellEditor(

 					agileGrid, editingDomain,

-					(SpecElementWithAttributes) specElement, affectedObject);

+					parent, affectedObject);

 			realCellEditor.setRange(ddr.getMin(), ddr.getMax());

 			return realCellEditor;

 		} else if (dd instanceof DatatypeDefinitionString) {

 			DatatypeDefinitionString dds = (DatatypeDefinitionString) dd;

 			ProrStringCellEditor stringCellEditor = new ProrStringCellEditor(

 					agileGrid, editingDomain,

-					(SpecElementWithAttributes) specElement, affectedObject);

+					parent, affectedObject);

 			stringCellEditor.setMaxLength(dds.getMaxLength() != null ? dds

 					.getMaxLength() : new BigInteger(Integer.MAX_VALUE + ""));

 			return stringCellEditor;

@@ -109,16 +110,16 @@ public abstract class AbstractProrCellEditorProvider extends
 					.getAttributeDefinition(value)).isMultiValued();

 			if (multiValued == null || multiValued.booleanValue() == false) {

 				return new ProrEnumerationSingleValueCellEditor(agileGrid, dde,

-						specElement,

+						parent,

 						editingDomain, adapterFactory);

 			} else {

 				return new ProrEnumerationMultiValueCellEditor(agileGrid, dde,

-						specElement,

+						parent,

 						editingDomain, adapterFactory);

 			}

 		} else if (dd instanceof DatatypeDefinitionXHTML) {

 			ProrXhtmlSimplifiedCellEditor stringCellEditor = new ProrXhtmlSimplifiedCellEditor(

-					agileGrid, editingDomain, specElement, affectedObject);

+					agileGrid, editingDomain, parent, affectedObject);

 			return stringCellEditor;

 		}

 		throw new IllegalArgumentException("No editor for: " + value);

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditor.java
index 49504eb3..0c18abc3 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCellEditor.java
@@ -16,7 +16,6 @@ import org.agilemore.agilegrid.editors.TextCellEditor;
 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.jface.action.IStatusLineManager;

 import org.eclipse.rmf.reqif10.AttributeValue;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.rmf.reqif10.SpecHierarchy;

 import org.eclipse.rmf.reqif10.common.util.ReqIF10Util;

 import org.eclipse.swt.SWT;

@@ -39,10 +38,10 @@ public abstract class ProrCellEditor extends TextCellEditor {
 	protected AttributeValue attributeValue;

 	protected final EditingDomain editingDomain;

 	protected Object affectedObject;

-	protected SpecElementWithAttributes parent;

+	protected Object parent;

 

 	public ProrCellEditor(AgileGrid agileGrid, EditingDomain editingDomain,

-			SpecElementWithAttributes parent,

+			Object parent,

 			Object affectedObject) {

 		super(agileGrid);

 		this.editingDomain = editingDomain;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCheckboxCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCheckboxCellEditor.java
index e3cd9639..bc452692 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCheckboxCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrCheckboxCellEditor.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.rmf.reqif10.AttributeValueBoolean;

 import org.eclipse.rmf.reqif10.ReqIF10Package;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Control;

 

@@ -39,10 +38,10 @@ public class ProrCheckboxCellEditor extends CellEditor {
 

 	private EditingDomain domain;

 	private AttributeValueBoolean attributeValue;

-	private SpecElementWithAttributes parent;

+	private Object parent;

 

 	public ProrCheckboxCellEditor(AgileGrid agileGrid, EditingDomain domain,

-			SpecElementWithAttributes parent) {

+			Object parent) {

 		super(agileGrid, SWT.NONE);

 		this.domain = domain;

 		this.parent = parent;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrDateCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrDateCellEditor.java
index 5a4f6c72..251b8e92 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrDateCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrDateCellEditor.java
@@ -23,14 +23,13 @@ import org.agilemore.agilegrid.AgileGrid;
 import org.agilemore.agilegrid.ICellEditorValidator;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.rmf.reqif10.AttributeValue;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.rmf.reqif10.common.util.ReqIF10Util;

 import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

 

 public class ProrDateCellEditor extends ProrCellEditor {

 

 	public ProrDateCellEditor(AgileGrid agileGrid, EditingDomain editingDomain,

-			SpecElementWithAttributes parent,

+			Object parent,

 			Object affectedObject) {

 		super(agileGrid, editingDomain, parent, affectedObject);

 		this.setValidator(new ICellEditorValidator() {

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationMultiValueCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationMultiValueCellEditor.java
index 90730be3..9dd8f98b 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationMultiValueCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationMultiValueCellEditor.java
@@ -24,7 +24,6 @@ import org.eclipse.rmf.reqif10.AttributeValueEnumeration;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration;

 import org.eclipse.rmf.reqif10.EnumValue;

 import org.eclipse.rmf.reqif10.ReqIF10Package;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Combo;

 import org.eclipse.swt.widgets.Composite;

@@ -50,11 +49,11 @@ public class ProrEnumerationMultiValueCellEditor extends PopupCellEditor {
 	 */

 	private AttributeValueEnumeration attributeValue;

 	private final EditingDomain editingDomain;

-	private SpecElementWithAttributes parent;

+	private Object parent;

 

 	public ProrEnumerationMultiValueCellEditor(AgileGrid agileGrid,

 			DatatypeDefinitionEnumeration dde,

-			SpecElementWithAttributes parent, EditingDomain editingDomain,

+			Object parent, EditingDomain editingDomain,

 			AdapterFactory adapterFactory) {

 		super(agileGrid);

 		this.dde = dde;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationSingleValueCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationSingleValueCellEditor.java
index f9fa8303..7913d0d6 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationSingleValueCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrEnumerationSingleValueCellEditor.java
@@ -25,7 +25,6 @@ import org.eclipse.rmf.reqif10.AttributeValueEnumeration;
 import org.eclipse.rmf.reqif10.DatatypeDefinitionEnumeration;

 import org.eclipse.rmf.reqif10.EnumValue;

 import org.eclipse.rmf.reqif10.ReqIF10Package;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Combo;

 import org.eclipse.swt.widgets.Control;

@@ -36,11 +35,11 @@ public class ProrEnumerationSingleValueCellEditor extends CellEditor {
 	private ArrayList<EnumValue> itemList;

 	private final EditingDomain editingDomain;

 	private AttributeValueEnumeration attributeValue;

-	private SpecElementWithAttributes parent;

+	private Object parent;

 

 	public ProrEnumerationSingleValueCellEditor(AgileGrid agileGrid,

 			DatatypeDefinitionEnumeration dde,

-			SpecElementWithAttributes parent, EditingDomain editingDomain,

+			Object parent, EditingDomain editingDomain,

 			AdapterFactory adapterFactory) {

 		super(agileGrid);

 		this.editingDomain = editingDomain;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrIntegerCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrIntegerCellEditor.java
index 9c778a4c..da2b463f 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrIntegerCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrIntegerCellEditor.java
@@ -15,7 +15,6 @@ import java.math.BigInteger;
 import org.agilemore.agilegrid.AgileGrid;

 import org.agilemore.agilegrid.ICellEditorValidator;

 import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

 

 public class ProrIntegerCellEditor extends ProrCellEditor {

@@ -24,7 +23,7 @@ public class ProrIntegerCellEditor extends ProrCellEditor {
 	private BigInteger max;

 

 	public ProrIntegerCellEditor(AgileGrid agileGrid,

-			SpecElementWithAttributes parent,

+			Object parent,

 			EditingDomain editingDomain, Object affectedObject) {

 		super(agileGrid, editingDomain, parent, affectedObject);

 		this.setValidator(new ICellEditorValidator() {

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRealCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRealCellEditor.java
index 363a6231..4d6f893d 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRealCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrRealCellEditor.java
@@ -13,7 +13,6 @@ package org.eclipse.rmf.reqif10.pror.editor.agilegrid;
 import org.agilemore.agilegrid.AgileGrid;

 import org.agilemore.agilegrid.ICellEditorValidator;

 import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

 

 public class ProrRealCellEditor extends ProrCellEditor {

@@ -22,7 +21,7 @@ public class ProrRealCellEditor extends ProrCellEditor {
 	private double max = Double.MAX_VALUE;

 

 	public ProrRealCellEditor(AgileGrid agileGrid, EditingDomain editingDomain,

-			SpecElementWithAttributes parent,

+			Object parent,

 			Object affectedObject) {

 		super(agileGrid, editingDomain, parent, affectedObject);

 		this.setValidator(new ICellEditorValidator() {

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrStringCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrStringCellEditor.java
index f9d48bda..41358200 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrStringCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrStringCellEditor.java
@@ -15,7 +15,6 @@ import java.math.BigInteger;
 import org.agilemore.agilegrid.AgileGrid;

 import org.agilemore.agilegrid.ICellEditorValidator;

 import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.rmf.reqif10.pror.util.ProrUtil;

 

 public class ProrStringCellEditor extends ProrCellEditor {

@@ -23,7 +22,7 @@ public class ProrStringCellEditor extends ProrCellEditor {
 	private BigInteger maxLength;

 	

 	public ProrStringCellEditor(AgileGrid agileGrid,

-			EditingDomain editingDomain, SpecElementWithAttributes parent,

+			EditingDomain editingDomain, Object parent,

 			Object affectedObject) {

 		super(agileGrid, editingDomain, parent, affectedObject);

 		this.setValidator(new ICellEditorValidator() {

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrXhtmlSimplifiedCellEditor.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrXhtmlSimplifiedCellEditor.java
index e49356f6..ecb4de8b 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrXhtmlSimplifiedCellEditor.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/ProrXhtmlSimplifiedCellEditor.java
@@ -21,7 +21,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.rmf.reqif10.AttributeValueXHTML;

 import org.eclipse.rmf.reqif10.ReqIF10Factory;

 import org.eclipse.rmf.reqif10.ReqIF10Package;

-import org.eclipse.rmf.reqif10.SpecElementWithAttributes;

 import org.eclipse.rmf.reqif10.XhtmlContent;

 import org.eclipse.rmf.reqif10.pror.editor.preferences.PreferenceConstants;

 import org.eclipse.rmf.reqif10.pror.editor.presentation.Reqif10EditorPlugin;

@@ -38,7 +37,7 @@ public class ProrXhtmlSimplifiedCellEditor extends ProrCellEditor {
 	private AttributeValueXHTML attributeValue;

 

 	public ProrXhtmlSimplifiedCellEditor(AgileGrid agileGrid,

-			EditingDomain editingDomain, SpecElementWithAttributes parent,

+			EditingDomain editingDomain, Object parent,

 			Object affectedObject) {

 		super(agileGrid, editingDomain, parent, SWT.WRAP);

 		this.parent = parent;

diff --git a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyContentProvider.java b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyContentProvider.java
index cb314349..b3c4b95e 100644
--- a/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyContentProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.editor/src/org/eclipse/rmf/reqif10/pror/editor/propertiesview/ProrPropertyContentProvider.java
@@ -263,7 +263,12 @@ public class ProrPropertyContentProvider extends AbstractContentProvider {
 			Object feature = descriptor.getFeature(content);
 			return feature == ReqIF10Package.Literals.SPEC_ELEMENT_WITH_ATTRIBUTES__VALUES
 					|| descriptor.getFeature(content) == ReqIF10Package.Literals.ATTRIBUTE_VALUE_BOOLEAN__THE_VALUE
-;
+					|| descriptor.getFeature(content) == ReqIF10Package.Literals.ATTRIBUTE_VALUE_DATE__THE_VALUE
+					|| descriptor.getFeature(content) == ReqIF10Package.Literals.ATTRIBUTE_VALUE_ENUMERATION__VALUES
+					|| descriptor.getFeature(content) == ReqIF10Package.Literals.ATTRIBUTE_VALUE_INTEGER__THE_VALUE
+					|| descriptor.getFeature(content) == ReqIF10Package.Literals.ATTRIBUTE_VALUE_REAL__THE_VALUE
+					|| descriptor.getFeature(content) == ReqIF10Package.Literals.ATTRIBUTE_VALUE_STRING__THE_VALUE
+					|| descriptor.getFeature(content) == ReqIF10Package.Literals.ATTRIBUTE_VALUE_XHTML__THE_VALUE;
 		}
 
 		public Object getContent(int column) {