SUport for run sets and other significant improvements to parameterizaton and testing.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/icons/full/obj16/Model.gif b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/icons/full/obj16/Model.gif
index 33a997a..6e63b99 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/icons/full/obj16/Model.gif
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/icons/full/obj16/Model.gif
Binary files differ
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AParItemProviderAdapterFactory.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AParItemProviderAdapterFactory.java
index 5a04b4f..fd3247a 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AParItemProviderAdapterFactory.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AParItemProviderAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AParItemProviderAdapterFactory.java,v 1.3 2009/07/28 20:56:29 mparker Exp $
+ * $Id: AParItemProviderAdapterFactory.java,v 1.4 2009/08/03 17:15:49 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
@@ -168,6 +168,29 @@
}
/**
+ * This keeps track of the one adapter used for all {@link org.eclipse.amp.amf.parameters.aPar.Value} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ValueItemProvider valueItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.amp.amf.parameters.aPar.Value}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createValueAdapter() {
+ if (valueItemProvider == null) {
+ valueItemProvider = new ValueItemProvider(this);
+ }
+
+ return valueItemProvider;
+ }
+
+ /**
* This keeps track of the one adapter used for all {@link org.eclipse.amp.amf.parameters.aPar.IntValue} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -362,6 +385,7 @@
if (importItemProvider != null) importItemProvider.dispose();
if (incorporatesItemProvider != null) incorporatesItemProvider.dispose();
if (parameterItemProvider != null) parameterItemProvider.dispose();
+ if (valueItemProvider != null) valueItemProvider.dispose();
if (intValueItemProvider != null) intValueItemProvider.dispose();
if (realValueItemProvider != null) realValueItemProvider.dispose();
if (stringValueItemProvider != null) stringValueItemProvider.dispose();
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/BooleanValueItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/BooleanValueItemProvider.java
index b1ab41c..5d2eb30 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/BooleanValueItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/BooleanValueItemProvider.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: BooleanValueItemProvider.java,v 1.3 2009/07/28 20:56:29 mparker Exp $
+ * $Id: BooleanValueItemProvider.java,v 1.4 2009/08/03 17:15:49 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
@@ -37,7 +37,7 @@
* @generated
*/
public class BooleanValueItemProvider
- extends ItemProviderAdapter
+ extends ValueItemProvider
implements
IEditingDomainItemProvider,
IStructuredItemContentProvider,
@@ -149,15 +149,4 @@
super.collectNewChildDescriptors(newChildDescriptors, object);
}
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return AParEditPlugin.INSTANCE;
- }
-
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/IntValueItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/IntValueItemProvider.java
index 8d42198..cf3c658 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/IntValueItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/IntValueItemProvider.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: IntValueItemProvider.java,v 1.1 2009/07/18 01:07:46 mparker Exp $
+ * $Id: IntValueItemProvider.java,v 1.2 2009/08/03 17:15:49 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
@@ -36,7 +36,7 @@
* @generated
*/
public class IntValueItemProvider
- extends ItemProviderAdapter
+ extends ValueItemProvider
implements
IEditingDomainItemProvider,
IStructuredItemContentProvider,
@@ -145,15 +145,4 @@
super.collectNewChildDescriptors(newChildDescriptors, object);
}
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return AParEditPlugin.INSTANCE;
- }
-
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ModelItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ModelItemProvider.java
index 0807298..b998f8e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ModelItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ModelItemProvider.java
@@ -2,25 +2,20 @@
* <copyright>
* </copyright>
*
- * $Id: ModelItemProvider.java,v 1.3 2009/07/28 20:56:29 mparker Exp $
+ * $Id: ModelItemProvider.java,v 1.4 2009/08/03 17:15:49 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
-
import java.util.Collection;
import java.util.List;
import org.eclipse.amp.amf.parameters.aPar.AParFactory;
import org.eclipse.amp.amf.parameters.aPar.AParPackage;
import org.eclipse.amp.amf.parameters.aPar.Model;
-
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -33,23 +28,16 @@
import org.eclipse.emf.edit.provider.ViewerNotification;
/**
- * This is the item provider adapter for a {@link org.eclipse.amp.amf.parameters.aPar.Model} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.amp.amf.parameters.aPar.Model} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @generated
*/
-public class ModelItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+public class ModelItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public ModelItemProvider(AdapterFactory adapterFactory) {
@@ -57,9 +45,8 @@
}
/**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -73,33 +60,26 @@
}
/**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Model_name_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Model_name_feature", "_UI_Model_type"),
- AParPackage.Literals.MODEL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Model_name_feature"),
+ getString("_UI_PropertyDescriptor_description",
+ "_UI_Model_name_feature", "_UI_Model_type"),
+ AParPackage.Literals.MODEL__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
@Override
@@ -114,8 +94,8 @@
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -127,9 +107,8 @@
}
/**
- * This returns Model.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns Model.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -138,24 +117,24 @@
}
/**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
*/
@Override
public String getText(Object object) {
- String label = ((Model)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_Model_type") :
- getString("_UI_Model_type") + " " + label;
+ String label = ((Model) object).getName();
+ if (label == null) {
+ label = ((Model) object).eResource().getURI().lastSegment();
+ }
+ return label == null || label.length() == 0 ? getString("_UI_Model_type") : label;
}
/**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
+ * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
@Override
@@ -176,36 +155,28 @@
}
/**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
+ * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.MODEL__MODEL,
- AParFactory.eINSTANCE.createImport()));
+ newChildDescriptors.add(createChildParameter(AParPackage.Literals.MODEL__MODEL, AParFactory.eINSTANCE
+ .createImport()));
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.MODEL__INCORPORATES,
- AParFactory.eINSTANCE.createIncorporates()));
+ newChildDescriptors.add(createChildParameter(AParPackage.Literals.MODEL__INCORPORATES, AParFactory.eINSTANCE
+ .createIncorporates()));
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.MODEL__PARAMETERS,
- AParFactory.eINSTANCE.createParameter()));
+ newChildDescriptors.add(createChildParameter(AParPackage.Literals.MODEL__PARAMETERS, AParFactory.eINSTANCE
+ .createParameter()));
}
/**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ParameterItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ParameterItemProvider.java
index 72ac749..e1a6fc6 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ParameterItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ParameterItemProvider.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ParameterItemProvider.java,v 1.3 2009/07/28 20:56:29 mparker Exp $
+ * $Id: ParameterItemProvider.java,v 1.4 2009/08/03 17:15:49 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
@@ -13,14 +13,10 @@
import org.eclipse.amp.amf.parameters.aPar.AParFactory;
import org.eclipse.amp.amf.parameters.aPar.AParPackage;
import org.eclipse.amp.amf.parameters.aPar.Parameter;
-
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -31,12 +27,6 @@
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.metaabm.MetaABMFactory;
-
-import org.metaabm.act.MetaABMActFactory;
-
-import org.metaabm.function.MetaABMFunctionFactory;
-
/**
* This is the item provider adapter for a {@link org.eclipse.amp.amf.parameters.aPar.Parameter} object.
* <!-- begin-user-doc -->
@@ -44,13 +34,13 @@
* @generated
*/
public class ParameterItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+extends ItemProviderAdapter
+implements
+IEditingDomainItemProvider,
+IStructuredItemContentProvider,
+ITreeItemContentProvider,
+IItemLabelProvider,
+IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -85,18 +75,18 @@
*/
protected void addAttributePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Parameter_attribute_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Parameter_attribute_feature", "_UI_Parameter_type"),
- AParPackage.Literals.PARAMETER__ATTRIBUTE,
- true,
- false,
- true,
- null,
- null,
- null));
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_Parameter_attribute_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Parameter_attribute_feature", "_UI_Parameter_type"),
+ AParPackage.Literals.PARAMETER__ATTRIBUTE,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
}
/**
@@ -137,18 +127,18 @@
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Parameter"));
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/" + "Parameter"));
}
/**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
*/
@Override
public String getText(Object object) {
- return getString("_UI_Parameter_type");
+ Parameter param = (Parameter) object;
+ return param.getAttribute().getLabel() + "=" + param.getValue();
}
/**
@@ -182,319 +172,29 @@
super.collectNewChildDescriptors(newChildDescriptors, object);
newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- AParFactory.eINSTANCE.createModel()));
+ (createChildParameter
+ (AParPackage.Literals.PARAMETER__VALUE,
+ AParFactory.eINSTANCE.createValue()));
newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- AParFactory.eINSTANCE.createImport()));
+ (createChildParameter
+ (AParPackage.Literals.PARAMETER__VALUE,
+ AParFactory.eINSTANCE.createIntValue()));
newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- AParFactory.eINSTANCE.createIncorporates()));
+ (createChildParameter
+ (AParPackage.Literals.PARAMETER__VALUE,
+ AParFactory.eINSTANCE.createRealValue()));
newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- AParFactory.eINSTANCE.createParameter()));
+ (createChildParameter
+ (AParPackage.Literals.PARAMETER__VALUE,
+ AParFactory.eINSTANCE.createStringValue()));
newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- AParFactory.eINSTANCE.createIntValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- AParFactory.eINSTANCE.createRealValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- AParFactory.eINSTANCE.createStringValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- AParFactory.eINSTANCE.createBooleanValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSAttribute()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSAttributeArray()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSState()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSStateValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSAgent()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSContext()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSContinuousSpace()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSGrid()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSNetwork()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSGeography()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSValueLayer()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSStyle2D()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSStyleShape()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSStyle3D()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFactory.eINSTANCE.createSImplementation()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFArgumentPrototype()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFArgumentArrayPrototype()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFOperator()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFLogicalOperator()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFGenericFunction()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFGenericLogical()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFLibrary()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFImplementedLibrary()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMFunctionFactory.eINSTANCE.createFMultiArgumentPrototype()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAInput()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createALiteral()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAMultiValue()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createASelect()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAGroup()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createASchedule()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createARule()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createABuild()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAInitialize()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAMethod()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAAny()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAAll()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createANone()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAQuery()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAEvaluate()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAWatch()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createASet()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createACreateAgents()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createACreateShapedAgents()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createALoadAgents()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createALoadShapedAgents()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createABuildNetwork()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createABuildSpace()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createABuildGeography()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createABuildGrid()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAMove()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createALeave()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createADie()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAConnect()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createADisconnect()));
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.PARAMETER__VALUE,
- MetaABMActFactory.eINSTANCE.createAReplace()));
+ (createChildParameter
+ (AParPackage.Literals.PARAMETER__VALUE,
+ AParFactory.eINSTANCE.createBooleanValue()));
}
/**
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/RealValueItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/RealValueItemProvider.java
index 5cc7842..810da6a 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/RealValueItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/RealValueItemProvider.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: RealValueItemProvider.java,v 1.1 2009/07/28 20:56:29 mparker Exp $
+ * $Id: RealValueItemProvider.java,v 1.2 2009/08/03 17:15:49 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
@@ -12,12 +12,8 @@
import org.eclipse.amp.amf.parameters.aPar.AParPackage;
import org.eclipse.amp.amf.parameters.aPar.RealValue;
-
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -26,7 +22,6 @@
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
/**
@@ -36,13 +31,13 @@
* @generated
*/
public class RealValueItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
+extends ValueItemProvider
+implements
+IEditingDomainItemProvider,
+IStructuredItemContentProvider,
+ITreeItemContentProvider,
+IItemLabelProvider,
+IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -77,18 +72,18 @@
*/
protected void addValuePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_RealValue_value_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_RealValue_value_feature", "_UI_RealValue_type"),
- AParPackage.Literals.REAL_VALUE__VALUE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_RealValue_value_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_RealValue_value_feature", "_UI_RealValue_type"),
+ AParPackage.Literals.REAL_VALUE__VALUE,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
}
/**
@@ -103,17 +98,13 @@
}
/**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
*/
@Override
public String getText(Object object) {
- String label = ((RealValue)object).getValue();
- return label == null || label.length() == 0 ?
- getString("_UI_RealValue_type") :
- getString("_UI_RealValue_type") + " " + label;
+ return ((RealValue) object).getValue();
}
/**
@@ -147,15 +138,4 @@
super.collectNewChildDescriptors(newChildDescriptors, object);
}
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return AParEditPlugin.INSTANCE;
- }
-
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/StringValueItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/StringValueItemProvider.java
index 73bdb49..b776925 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/StringValueItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/StringValueItemProvider.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StringValueItemProvider.java,v 1.1 2009/07/18 01:07:51 mparker Exp $
+ * $Id: StringValueItemProvider.java,v 1.2 2009/08/03 17:15:49 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
@@ -36,7 +36,7 @@
* @generated
*/
public class StringValueItemProvider
- extends ItemProviderAdapter
+ extends ValueItemProvider
implements
IEditingDomainItemProvider,
IStructuredItemContentProvider,
@@ -147,15 +147,4 @@
super.collectNewChildDescriptors(newChildDescriptors, object);
}
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return AParEditPlugin.INSTANCE;
- }
-
}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ValueItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ValueItemProvider.java
new file mode 100644
index 0000000..1f4ee2f
--- /dev/null
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ValueItemProvider.java
@@ -0,0 +1,123 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ValueItemProvider.java,v 1.3 2009/08/03 17:15:49 mparker Exp $
+ */
+package org.eclipse.amp.amf.parameters.aPar.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.amp.amf.parameters.aPar.Value} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ValueItemProvider
+ extends ItemProviderAdapter
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ValueItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This returns Value.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/Value"));
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ return getString("_UI_Value_type");
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return AParEditPlugin.INSTANCE;
+ }
+
+}
