Make metaabm model extendable. Add system dynamic model elements and an execution plugin.
Remove dependecies to 3D plugins.
Bugfix: use a custom path in project wizard.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..30263e5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+bin/
+.settings/
\ No newline at end of file
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/plugin.properties b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/plugin.properties
index 2493d9f..a380fb6 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/plugin.properties
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/plugin.properties
@@ -561,3 +561,11 @@
 _UI_ACause_result_feature = Result
 _UI_ADerive_type = Derive
 _UI_SAttribute_derived_feature = Derived
+_UI_IAgentChild_type = IAgent Child
+_UI_SAgent_children_feature = Children
+_UI_IAgentChild_name_feature = Name
+_UI_IAgentChild_parent_feature = Parent
+_UI_IAttributeChild_type = IAttribute Child
+_UI_IModelExtension_type = IModel Extension
+_UI_SAttribute_children_feature = Children
+_UI_IAttributeChild_parent_feature = Parent
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAccessorItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAccessorItemProvider.java
index f49a1ab..7527195 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAccessorItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAccessorItemProvider.java
@@ -39,127 +39,120 @@
 import org.metaabm.act.AAccessor;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AAccessor}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AAccessor} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class AAccessorItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public AAccessorItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AAccessorItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AAccessorItemProvider(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);
+	/**
+	 * 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);
 
-            addAttributePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addAttributePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                .getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAccessor_attribute_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AAccessor_attribute_feature", "_UI_AAccessor_type"),
-            MetaABMActPackage.Literals.AACCESSOR__ATTRIBUTE, true, false, true, null,
-            getString("_UI_ActPropertyCategory"), null) {
-            @SuppressWarnings("unchecked")
-            public Collection<?> getChoiceOfValues(Object object) {
-                Collection<IValue> original = (Collection<IValue>) super.getChoiceOfValues(object);
-                Collection<IValue> potential = new ArrayList<IValue>();
-                AAccessor act = (AAccessor) object;
-                if ((act.getSelected() != null) && (act.getSelected().getAgent() != null)) {
-                    // SAgent accessed = act.getSelected().getAgent();
-                    for (IValue candidate : original) {
-                        if (act.isReachable(candidate)) {
-                            potential.add(candidate);
-                        }
-                    }
-                }
-                return potential;
-            }
+	/**
+	 * This adds a property descriptor for the Attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addAttributePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAccessor_attribute_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAccessor_attribute_feature", "_UI_AAccessor_type"), MetaABMActPackage.Literals.AACCESSOR__ATTRIBUTE, true, false, true, null, getString("_UI_ActPropertyCategory"), null) {
+			@SuppressWarnings("unchecked")
+			public Collection<?> getChoiceOfValues(Object object) {
+				Collection<IValue> original = (Collection<IValue>) super.getChoiceOfValues(object);
+				Collection<IValue> potential = new ArrayList<IValue>();
+				AAccessor act = (AAccessor) object;
+				if ((act.getSelected() != null) && (act.getSelected().getAgent() != null)) {
+					// SAgent accessed = act.getSelected().getAgent();
+					for (IValue candidate : original) {
+						if (act.isReachable(candidate)) {
+							potential.add(candidate);
+						}
+					}
+				}
+				return potential;
+			}
 
-        });
-    }
+		});
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(AAccessor.class)) {
-            case MetaABMActPackage.AACCESSOR__ATTRIBUTE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AAccessor.class)) {
+			case MetaABMActPackage.AACCESSOR__ATTRIBUTE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
 
-    /**
-     * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of the
-     * children that can be created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-    }
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of the
+	 * children that can be created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
 
-    public String suggestLabel(IID object) {
-        AAccessor acc = (AAccessor) object;
-        return super.suggestLabel(object) + " "
-            + ((acc.getAttribute() != null) ? acc.getAttribute().getLabel() : "[?]");
-    }
+	public String suggestLabel(IID object) {
+		AAccessor acc = (AAccessor) object;
+		return super.suggestLabel(object) + " " + ((acc.getAttribute() != null) ? acc.getAttribute().getLabel() : "[?]");
+	}
 
-    // public String suggestLabel(IID object) {
-    // AAccessor acc = (AAccessor) object;
-    // return super.suggestLabel(object)
-    // + (acc.getAttribute() != null ? " " + acc.getAttribute().getLabel() : "
-    // [Unspecified]");
-    // }
-    //
-    // public String suggestID(IID object) {
-    // AAccessor acc = (AAccessor) object;
-    // return super.suggestID(object)
-    // + (acc.getAttribute() != null ? acc.getAttribute().getID() :
-    // "UnspecifiedAttribute");
-    // }
+	// public String suggestLabel(IID object) {
+	// AAccessor acc = (AAccessor) object;
+	// return super.suggestLabel(object)
+	// + (acc.getAttribute() != null ? " " + acc.getAttribute().getLabel() : "
+	// [Unspecified]");
+	// }
+	//
+	// public String suggestID(IID object) {
+	// AAccessor acc = (AAccessor) object;
+	// return super.suggestID(object)
+	// + (acc.getAttribute() != null ? acc.getAttribute().getID() :
+	// "UnspecifiedAttribute");
+	// }
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AActItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AActItemProvider.java
index 65ab922..72591a1 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AActItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AActItemProvider.java
@@ -73,876 +73,780 @@
 import org.metaabm.provider.IIDItemProvider;
 import org.metaabm.provider.MetaABMEditPlugin;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.AAct} object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AActItemProvider extends IIDItemProvider implements IEditingDomainItemProvider,
-IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+public class AActItemProvider extends IIDItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
 
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public AActItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AActItemProvider(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);
+	/**
+	 * 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);
 
-            addSourcesPropertyDescriptor(object);
-            addTargetsPropertyDescriptor(object);
-            addReferencePropertyDescriptor(object);
-            addGroupPropertyDescriptor(object);
-            addSelectedPropertyDescriptor(object);
-            addAllSourcesPropertyDescriptor(object);
-            addAllTargetsPropertyDescriptor(object);
-            addRootSelectedPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addSourcesPropertyDescriptor(object);
+			addTargetsPropertyDescriptor(object);
+			addReferencePropertyDescriptor(object);
+			addGroupPropertyDescriptor(object);
+			addSelectedPropertyDescriptor(object);
+			addAllSourcesPropertyDescriptor(object);
+			addAllTargetsPropertyDescriptor(object);
+			addRootSelectedPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Sources feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addSourcesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                          getResourceLocator(),
-                                          getString("_UI_AAct_sources_feature"),
-                                          getString("_UI_PropertyDescriptor_description",
-                                                    "_UI_AAct_sources_feature", "_UI_AAct_type"),
-                                                    MetaABMActPackage.Literals.AACT__SOURCES, true, false, true, null,
-                                                    getString("_UI_RelationsPropertyCategory"),
-                                                    new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Sources feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSourcesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAct_sources_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAct_sources_feature", "_UI_AAct_type"), MetaABMActPackage.Literals.AACT__SOURCES, true, false, true, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the Targets feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addTargetsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                          getResourceLocator(),
-                                          getString("_UI_AAct_targets_feature"),
-                                          getString("_UI_PropertyDescriptor_description",
-                                                    "_UI_AAct_targets_feature", "_UI_AAct_type"),
-                                                    MetaABMActPackage.Literals.AACT__TARGETS, true, false, true, null,
-                                                    getString("_UI_RelationsPropertyCategory"),
-                                                    new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Targets feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTargetsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAct_targets_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAct_targets_feature", "_UI_AAct_type"), MetaABMActPackage.Literals.AACT__TARGETS, true, false, true, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the Reference feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addReferencePropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                          getResourceLocator(),
-                                          getString("_UI_AAct_reference_feature"),
-                                          getString("_UI_PropertyDescriptor_description",
-                                                    "_UI_AAct_reference_feature", "_UI_AAct_type"),
-                                                    MetaABMActPackage.Literals.AACT__REFERENCE, false, false, true, null,
-                                                    getString("_UI_RelationsPropertyCategory"),
-                                                    new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Reference feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addReferencePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAct_reference_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAct_reference_feature", "_UI_AAct_type"), MetaABMActPackage.Literals.AACT__REFERENCE, false, false, true, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the Group feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addGroupPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                          getResourceLocator(),
-                                          getString("_UI_AAct_group_feature"),
-                                          getString("_UI_PropertyDescriptor_description",
-                                                    "_UI_AAct_group_feature", "_UI_AAct_type"),
-                                                    MetaABMActPackage.Literals.AACT__GROUP, false, false, true, null,
-                                                    getString("_UI_RelationsPropertyCategory"),
-                                                    new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Group feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addGroupPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAct_group_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAct_group_feature", "_UI_AAct_type"), MetaABMActPackage.Literals.AACT__GROUP, false, false, true, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the Selected feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addSelectedPropertyDescriptor(Object object) {
-        ItemPropertyDescriptor createItemPropertyDescriptor = new ItemPropertyDescriptor(
-                                                                                         ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                                                                                         getString("_UI_AAct_selected_feature"), getString("_UI_PropertyDescriptor_description",
-                                                                                                                                           "_UI_AAct_selected_feature", "_UI_AAct_type"),
-                                                                                                                                           MetaABMActPackage.Literals.AACT__SELECTED, true, true, true, null, getString("_UI_ActPropertyCategory"),
-                                                                                                                                           null) {
+	/**
+	 * This adds a property descriptor for the Selected feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addSelectedPropertyDescriptor(Object object) {
+		ItemPropertyDescriptor createItemPropertyDescriptor = new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAct_selected_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAct_selected_feature", "_UI_AAct_type"), MetaABMActPackage.Literals.AACT__SELECTED, true, true, true, null, getString("_UI_ActPropertyCategory"), null) {
 
-            @SuppressWarnings("unchecked")
-            public Collection<?> getChoiceOfValues(Object object) {
-                Collection<AAct> original = (Collection<AAct>) super.getChoiceOfValues(object);
-                Collection<AAct> potential = new ArrayList<AAct>();
-                for (AAct candidate : original) {
-                    if (((AAct) object).isTargetOf(candidate)) {
-                        potential.add(candidate);
-                    }
-                }
-                return potential;
-            }
+			@SuppressWarnings("unchecked")
+			public Collection<?> getChoiceOfValues(Object object) {
+				Collection<AAct> original = (Collection<AAct>) super.getChoiceOfValues(object);
+				Collection<AAct> potential = new ArrayList<AAct>();
+				for (AAct candidate : original) {
+					if (((AAct) object).isTargetOf(candidate)) {
+						potential.add(candidate);
+					}
+				}
+				return potential;
+			}
 
-        };
-        itemPropertyDescriptors.add(createItemPropertyDescriptor);
-    }
+		};
+		itemPropertyDescriptors.add(createItemPropertyDescriptor);
+	}
 
-    /**
-     * This adds a property descriptor for the All Sources feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addAllSourcesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                          getResourceLocator(),
-                                          getString("_UI_AAct_allSources_feature"),
-                                          getString("_UI_PropertyDescriptor_description",
-                                                    "_UI_AAct_allSources_feature", "_UI_AAct_type"),
-                                                    MetaABMActPackage.Literals.AACT__ALL_SOURCES, false, false, true,
-                                                    null, getString("_UI_RelationsPropertyCategory"),
-                                                    new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the All Sources feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAllSourcesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAct_allSources_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAct_allSources_feature", "_UI_AAct_type"), MetaABMActPackage.Literals.AACT__ALL_SOURCES, false, false, true, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the All Targets feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addAllTargetsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                          getResourceLocator(),
-                                          getString("_UI_AAct_allTargets_feature"),
-                                          getString("_UI_PropertyDescriptor_description",
-                                                    "_UI_AAct_allTargets_feature", "_UI_AAct_type"),
-                                                    MetaABMActPackage.Literals.AACT__ALL_TARGETS, false, false, true,
-                                                    null, getString("_UI_RelationsPropertyCategory"),
-                                                    new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the All Targets feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAllTargetsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAct_allTargets_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAct_allTargets_feature", "_UI_AAct_type"), MetaABMActPackage.Literals.AACT__ALL_TARGETS, false, false, true, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the Root Selected feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addRootSelectedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                          getResourceLocator(),
-                                          getString("_UI_AAct_rootSelected_feature"),
-                                          getString("_UI_PropertyDescriptor_description",
-                                                    "_UI_AAct_rootSelected_feature", "_UI_AAct_type"),
-                                                    MetaABMActPackage.Literals.AACT__ROOT_SELECTED, false, false, false,
-                                                    null, getString("_UI_RelationsPropertyCategory"),
-                                                    new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Root Selected feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addRootSelectedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAct_rootSelected_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAct_rootSelected_feature", "_UI_AAct_type"), MetaABMActPackage.Literals.AACT__ROOT_SELECTED, false, false, false, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    public void addTargets(EList<AAct> sources, EList<AAct> result) {
-        for (AAct source : sources) {
-            if (!result.contains(source)) {
-                result.add(source);
-            }
-            for (AAct target : source.getTargets()) {
-                AAct run = target;
-                while (run.getTargets().size() == 1 && run.getSources().size() == 1 && !result.contains(run)) {
-                    result.add(run);
-                    run = run.getTargets().get(0);
-                }
-            }
-            addTargets(source.getTargets(), result);
-        }
-    }
+	public void addTargets(EList<AAct> sources, EList<AAct> result) {
+		for (AAct source : sources) {
+			if (!result.contains(source)) {
+				result.add(source);
+			}
+			for (AAct target : source.getTargets()) {
+				AAct run = target;
+				while (run.getTargets().size() == 1 && run.getSources().size() == 1 && !result.contains(run)) {
+					result.add(run);
+					run = run.getTargets().get(0);
+				}
+			}
+			addTargets(source.getTargets(), result);
+		}
+	}
 
-    @SuppressWarnings("unchecked")
-    public Collection<?> getChildren(Object object) {
-        if (object instanceof ARoot) {
-            ARoot root = (ARoot) object;
-            EList<AAct> targets = new BasicEList(Collections.singleton(root));
-            // Collection<AAct> visited = new HashSet<AAct>();
-            // for (AAct members : root.getTargets()) {
-            //
-            // }
-            BasicEList result = new BasicEList();
-            addTargets(targets, result);
-            result.remove(root);
-            return result;
-        } else if (object instanceof AGroup) {
-            return super.getChildren(object);
-        }
-        return Collections.EMPTY_LIST;
-    }
+	@SuppressWarnings("unchecked")
+	public Collection<?> getChildren(Object object) {
+		if (object instanceof ARoot) {
+			ARoot root = (ARoot) object;
+			EList<AAct> targets = new BasicEList(Collections.singleton(root));
+			// Collection<AAct> visited = new HashSet<AAct>();
+			// for (AAct members : root.getTargets()) {
+			//
+			// }
+			BasicEList result = new BasicEList();
+			addTargets(targets, result);
+			result.remove(root);
+			return result;
+		} else if (object instanceof AGroup) {
+			return super.getChildren(object);
+		}
+		return Collections.EMPTY_LIST;
+	}
 
-    /**
-     * 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 -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            childrenFeatures = new ArrayList<EStructuralFeature>();
-            // if (object instanceof ARoot) {
-            childrenFeatures.add(MetaABMActPackage.Literals.AACT__TARGETS);
-            // }
-        }
-        return childrenFeatures;
-    }
+	/**
+	 * 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 -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			childrenFeatures = new ArrayList<EStructuralFeature>();
+			// if (object instanceof ARoot) {
+			childrenFeatures.add(MetaABMActPackage.Literals.AACT__TARGETS);
+			// }
+		}
+		return childrenFeatures;
+	}
 
-    @SuppressWarnings("unchecked")
-    public static CompoundCommand createActDragCommand(EditingDomain domain, int eventID, AAct sourceAct,
-            final AAct targetAct) {
-        CompoundCommand cmd = new CompoundCommand() {
-            /**
-             * @return
-             * @see org.eclipse.emf.common.command.CompoundCommand#getAffectedObjects()
-             */
-            public Collection<?> getAffectedObjects() {
-                return Collections.singleton(targetAct);
-            }
-        };
-        if (eventID == DragAndDropFeedback.DROP_LINK) {
-            cmd.append(AddCommand.create(domain, sourceAct, MetaABMActPackage.Literals.AACT__TARGETS, targetAct));
-        } else if (eventID == DragAndDropFeedback.DROP_COPY) {
-            // TODO copy doesn't behave perfectly, updates sometimes lag
-            Command create = CopyCommand.create(domain, targetAct);
-            cmd.appendAndExecute(create);
-            AAct newAct = (AAct) new ArrayList(create.getResult()).get(0);
-            cmd.appendAndExecute(AddCommand.create(domain, sourceAct, MetaABMActPackage.Literals.AACT__TARGETS, newAct));
-        } else if (eventID == DragAndDropFeedback.DROP_MOVE) {
-            cmd.append(AddCommand.create(domain, sourceAct, MetaABMActPackage.Literals.AACT__TARGETS, targetAct));
-            EList<AAct> sources = targetAct.getSources();
-            sources.remove(sourceAct);
-            for (AAct targetSource : sources) {
-                cmd.append(RemoveCommand.create(domain, targetSource, MetaABMActPackage.Literals.AACT__TARGETS,
-                                                targetAct));
-            }
-        }
-        return cmd;
-    }
+	@SuppressWarnings("unchecked")
+	public static CompoundCommand createActDragCommand(EditingDomain domain, int eventID, AAct sourceAct, final AAct targetAct) {
+		CompoundCommand cmd = new CompoundCommand() {
+			/**
+			 * @return
+			 * @see org.eclipse.emf.common.command.CompoundCommand#getAffectedObjects()
+			 */
+			public Collection<?> getAffectedObjects() {
+				return Collections.singleton(targetAct);
+			}
+		};
+		if (eventID == DragAndDropFeedback.DROP_LINK) {
+			cmd.append(AddCommand.create(domain, sourceAct, MetaABMActPackage.Literals.AACT__TARGETS, targetAct));
+		} else if (eventID == DragAndDropFeedback.DROP_COPY) {
+			// TODO copy doesn't behave perfectly, updates sometimes lag
+			Command create = CopyCommand.create(domain, targetAct);
+			cmd.appendAndExecute(create);
+			AAct newAct = (AAct) new ArrayList(create.getResult()).get(0);
+			cmd.appendAndExecute(AddCommand.create(domain, sourceAct, MetaABMActPackage.Literals.AACT__TARGETS, newAct));
+		} else if (eventID == DragAndDropFeedback.DROP_MOVE) {
+			cmd.append(AddCommand.create(domain, sourceAct, MetaABMActPackage.Literals.AACT__TARGETS, targetAct));
+			EList<AAct> sources = targetAct.getSources();
+			sources.remove(sourceAct);
+			for (AAct targetSource : sources) {
+				cmd.append(RemoveCommand.create(domain, targetSource, MetaABMActPackage.Literals.AACT__TARGETS, targetAct));
+			}
+		}
+		return cmd;
+	}
 
-    @Override
-    protected Command createDragAndDropCommand(EditingDomain domain, Object owner, float location, int operations,
-            int operation, Collection<?> collection) {
-        if (owner instanceof AAct) {
-            AAct source = (AAct) owner;
-            List<AAct> allSources = new ArrayList<AAct>(source.getAllSources());
-            allSources.add(source);
-            CompoundCommand cmd = new CompoundCommand();
-            for (Object object : collection) {
-                if (object instanceof AAct) {
-                    AAct target = (AAct) object;
-                    cmd.append(createActDragCommand(domain, operation, source, target));
-                }
-            }
-            return cmd;
-        }
-        return super.createDragAndDropCommand(domain, owner, location, operations, operation, collection);
-    }
+	@Override
+	protected Command createDragAndDropCommand(EditingDomain domain, Object owner, float location, int operations, int operation, Collection<?> collection) {
+		if (owner instanceof AAct) {
+			AAct source = (AAct) owner;
+			List<AAct> allSources = new ArrayList<AAct>(source.getAllSources());
+			allSources.add(source);
+			CompoundCommand cmd = new CompoundCommand();
+			for (Object object : collection) {
+				if (object instanceof AAct) {
+					AAct target = (AAct) object;
+					cmd.append(createActDragCommand(domain, operation, source, target));
+				}
+			}
+			return cmd;
+		}
+		return super.createDragAndDropCommand(domain, owner, location, operations, operation, collection);
+	}
 
-    // /**
-    // * 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 -->
-    // *
-    // * @generated NOT
-    // */
-    // @Override
-    // public Collection<? extends EStructuralFeature>
-    // getChildrenFeatures(Object object) {
-    // if (childrenFeatures == null) {
-    // super.getChildrenFeatures(object);
-    // childrenFeatures.add(MetaABMActPackage.Literals.AACT__SOURCES);
-    // childrenFeatures.add(MetaABMActPackage.Literals.AACT__TARGETS);
-    // }
-    // return childrenFeatures;
-    // }
+	// /**
+	// * 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 -->
+	// *
+	// * @generated NOT
+	// */
+	// @Override
+	// public Collection<? extends EStructuralFeature>
+	// getChildrenFeatures(Object object) {
+	// if (childrenFeatures == null) {
+	// super.getChildrenFeatures(object);
+	// childrenFeatures.add(MetaABMActPackage.Literals.AACT__SOURCES);
+	// childrenFeatures.add(MetaABMActPackage.Literals.AACT__TARGETS);
+	// }
+	// return childrenFeatures;
+	// }
 
-    @SuppressWarnings("unchecked")
-    protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature,
-            Collection<?> collection, int index) {
-        if (feature == MetaABMActPackage.Literals.AACT__SOURCES) {
-            CompoundCommand cmd = new CompoundCommand("Add Source");
-            SuggestLabelCommand suggestLabelCommand = new SuggestLabelCommand(this, domain, (IID) owner);
-            cmd.append(super.createAddCommand(domain, owner, feature, collection, index));
-            cmd.append(suggestLabelCommand);
-            return cmd;
-        } else if (feature == MetaABMActPackage.Literals.AACT__TARGETS) {
-            // Don't allow any circular references!
-            AAct source = (AAct) owner;
-            if (Collections.disjoint(source.getAllSources(), collection) && !collection.contains(owner)) {
-                CompoundCommand cmd = new CompoundCommand("Add Target");
-                SuggestLabelCommand suggestLabelCommand = new SuggestLabelCommand(domain, (Collection<IID>) collection);
-                cmd.append(super.createAddCommand(domain, owner, feature, collection, index));
-                AGroup group = source.getGroup();
-                if (group != null) {
-                    // do not add existing members..
-                    Collection<?> newMembers = new ArrayList<Object>(collection);
-                    newMembers.removeAll(group.getMembers());
-                    if (newMembers.size() > 0) {
-                        cmd.append(AddCommand.create(domain, group, MetaABMActPackage.Literals.AGROUP__MEMBERS,
-                                                     newMembers));
-                    }
-                }
-                for (Object act : collection) {
-                    reassignSelects(domain, cmd, source, (AAct) act);
-                }
-                cmd.append(suggestLabelCommand);
-                return cmd;
-            } else {
-                return UnexecutableCommand.INSTANCE;
-            }
-        } else {
-            return super.createAddCommand(domain, owner, feature, collection, index);
-        }
-    }
+	@SuppressWarnings("unchecked")
+	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
+		if (feature == MetaABMActPackage.Literals.AACT__SOURCES) {
+			CompoundCommand cmd = new CompoundCommand("Add Source");
+			SuggestLabelCommand suggestLabelCommand = new SuggestLabelCommand(this, domain, (IID) owner);
+			cmd.append(super.createAddCommand(domain, owner, feature, collection, index));
+			cmd.append(suggestLabelCommand);
+			return cmd;
+		} else if (feature == MetaABMActPackage.Literals.AACT__TARGETS) {
+			// Don't allow any circular references!
+			AAct source = (AAct) owner;
+			if (Collections.disjoint(source.getAllSources(), collection) && !collection.contains(owner)) {
+				CompoundCommand cmd = new CompoundCommand("Add Target");
+				SuggestLabelCommand suggestLabelCommand = new SuggestLabelCommand(domain, (Collection<IID>) collection);
+				cmd.append(super.createAddCommand(domain, owner, feature, collection, index));
+				AGroup group = source.getGroup();
+				if (group != null) {
+					// do not add existing members..
+					Collection<?> newMembers = new ArrayList<Object>(collection);
+					newMembers.removeAll(group.getMembers());
+					if (newMembers.size() > 0) {
+						cmd.append(AddCommand.create(domain, group, MetaABMActPackage.Literals.AGROUP__MEMBERS, newMembers));
+					}
+				}
+				for (Object act : collection) {
+					reassignSelects(domain, cmd, source, (AAct) act);
+				}
+				cmd.append(suggestLabelCommand);
+				return cmd;
+			} else {
+				return UnexecutableCommand.INSTANCE;
+			}
+		} else {
+			return super.createAddCommand(domain, owner, feature, collection, index);
+		}
+	}
 
-    // ActIntermediaryItemProvider registerIntermediary(Object object,
-    // EStructuralFeature ref) {
-    // ActIntermediaryItemProvider provider = new
-    // ActIntermediaryItemProvider(adapterFactory, (AAct) object, ref);
-    // providerForFeature.put(MetaABMActPackage.Literals.AGROUP__MEMBERS,
-    // provider);
-    // return provider;
-    // }
+	// ActIntermediaryItemProvider registerIntermediary(Object object,
+	// EStructuralFeature ref) {
+	// ActIntermediaryItemProvider provider = new
+	// ActIntermediaryItemProvider(adapterFactory, (AAct) object, ref);
+	// providerForFeature.put(MetaABMActPackage.Literals.AGROUP__MEMBERS,
+	// provider);
+	// return provider;
+	// }
 
-    // protected List children = null; // 14.2.3
+	// protected List children = null; // 14.2.3
 
-    // public Collection getChildren(Object object) {
-    // if (children == null) {
-    // providerForFeature = new HashMap();
-    // children = new ArrayList();
-    // children.add(registerIntermediary(object,
-    // MetaABMActPackage.Literals.AACT__SOURCES));
-    // children.add(registerIntermediary(object,
-    // MetaABMActPackage.Literals.AACT__TARGETS));
-    // }
-    // return children;
-    // }
+	// public Collection getChildren(Object object) {
+	// if (children == null) {
+	// providerForFeature = new HashMap();
+	// children = new ArrayList();
+	// children.add(registerIntermediary(object,
+	// MetaABMActPackage.Literals.AACT__SOURCES));
+	// children.add(registerIntermediary(object,
+	// MetaABMActPackage.Literals.AACT__TARGETS));
+	// }
+	// return children;
+	// }
 
-    // public Object getProvider(EStructuralFeature feature) {
-    // return providerForFeature.get(feature);
-    // }
+	// public Object getProvider(EStructuralFeature feature) {
+	// return providerForFeature.get(feature);
+	// }
 
-    // protected Command createCreateCopyCommand(EditingDomain domain, EObject
-    // owner, Helper helper) {
-    // CompoundCommand cmd = new CompoundCommand();
-    //
-    // CreateCopyCommand createCreateCopyCommand = (CreateCopyCommand) new
-    // CreateCopyCommand(domain, owner, helper) {
-    //
-    // public Collection<?> doGetChildrenToCopy() {
-    // Collection<?> children = super.doGetChildrenToCopy();
-    // children.addAll((Collection) ((AAct) owner).getAllTargets());
-    // return children;
-    // }
-    //
-    // };
-    // return createCreateCopyCommand;
-    // }
-    //
-    // protected Command createInitializeCopyCommand(EditingDomain domain,
-    // EObject owner, Helper helper) {
-    // InitializeCopyCommand createInitializeCopyCommand = new
-    // InitializeCopyCommand(domain, owner, helper) {
-    //
-    // protected void copyReferences() {
-    // super.copyReferences();
-    // AAct owner = (AAct) getOwner();
-    // for (Object object : getAffectedObjects()) {
-    // if (object instanceof AAct) {
-    // ((AAct) object).eSet(MetaABMActPackage.Literals.AACT__GROUP,
-    // owner.getGroup());
-    // // owner.getGroup().eSet(MetaABMActPackage.Literals.AGROUP__MEMBERS,
-    // ((AAct) object));
-    // }
-    // }
-    // }
-    //
-    // };
-    // return createInitializeCopyCommand;
-    // }
+	// protected Command createCreateCopyCommand(EditingDomain domain, EObject
+	// owner, Helper helper) {
+	// CompoundCommand cmd = new CompoundCommand();
+	//
+	// CreateCopyCommand createCreateCopyCommand = (CreateCopyCommand) new
+	// CreateCopyCommand(domain, owner, helper) {
+	//
+	// public Collection<?> doGetChildrenToCopy() {
+	// Collection<?> children = super.doGetChildrenToCopy();
+	// children.addAll((Collection) ((AAct) owner).getAllTargets());
+	// return children;
+	// }
+	//
+	// };
+	// return createCreateCopyCommand;
+	// }
+	//
+	// protected Command createInitializeCopyCommand(EditingDomain domain,
+	// EObject owner, Helper helper) {
+	// InitializeCopyCommand createInitializeCopyCommand = new
+	// InitializeCopyCommand(domain, owner, helper) {
+	//
+	// protected void copyReferences() {
+	// super.copyReferences();
+	// AAct owner = (AAct) getOwner();
+	// for (Object object : getAffectedObjects()) {
+	// if (object instanceof AAct) {
+	// ((AAct) object).eSet(MetaABMActPackage.Literals.AACT__GROUP,
+	// owner.getGroup());
+	// // owner.getGroup().eSet(MetaABMActPackage.Literals.AGROUP__MEMBERS,
+	// ((AAct) object));
+	// }
+	// }
+	// }
+	//
+	// };
+	// return createInitializeCopyCommand;
+	// }
 
-    protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value,
-            int index) {
-        AAct actOwner = (AAct) owner;
-        if (feature == MetaABMPackage.Literals.IID__LABEL || feature == MetaABMPackage.Literals.SNAMED__PLURAL_LABEL) {
-            // createSetCommand.canExecute();
-            // force a store of old value..
-            CompoundCommand cmd = new CompoundCommand();
-            List<SuggestLabelCommand> sugCmds = new ArrayList<SuggestLabelCommand>();
-            Collection<AAct> allTargets = actOwner.getAllTargets();
-            for (AAct act : allTargets) {
-                sugCmds.add(new SuggestLabelCommand(domain, act));
-            }
-            Command createSetCommand = SetLabelCommand.create(domain, owner, feature, value, index);
-            cmd.append(createSetCommand);
-            for (SuggestLabelCommand sugCmd : sugCmds) {
-                cmd.append(sugCmd);
-            }
-            return cmd;
-        } else if (feature == MetaABMActPackage.Literals.ASINK__FUNCTION
-                || feature == MetaABMActPackage.Literals.AINPUT__LITERAL
-                || feature == MetaABMActPackage.Literals.AACCESSOR__ATTRIBUTE
-                || feature == MetaABMActPackage.Literals.ASET__PARAMETER
-                || feature == MetaABMActPackage.Literals.ABUILD_PROJECTION__PROJECTION
-                || feature == MetaABMActPackage.Literals.ACREATE_AGENTS__AGENT_COUNT
-                || feature == MetaABMActPackage.Literals.ASCHEDULE__PICK
-                || feature == MetaABMActPackage.Literals.ASCHEDULE__PRIORITY
-                || feature == MetaABMActPackage.Literals.ASCHEDULE__INTERVAL
-                || feature == MetaABMActPackage.Literals.ASCHEDULE__START
-                || feature == MetaABMActPackage.Literals.ASET__PARAMETER
-                || feature == MetaABMActPackage.Literals.ASELECT__AGENT
-                || feature == MetaABMActPackage.Literals.ASELECT__FOR
-                || feature == MetaABMActPackage.Literals.ASELECT__SPACE
-                || feature == MetaABMActPackage.Literals.AACT__SELECTED
-                || feature == MetaABMActPackage.Literals.AINPUT__VALUE
-                || feature == MetaABMActPackage.Literals.AINPUT__LITERAL
-                || feature == MetaABMActPackage.Literals.ATRANSFORM__DESTINATION
-                || feature == MetaABMActPackage.Literals.ANETWORK__WITHIN) {
-            SuggestLabelCommand suggestLabelCommand = null;
-            if (!(owner instanceof ASink && (((ASink) owner).isMultiValue() || feature == MetaABMActPackage.Literals.ASINK__FUNCTION
-                    && value instanceof FFunction && ((FFunction) value).isMultiValue()))) {
-                suggestLabelCommand = new SuggestLabelCommand(domain, (IID) owner);
-            }
-            Command createSetCommand = super.createSetCommand(domain, owner, feature, value, index);
-            createSetCommand.canExecute();
-            // force a store of old value..
-            CompoundCommand cmd = new CompoundCommand();
-            cmd.append(createSetCommand);
-            if (suggestLabelCommand != null) {
-                cmd.append(suggestLabelCommand);
-            }
-            return cmd;
-        } else {
-            Command createSetCommand = super.createSetCommand(domain, owner, feature, value, index);
-            createSetCommand.canExecute();
-            return createSetCommand;
-        }
-    }
+	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value, int index) {
+		AAct actOwner = (AAct) owner;
+		if (feature == MetaABMPackage.Literals.IID__LABEL || feature == MetaABMPackage.Literals.SNAMED__PLURAL_LABEL) {
+			// createSetCommand.canExecute();
+			// force a store of old value..
+			CompoundCommand cmd = new CompoundCommand();
+			List<SuggestLabelCommand> sugCmds = new ArrayList<SuggestLabelCommand>();
+			Collection<AAct> allTargets = actOwner.getAllTargets();
+			for (AAct act : allTargets) {
+				sugCmds.add(new SuggestLabelCommand(domain, act));
+			}
+			Command createSetCommand = SetLabelCommand.create(domain, owner, feature, value, index);
+			cmd.append(createSetCommand);
+			for (SuggestLabelCommand sugCmd : sugCmds) {
+				cmd.append(sugCmd);
+			}
+			return cmd;
+		} else if (feature == MetaABMActPackage.Literals.ASINK__FUNCTION || feature == MetaABMActPackage.Literals.AINPUT__LITERAL || feature == MetaABMActPackage.Literals.AACCESSOR__ATTRIBUTE || feature == MetaABMActPackage.Literals.ASET__PARAMETER || feature == MetaABMActPackage.Literals.ABUILD_PROJECTION__PROJECTION || feature == MetaABMActPackage.Literals.ACREATE_AGENTS__AGENT_COUNT || feature == MetaABMActPackage.Literals.ASCHEDULE__PICK || feature == MetaABMActPackage.Literals.ASCHEDULE__PRIORITY || feature == MetaABMActPackage.Literals.ASCHEDULE__INTERVAL || feature == MetaABMActPackage.Literals.ASCHEDULE__START || feature == MetaABMActPackage.Literals.ASET__PARAMETER || feature == MetaABMActPackage.Literals.ASELECT__AGENT || feature == MetaABMActPackage.Literals.ASELECT__FOR
+				|| feature == MetaABMActPackage.Literals.ASELECT__SPACE || feature == MetaABMActPackage.Literals.AACT__SELECTED || feature == MetaABMActPackage.Literals.AINPUT__VALUE || feature == MetaABMActPackage.Literals.AINPUT__LITERAL || feature == MetaABMActPackage.Literals.ATRANSFORM__DESTINATION || feature == MetaABMActPackage.Literals.ANETWORK__WITHIN) {
+			SuggestLabelCommand suggestLabelCommand = null;
+			if (!(owner instanceof ASink && (((ASink) owner).isMultiValue() || feature == MetaABMActPackage.Literals.ASINK__FUNCTION && value instanceof FFunction && ((FFunction) value).isMultiValue()))) {
+				suggestLabelCommand = new SuggestLabelCommand(domain, (IID) owner);
+			}
+			Command createSetCommand = super.createSetCommand(domain, owner, feature, value, index);
+			createSetCommand.canExecute();
+			// force a store of old value..
+			CompoundCommand cmd = new CompoundCommand();
+			cmd.append(createSetCommand);
+			if (suggestLabelCommand != null) {
+				cmd.append(suggestLabelCommand);
+			}
+			return cmd;
+		} else {
+			Command createSetCommand = super.createSetCommand(domain, owner, feature, value, index);
+			createSetCommand.canExecute();
+			return createSetCommand;
+		}
+	}
 
-    // protected Command createRemoveCommand(EditingDomain domain, EObject
-    // owner, EStructuralFeature feature,
-    // Collection collection) {
-    // return createWrappedCommand(super.createRemoveCommand(domain, owner,
-    // feature, collection), owner, feature);
-    // }
-    //
-    // protected Command createAddCommand(EditingDomain domain, EObject owner,
-    // EStructuralFeature feature,
-    // Collection collection, int index) {
-    // return createWrappedCommand(super.createAddCommand(domain, owner,
-    // feature, collection, index), owner, feature);
-    // }
+	// protected Command createRemoveCommand(EditingDomain domain, EObject
+	// owner, EStructuralFeature feature,
+	// Collection collection) {
+	// return createWrappedCommand(super.createRemoveCommand(domain, owner,
+	// feature, collection), owner, feature);
+	// }
+	//
+	// protected Command createAddCommand(EditingDomain domain, EObject owner,
+	// EStructuralFeature feature,
+	// Collection collection, int index) {
+	// return createWrappedCommand(super.createAddCommand(domain, owner,
+	// feature, collection, index), owner, feature);
+	// }
 
-    protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature,
-            Collection<?> collection) {
-        if (feature == MetaABMActPackage.Literals.AACT__TARGETS) {
-            CompoundCommand cmd = new CompoundCommand();
-            for (Object target : collection) {
-                if (((AAct) owner).getTargets().contains(target)) {
-                    cmd.append(new RemoveActTargetsCommand(domain, owner, feature, Collections.singleton(target)));
-                }
-            }
-            return cmd;
-            // } else if (feature == MetaABMActPackage.Literals.AACT__TARGETS) {
-            // return super.createRemoveCommand(domain, owner, feature,
-            // collection);
-        }
-        return super.createRemoveCommand(domain, owner, feature, collection);
-    }
+	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
+		if (feature == MetaABMActPackage.Literals.AACT__TARGETS) {
+			CompoundCommand cmd = new CompoundCommand();
+			for (Object target : collection) {
+				if (((AAct) owner).getTargets().contains(target)) {
+					cmd.append(new RemoveActTargetsCommand(domain, owner, feature, Collections.singleton(target)));
+				}
+			}
+			return cmd;
+			// } else if (feature == MetaABMActPackage.Literals.AACT__TARGETS) {
+			// return super.createRemoveCommand(domain, owner, feature,
+			// collection);
+		}
+		return super.createRemoveCommand(domain, owner, feature, collection);
+	}
 
-    // protected Command createWrappedCommand(Command command, final EObject
-    // owner, final EStructuralFeature feature) {
-    // if ((feature == MetaABMActPackage.eINSTANCE.getAAct_Sources())
-    // || (feature == MetaABMActPackage.eINSTANCE.getAAct_Targets())
-    // || (feature == MetaABMActPackage.eINSTANCE.getAGroup_Members())) {
-    // return new CommandWrapper(command) {
-    // public Collection getAffectedObjects() {
-    // Collection affected = super.getAffectedObjects();
-    // if (affected.contains(owner))
-    // affected = Collections.singleton(getProvider(feature));
-    // return affected;
-    // }
-    // };
-    // } else {
-    // return command;
-    // }
-    // }
+	// protected Command createWrappedCommand(Command command, final EObject
+	// owner, final EStructuralFeature feature) {
+	// if ((feature == MetaABMActPackage.eINSTANCE.getAAct_Sources())
+	// || (feature == MetaABMActPackage.eINSTANCE.getAAct_Targets())
+	// || (feature == MetaABMActPackage.eINSTANCE.getAGroup_Members())) {
+	// return new CommandWrapper(command) {
+	// public Collection getAffectedObjects() {
+	// Collection affected = super.getAffectedObjects();
+	// if (affected.contains(owner))
+	// affected = Collections.singleton(getProvider(feature));
+	// return affected;
+	// }
+	// };
+	// } else {
+	// return command;
+	// }
+	// }
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
-    }
+		return super.getChildFeature(object, child);
+	}
 
-    /**
-     * This returns AAct.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AAct"));
-    }
+	/**
+	 * This returns AAct.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AAct"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        AAct act = (AAct) object;
-        String label = act.getLabel();
-        if (!(act.getSelected() instanceof ARoot) && act.getSelected() != null) {
-            label += " [" + act.getSelected().getLabel() + "]";
-        }
-        if (act.getSources().size() > 0) {
-            String[] terms = new String[act.getSources().size()];
-            for (int i = 0; i < terms.length; i++) {
-                terms[i] = act.getSources().get(i).getLabel();
-            }
-            label += "[<-" + StringUtils.join(terms, ",") + "]";
-        }
-        return label == null || label.length() == 0 ? getString("_UI_" + ((EObject) object).eClass().getName()
-                                                                + "_type") : label;
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		AAct act = (AAct) object;
+		String label = act.getLabel();
+		if (!(act.getSelected() instanceof ARoot) && act.getSelected() != null) {
+			label += " [" + act.getSelected().getLabel() + "]";
+		}
+		if (act.getSources().size() > 0) {
+			String[] terms = new String[act.getSources().size()];
+			for (int i = 0; i < terms.length; i++) {
+				terms[i] = act.getSources().get(i).getLabel();
+			}
+			label += "[<-" + StringUtils.join(terms, ",") + "]";
+		}
+		return label == null || label.length() == 0 ? getString("_UI_" + ((EObject) object).eClass().getName() + "_type") : label;
+	}
 
-    // public Object getParent(Object object) {
-    // if (object instanceof ActIntermediaryItemProvider) {
-    // ActIntermediaryItemProvider act = (ActIntermediaryItemProvider)
-    // super.getParent(object);
-    // AActItemProvider actItemProvider = (AActItemProvider)
-    // adapterFactory.adapt(act,
-    // IEditingDomainItemProvider.class);
-    // return actItemProvider != null ?
-    // actItemProvider.getProvider(act.reference) : null;
-    // }
-    // return super.getParent(object);
-    // }
+	// public Object getParent(Object object) {
+	// if (object instanceof ActIntermediaryItemProvider) {
+	// ActIntermediaryItemProvider act = (ActIntermediaryItemProvider)
+	// super.getParent(object);
+	// AActItemProvider actItemProvider = (AActItemProvider)
+	// adapterFactory.adapt(act,
+	// IEditingDomainItemProvider.class);
+	// return actItemProvider != null ?
+	// actItemProvider.getProvider(act.reference) : null;
+	// }
+	// return super.getParent(object);
+	// }
 
-    /**
-     * 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 NOT
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        AAct act = (AAct) notification.getNotifier();
-        ASelect root = act.getRootSelected();
-        switch (notification.getFeatureID(AAct.class)) {
-            case MetaABMPackage.IID__LABEL:
-            case MetaABMPackage.IID__ID:
-                // fireNotifyChanged(new ViewerNotification(notification,
-                // notification.getNotifier(), true, false));
-                ASelect rootSelected = root;
-                if (rootSelected != null) { // should only be true for testing..
-                    for (AAct allTarget : rootSelected.getAllTargets()) {
-                        if (allTarget != act) {
-                            fireNotifyChanged(new ViewerNotification(notification, allTarget, false, true));
-                            if (allTarget instanceof ASink) {
-                                for (AInput input : ((ASink) allTarget).getInputs()) {
-                                    if (input.getValue() == act) {
-                                        fireNotifyChanged(new ViewerNotification(notification, input, false, true));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                for (Object object : getChildren(notification.getNotifier())) {
-                    if (object instanceof AActWrapperItemProvider) {
-                        fireNotifyChanged(new ViewerNotification(notification, object, false, true));
-                    }
-                }
-                // fall through to notify
-                // return;
-            case MetaABMActPackage.AACT__REFERENCE:
-            case MetaABMActPackage.AACT__SELECTED:
-                fireNotifyChanged(new ViewerNotification(notification, act, false, true));
-                return;
-            case MetaABMActPackage.AACT__GROUP:
-            case MetaABMActPackage.AACT__SOURCES:
-            case MetaABMActPackage.AGROUP__MEMBERS:
-            case MetaABMActPackage.AACT__TARGETS:
-                if (root != null) {
-                    fireNotifyChanged(new ViewerNotification(notification, root, true, false));
-                    fireNotifyChanged(new ViewerNotification(notification, root.getAllTargets(), false, true));
-                }
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+	/**
+	 * 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 NOT
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		AAct act = (AAct) notification.getNotifier();
+		ASelect root = act.getRootSelected();
+		switch (notification.getFeatureID(AAct.class)) {
+			case MetaABMPackage.IID__LABEL:
+			case MetaABMPackage.IID__ID:
+				// fireNotifyChanged(new ViewerNotification(notification,
+				// notification.getNotifier(), true, false));
+				ASelect rootSelected = root;
+				if (rootSelected != null) { // should only be true for testing..
+					for (AAct allTarget : rootSelected.getAllTargets()) {
+						if (allTarget != act) {
+							fireNotifyChanged(new ViewerNotification(notification, allTarget, false, true));
+							if (allTarget instanceof ASink) {
+								for (AInput input : ((ASink) allTarget).getInputs()) {
+									if (input.getValue() == act) {
+										fireNotifyChanged(new ViewerNotification(notification, input, false, true));
+									}
+								}
+							}
+						}
+					}
+				}
+				for (Object object : getChildren(notification.getNotifier())) {
+					if (object instanceof AActWrapperItemProvider) {
+						fireNotifyChanged(new ViewerNotification(notification, object, false, true));
+					}
+				}
+				// fall through to notify
+				// return;
+			case MetaABMActPackage.AACT__REFERENCE:
+			case MetaABMActPackage.AACT__SELECTED:
+				fireNotifyChanged(new ViewerNotification(notification, act, false, true));
+				return;
+			case MetaABMActPackage.AACT__GROUP:
+			case MetaABMActPackage.AACT__SOURCES:
+			case MetaABMActPackage.AGROUP__MEMBERS:
+			case MetaABMActPackage.AACT__TARGETS:
+				if (root != null) {
+					fireNotifyChanged(new ViewerNotification(notification, root, true, false));
+					fireNotifyChanged(new ViewerNotification(notification, root.getAllTargets(), false, true));
+				}
+				return;
+		}
+		super.notifyChanged(notification);
+	}
 
-    /**
-     * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of the
-     * children that can be created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        for (EClassifier cl : MetaABMActPackage.eINSTANCE.getEClassifiers()) {
-            if (cl instanceof EClass) {
-                EClass actClass = (EClass) cl;
-                if (MetaABMActPackage.Literals.AACT.isSuperTypeOf(actClass)
-                        && !MetaABMActPackage.Literals.AROOT.isSuperTypeOf(actClass) && !actClass.isAbstract()) {
-                    newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.AACT__TARGETS,
-                                                                 MetaABMActFactory.eINSTANCE.create(actClass)));
-                }
-            }
-        }
-        // // Don't allow creation of roots
-    }
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of the
+	 * children that can be created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		for (EClassifier cl : MetaABMActPackage.eINSTANCE.getEClassifiers()) {
+			if (cl instanceof EClass) {
+				EClass actClass = (EClass) cl;
+				if (MetaABMActPackage.Literals.AACT.isSuperTypeOf(actClass) && !MetaABMActPackage.Literals.AROOT.isSuperTypeOf(actClass) && !actClass.isAbstract()) {
+					newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.AACT__TARGETS, MetaABMActFactory.eINSTANCE.create(actClass)));
+				}
+			}
+		}
+		// // Don't allow creation of roots
+	}
 
-    @Override
-    protected Object createWrapper(EObject owner, EStructuralFeature feature, Object value, int index) {
-        if (!((EReference) feature).isContainment() && value instanceof AAct && !(value instanceof ARoot)) {
-            return new AActWrapperItemProvider(value, owner, feature, index, adapterFactory);
-        }
-        // return super.createWrapper(owner, feature, value, index);
-        // return value;
-        return value;
-    }
+	@Override
+	protected Object createWrapper(EObject owner, EStructuralFeature feature, Object value, int index) {
+		if (!((EReference) feature).isContainment() && value instanceof AAct && !(value instanceof ARoot)) {
+			return new AActWrapperItemProvider(value, owner, feature, index, adapterFactory);
+		}
+		// return super.createWrapper(owner, feature, value, index);
+		// return value;
+		return value;
+	}
 
-    protected boolean isWrappingNeeded(Object object) {
-        // if (object instanceof AAct) {
-        // return true;
-        // }
-        return false;// super.isWrappingNeeded(object);
-    }
+	protected boolean isWrappingNeeded(Object object) {
+		// if (object instanceof AAct) {
+		// return true;
+		// }
+		return false;// super.isWrappingNeeded(object);
+	}
 
-    @Override
-    public boolean hasChildren(Object object) {
-        // AAct act = (AAct) object;
-        // if (act.getTargets().size() <= 1 && (!(object instanceof ASink) || ((ASink) object).getInputs().size() == 0)
-        // && !(object instanceof AGroup) && !(object instanceof ARoot)) {
-        // return false;
-        // }
-        return object instanceof ARoot && ((AAct) object).getTargets().size() > 0 || object instanceof AGroup
-        && ((AGroup) object).getMembers().size() > 0;
-        // return super.hasChildren(object, false);
-    }
+	@Override
+	public boolean hasChildren(Object object) {
+		// AAct act = (AAct) object;
+		// if (act.getTargets().size() <= 1 && (!(object instanceof ASink) || ((ASink) object).getInputs().size() == 0)
+		// && !(object instanceof AGroup) && !(object instanceof ARoot)) {
+		// return false;
+		// }
+		return object instanceof ARoot && ((AAct) object).getTargets().size() > 0 || object instanceof AGroup && ((AGroup) object).getMembers().size() > 0;
+		// return super.hasChildren(object, false);
+	}
 
-    // protected Command wrapCommand(Command command, Object object, Class<?
-    // extends Command> commandClass,
-    // CommandParameter commandParameter, CommandParameter oldCommandParameter)
-    // {
-    // System.err.println(commandClass);
-    // Command hello = command;
-    // // if (hello instanceof CompoundCommand) {
-    // // for (Object blah : ((CompoundCommand) hello).getCommandList()) {
-    // // System.err.println(blah);
-    // // }
-    // // }
-    // return super.wrapCommand(command, object, commandClass, commandParameter,
-    // oldCommandParameter);
-    // }
-    protected static Collection<ASelect> getSourceSelects(AAct source) {
-        Collection<ASelect> allSourceSelects = new HashSet<ASelect>();
-        if (source instanceof ASelect) {
-            allSourceSelects.add(((ASelect) source));
-        } else {
-            allSourceSelects.add(source.getSelected());
-        }
-        for (Object object : source.getAllSources()) {
-            if (object instanceof ASelect) {
-                allSourceSelects.add(((ASelect) object));
-            }
-        }
-        return allSourceSelects;
-    }
+	// protected Command wrapCommand(Command command, Object object, Class<?
+	// extends Command> commandClass,
+	// CommandParameter commandParameter, CommandParameter oldCommandParameter)
+	// {
+	// System.err.println(commandClass);
+	// Command hello = command;
+	// // if (hello instanceof CompoundCommand) {
+	// // for (Object blah : ((CompoundCommand) hello).getCommandList()) {
+	// // System.err.println(blah);
+	// // }
+	// // }
+	// return super.wrapCommand(command, object, commandClass, commandParameter,
+	// oldCommandParameter);
+	// }
+	protected static Collection<ASelect> getSourceSelects(AAct source) {
+		Collection<ASelect> allSourceSelects = new HashSet<ASelect>();
+		if (source instanceof ASelect) {
+			allSourceSelects.add(((ASelect) source));
+		} else {
+			allSourceSelects.add(source.getSelected());
+		}
+		for (Object object : source.getAllSources()) {
+			if (object instanceof ASelect) {
+				allSourceSelects.add(((ASelect) object));
+			}
+		}
+		return allSourceSelects;
+	}
 
-    // protected static void checkAllTargetsSelect(EditingDomain domain, CompoundCommand cmd, AAct newSource,
-    // AAct movedTarget) {
-    // Set<ASelect> allSourceSelects = getSourceSelects(newSource);
-    // if (movedTarget instanceof ASelect) {
-    // allSourceSelects.add(((ASelect) movedTarget));
-    // }
-    // for (AAct existingTarget : movedTarget.getAllTargets()) {
-    // if (existingTarget instanceof ASelect) {
-    // allSourceSelects.add(existingTarget.getSelected());
-    // }
-    // }
-    // for (AAct target : movedTarget.getAllTargets()) {
-    // checkSelect(domain, cmd, newSource, allSourceSelects, target);
-    // }
-    // }
+	// protected static void checkAllTargetsSelect(EditingDomain domain, CompoundCommand cmd, AAct newSource,
+	// AAct movedTarget) {
+	// Set<ASelect> allSourceSelects = getSourceSelects(newSource);
+	// if (movedTarget instanceof ASelect) {
+	// allSourceSelects.add(((ASelect) movedTarget));
+	// }
+	// for (AAct existingTarget : movedTarget.getAllTargets()) {
+	// if (existingTarget instanceof ASelect) {
+	// allSourceSelects.add(existingTarget.getSelected());
+	// }
+	// }
+	// for (AAct target : movedTarget.getAllTargets()) {
+	// checkSelect(domain, cmd, newSource, allSourceSelects, target);
+	// }
+	// }
 
-    protected static void reassignSelects(EditingDomain domain, CompoundCommand cmd, AAct newSource, AAct value) {
-        ASelect newSelect = null;
-        if (newSource instanceof ASelect) {
-            newSelect = (ASelect) newSource;
-        } else {
-            newSelect = newSource.getSelected();
-        }
-        if (newSelect != null) {
-            Collection<ASelect> allSourceSelects = getSourceSelects(newSource);
-            reassignSelects(domain, cmd, value, newSelect, allSourceSelects, new HashSet<Object>());
-        }
-    }
+	protected static void reassignSelects(EditingDomain domain, CompoundCommand cmd, AAct newSource, AAct value) {
+		ASelect newSelect = null;
+		if (newSource instanceof ASelect) {
+			newSelect = (ASelect) newSource;
+		} else {
+			newSelect = newSource.getSelected();
+		}
+		if (newSelect != null) {
+			Collection<ASelect> allSourceSelects = getSourceSelects(newSource);
+			reassignSelects(domain, cmd, value, newSelect, allSourceSelects, new HashSet<Object>());
+		}
+	}
 
-    private static void reassignSelects(EditingDomain domain, CompoundCommand cmd, AAct act, ASelect newSelect,
-            Collection<ASelect> allSourceSelects, Collection<Object> processed) {
-        processed.add(act);
-        if (act instanceof ATransform) {
-            if (act.getSelected() == null || !allSourceSelects.contains(act.getSelected())) {
-                cmd.append(SetCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SELECTED,
-                                             newSelect.getSelected()));
-            }
-            if (((ATransform) act).getDestination() == null
-                    || !allSourceSelects.contains(((ATransform) act).getDestination())) {
-                cmd.append(SetCommand
-                           .create(domain, act, MetaABMActPackage.Literals.ATRANSFORM__DESTINATION, newSelect));
-            }
-        } else {
-            if (!allSourceSelects.contains(act.getSelected())) {
-                cmd.append(SetCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SELECTED, newSelect));
-            }
-        }
-        if (act instanceof ASink) {
-            for (AInput input : ((ASink) act).getInputs()) {
-                if (!allSourceSelects.contains(input.getSelected()) && !processed.contains(input)) {
-                    cmd.append(SetCommand.create(domain, input, MetaABMActPackage.Literals.AINPUT__SELECTED, newSelect));
-                    processed.add(input);
-                }
-            }
-        }
-        // if (value instanceof ASet) {
-        // if (((ASet) value).getParameter() == null) {
-        // if (owner instanceof AEvaluate) {
-        // cmd.append(SetCommand.create(domain, value,
-        // MetaABMActPackage.Literals.ASET__PARAMETER, owner));
-        // }
-        // }
-        // }
-        if (act instanceof ASelect) {
-            allSourceSelects.add((ASelect) act);
-        }
-        for (AAct target : act.getAllTargets()) {
-            if (!processed.contains(target)) {
-                reassignSelects(domain, cmd, target, newSelect, allSourceSelects, processed);
-            }
-        }
-    }
+	private static void reassignSelects(EditingDomain domain, CompoundCommand cmd, AAct act, ASelect newSelect, Collection<ASelect> allSourceSelects, Collection<Object> processed) {
+		processed.add(act);
+		if (act instanceof ATransform) {
+			if (act.getSelected() == null || !allSourceSelects.contains(act.getSelected())) {
+				cmd.append(SetCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SELECTED, newSelect.getSelected()));
+			}
+			if (((ATransform) act).getDestination() == null || !allSourceSelects.contains(((ATransform) act).getDestination())) {
+				cmd.append(SetCommand.create(domain, act, MetaABMActPackage.Literals.ATRANSFORM__DESTINATION, newSelect));
+			}
+		} else {
+			if (!allSourceSelects.contains(act.getSelected())) {
+				cmd.append(SetCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SELECTED, newSelect));
+			}
+		}
+		if (act instanceof ASink) {
+			for (AInput input : ((ASink) act).getInputs()) {
+				if (!allSourceSelects.contains(input.getSelected()) && !processed.contains(input)) {
+					cmd.append(SetCommand.create(domain, input, MetaABMActPackage.Literals.AINPUT__SELECTED, newSelect));
+					processed.add(input);
+				}
+			}
+		}
+		// if (value instanceof ASet) {
+		// if (((ASet) value).getParameter() == null) {
+		// if (owner instanceof AEvaluate) {
+		// cmd.append(SetCommand.create(domain, value,
+		// MetaABMActPackage.Literals.ASET__PARAMETER, owner));
+		// }
+		// }
+		// }
+		if (act instanceof ASelect) {
+			allSourceSelects.add((ASelect) act);
+		}
+		for (AAct target : act.getAllTargets()) {
+			if (!processed.contains(target)) {
+				reassignSelects(domain, cmd, target, newSelect, allSourceSelects, processed);
+			}
+		}
+	}
 
-    protected String suggestSeperatedSourceLabel(Object object, String seperator) {
-        AAct source = (AAct) object;
-        EList<AAct> sources = source.getSources();
-        String label;
-        switch (sources.size()) {
-            case 0:
-                label = seperator + " Undefined";
-                break;
-            case 1:
-                label = "(" + seperator + ") " + StringUtils.strip(sources.get(0).getLabel());
-                break;
-            default:
-                label = "(" + StringUtils.join(labels(sources).iterator(), " " + seperator + " ") + ")";
-        }
-        // if (source.getSelected() != null && source.getSelected().getLabel() != null) {
-        // String selLabel = source.getSelected().getLabel();
-        // label = selLabel + " " + label.replace(selLabel + ": ", "");
-        // }
-        return label;
-    }
+	protected String suggestSeperatedSourceLabel(Object object, String seperator) {
+		AAct source = (AAct) object;
+		EList<AAct> sources = source.getSources();
+		String label;
+		switch (sources.size()) {
+			case 0:
+				label = seperator + " Undefined";
+				break;
+			case 1:
+				label = "(" + seperator + ") " + StringUtils.strip(sources.get(0).getLabel());
+				break;
+			default:
+				label = "(" + StringUtils.join(labels(sources).iterator(), " " + seperator + " ") + ")";
+		}
+		// if (source.getSelected() != null && source.getSelected().getLabel() != null) {
+		// String selLabel = source.getSelected().getLabel();
+		// label = selLabel + " " + label.replace(selLabel + ": ", "");
+		// }
+		return label;
+	}
 
-    @Override
-    public String getColumnText(Object object, int columnIndex) {
-        if (columnIndex == 0) {
-            return ((IID) object).getLabel();
-        } else if (columnIndex == 1) {
-            if (object instanceof SNamed) {
-                return ((SNamed) object).getDescription();
-            } else {
-                return getText(object);
-            }
-        }
-        return super.getColumnText(object, columnIndex);
-    }
+	@Override
+	public String getColumnText(Object object, int columnIndex) {
+		if (columnIndex == 0) {
+			return ((IID) object).getLabel();
+		} else if (columnIndex == 1) {
+			if (object instanceof SNamed) {
+				return ((SNamed) object).getDescription();
+			} else {
+				return getText(object);
+			}
+		}
+		return super.getColumnText(object, columnIndex);
+	}
 
-    public Object getParent(Object object) {
-        if (!(object instanceof ARoot)) {
-            EList<AAct> sources = ((AAct) object).getSources();
-            if (!sources.isEmpty()) {
-                return sources.get(0);
-            }
-        } else if (object instanceof ARoot) {
-            return ((AAct) object).getGroup();
-        }
-        return super.getParent(object);
-    }
+	public Object getParent(Object object) {
+		if (!(object instanceof ARoot)) {
+			EList<AAct> sources = ((AAct) object).getSources();
+			if (!sources.isEmpty()) {
+				return sources.get(0);
+			}
+		} else if (object instanceof ARoot) {
+			return ((AAct) object).getGroup();
+		}
+		return super.getParent(object);
+	}
 
-    // @Override
-    // public Object getBackground(Object object) {
-    // AAct act = (AAct) object;
-    // if (object instanceof AGroup || act.getSelected() == null || act.getSelected().getSelected() == null
-    // || act.getSelected() == act.getSelected().getSelected()) {
-    // return super.getBackground(object);
-    // }
-    // return selectionColor((AAct) object);
-    // }
+	// @Override
+	// public Object getBackground(Object object) {
+	// AAct act = (AAct) object;
+	// if (object instanceof AGroup || act.getSelected() == null || act.getSelected().getSelected() == null
+	// || act.getSelected() == act.getSelected().getSelected()) {
+	// return super.getBackground(object);
+	// }
+	// return selectionColor((AAct) object);
+	// }
 
-    /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return MetaABMEditPlugin.INSTANCE;
-    }
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return MetaABMEditPlugin.INSTANCE;
+	}
 
-    public List<AAct> getParents(Object object) {
-        if (object instanceof ARoot) {
-            Collections.singletonList(((AAct) object).getGroup());
-        }
-        return ((AAct) object).getSources();
-    }
+	public List<AAct> getParents(Object object) {
+		if (object instanceof ARoot) {
+			Collections.singletonList(((AAct) object).getGroup());
+		}
+		return ((AAct) object).getSources();
+	}
 
-    public String suggestID(IID object) {
-        String suggestID = StringUtils.deleteWhitespace(suggestLabel(object));
-        suggestID = StringUtils.replaceChars(suggestID, "[]()", null);
-        return StringUtils.uncapitalize(suggestID);
-    }
+	public String suggestID(IID object) {
+		String suggestID = StringUtils.deleteWhitespace(suggestLabel(object));
+		suggestID = StringUtils.replaceChars(suggestID, "[]()", null);
+		return StringUtils.uncapitalize(suggestID);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAllItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAllItemProvider.java
index 20f6b10..5fa52a2 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAllItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAllItemProvider.java
@@ -34,93 +34,86 @@
 import org.metaabm.IID;
 import org.metaabm.act.AAll;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.AAll} object.
  * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class AAllItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AAllItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AAllItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AAllItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns AAll.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AAll"));
-    }
+	/**
+	 * This returns AAll.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AAll"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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 to the collection of
-     * {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of
-     * the children that can be created under this object. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-    }
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of the
+	 * children that can be created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
 
-    public String suggestID(IID object) {
-        String id = "all";
-        id += StringUtils.join(idsCaps(((AAll) object).getSources()).toArray());
-        return id;
-    }
+	public String suggestID(IID object) {
+		String id = "all";
+		id += StringUtils.join(idsCaps(((AAll) object).getSources()).toArray());
+		return id;
+	}
 
-    public String suggestLabel(IID object) {
-        return suggestSeperatedSourceLabel(object, "&");
-    }
+	public String suggestLabel(IID object) {
+		return suggestSeperatedSourceLabel(object, "&");
+	}
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAnyItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAnyItemProvider.java
index f4f07b7..a32c558 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAnyItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AAnyItemProvider.java
@@ -34,92 +34,86 @@
 import org.metaabm.IID;
 import org.metaabm.act.AAny;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.AAny} object.
  * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class AAnyItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AAnyItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AAnyItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AAnyItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns AAny.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AAny"));
-    }
+	/**
+	 * This returns AAny.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AAny"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
-    public String suggestID(IID object) {
-        String id = "any";
-        id += StringUtils.join(idsCaps(((AAny) object).getSources()).toArray());
-        return id;
-    }
+	public String suggestID(IID object) {
+		String id = "any";
+		id += StringUtils.join(idsCaps(((AAny) object).getSources()).toArray());
+		return id;
+	}
 
-    public String suggestLabel(IID object) {
-        return suggestSeperatedSourceLabel(object, "|");
-    }
+	public String suggestLabel(IID object) {
+		return suggestSeperatedSourceLabel(object, "|");
+	}
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildGeographyItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildGeographyItemProvider.java
index 2d5db98..92c001e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildGeographyItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildGeographyItemProvider.java
@@ -32,85 +32,77 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.metaabm.act.ABuildGeography;
 
-/*
- * This is the item provider adapter for a {@link
- * org.metaabm.act.ABuildGeography} object. <!-- begin-user-doc --> <!--
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ABuildGeography} object.
+ * <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * @generated
  */
-public class ABuildGeographyItemProvider extends ABuildProjectionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ABuildGeographyItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ABuildGeographyItemProvider extends ABuildProjectionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ABuildGeographyItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns ABuildGeography.gif.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuildGeography"));
-    }
+	/**
+	 * This returns ABuildGeography.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuildGeography"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildGridItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildGridItemProvider.java
index 03d9cbc..448ec5d 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildGridItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildGridItemProvider.java
@@ -34,105 +34,88 @@
 import org.metaabm.act.ABuildGrid;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ABuildGrid}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ABuildGrid} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ABuildGridItemProvider extends ABuildSpaceItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ABuildGridItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ABuildGridItemProvider extends ABuildSpaceItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ABuildGridItemProvider(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);
+	/**
+	 * 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);
 
-            addFillAgentPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addFillAgentPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Fill Agent feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addFillAgentPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ABuildGrid_fillAgent_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ABuildGrid_fillAgent_feature",
-                                                                           "_UI_ABuildGrid_type"),
-                                                                 MetaABMActPackage.Literals.ABUILD_GRID__FILL_AGENT,
-                                                                 true, false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Fill Agent feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addFillAgentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ABuildGrid_fillAgent_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ABuildGrid_fillAgent_feature", "_UI_ABuildGrid_type"), MetaABMActPackage.Literals.ABUILD_GRID__FILL_AGENT, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ABuildGrid.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuildGrid"));
-    }
+	/**
+	 * This returns ABuildGrid.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuildGrid"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildItemProvider.java
index 1f2072b..a935047 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildItemProvider.java
@@ -40,138 +40,110 @@
 import org.metaabm.act.ABuild;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ABuild}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ABuild} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ABuildItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ABuildItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ABuildItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ABuildItemProvider(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);
+	/**
+	 * 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);
 
-            addPluralLabelPropertyDescriptor(object);
-            addDescriptionPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addPluralLabelPropertyDescriptor(object);
+			addDescriptionPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Plural Label feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addPluralLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_pluralLabel_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_pluralLabel_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Plural Label feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPluralLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_pluralLabel_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_pluralLabel_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Description feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_description_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_description_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__DESCRIPTION, true,
-                                                                 true, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_description_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__DESCRIPTION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ABuild.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuild"));
-    }
+	/**
+	 * This returns ABuild.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuild"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    public String suggestLabel(IID object) {
-        SAgent agent = ((ABuild) object).getReference();
-        return "Build " + (agent != null ? agent.getLabel() : "Context");
-    }
+	public String suggestLabel(IID object) {
+		SAgent agent = ((ABuild) object).getReference();
+		return "Build " + (agent != null ? agent.getLabel() : "Context");
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ABuild.class)) {
-            case MetaABMActPackage.ABUILD__PLURAL_LABEL:
-            case MetaABMActPackage.ABUILD__DESCRIPTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ABuild.class)) {
+			case MetaABMActPackage.ABUILD__PLURAL_LABEL:
+			case MetaABMActPackage.ABUILD__DESCRIPTION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildNetworkItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildNetworkItemProvider.java
index 40b6509..c3610ca 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildNetworkItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildNetworkItemProvider.java
@@ -36,91 +36,84 @@
 import org.metaabm.act.ABuildNetwork;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ABuildNetwork}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ABuildNetwork} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ABuildNetworkItemProvider extends ABuildProjectionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ABuildNetworkItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ABuildNetworkItemProvider extends ABuildProjectionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ABuildNetworkItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns ABuildNetwork.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuildNetwork"));
-    }
+	/**
+	 * This returns ABuildNetwork.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuildNetwork"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ABuildNetwork.class)) {
-            case MetaABMActPackage.ABUILD_NETWORK__NETWORK_TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ABuildNetwork.class)) {
+			case MetaABMActPackage.ABUILD_NETWORK__NETWORK_TYPE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildProjectionItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildProjectionItemProvider.java
index 2eb5316..249be06 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildProjectionItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildProjectionItemProvider.java
@@ -41,177 +41,128 @@
 import org.metaabm.act.ABuildProjection;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link
- * org.metaabm.act.ABuildProjection} object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ABuildProjection} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ABuildProjectionItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public ABuildProjectionItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ABuildProjectionItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ABuildProjectionItemProvider(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);
+	/**
+	 * 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);
 
-            addPluralLabelPropertyDescriptor(object);
-            addDescriptionPropertyDescriptor(object);
-            addAgentsPropertyDescriptor(object);
-            addProjectionPropertyDescriptor(object);
-            addAttributesPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addPluralLabelPropertyDescriptor(object);
+			addDescriptionPropertyDescriptor(object);
+			addAgentsPropertyDescriptor(object);
+			addProjectionPropertyDescriptor(object);
+			addAttributesPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Plural Label feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addPluralLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_pluralLabel_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_pluralLabel_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Plural Label feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPluralLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_pluralLabel_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_pluralLabel_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Description feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_description_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_description_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__DESCRIPTION, true,
-                                                                 true, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_description_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__DESCRIPTION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Agents feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addAgentsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ABuildProjection_agents_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ABuildProjection_agents_feature",
-                                                                           "_UI_ABuildProjection_type"),
-                                                                 MetaABMActPackage.Literals.ABUILD_PROJECTION__AGENTS,
-                                                                 true, false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Agents feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAgentsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ABuildProjection_agents_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ABuildProjection_agents_feature", "_UI_ABuildProjection_type"), MetaABMActPackage.Literals.ABUILD_PROJECTION__AGENTS, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Projection feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addProjectionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                                  getResourceLocator(),
-                                                  getString("_UI_ABuildProjection_projection_feature"),
-                                                  getString("_UI_PropertyDescriptor_description",
-                                                            "_UI_ABuildProjection_projection_feature",
-                                                            "_UI_ABuildProjection_type"),
-                                                  MetaABMActPackage.Literals.ABUILD_PROJECTION__PROJECTION, true,
-                                                  false, true, null, getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Projection feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addProjectionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ABuildProjection_projection_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ABuildProjection_projection_feature", "_UI_ABuildProjection_type"), MetaABMActPackage.Literals.ABUILD_PROJECTION__PROJECTION, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Attributes feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addAttributesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                                  getResourceLocator(),
-                                                  getString("_UI_ABuildProjection_attributes_feature"),
-                                                  getString("_UI_PropertyDescriptor_description",
-                                                            "_UI_ABuildProjection_attributes_feature",
-                                                            "_UI_ABuildProjection_type"),
-                                                  MetaABMActPackage.Literals.ABUILD_PROJECTION__ATTRIBUTES, true,
-                                                  false, true, null, getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Attributes feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAttributesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ABuildProjection_attributes_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ABuildProjection_attributes_feature", "_UI_ABuildProjection_type"), MetaABMActPackage.Literals.ABUILD_PROJECTION__ATTRIBUTES, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ABuildProjection.class)) {
-            case MetaABMActPackage.ABUILD_PROJECTION__PLURAL_LABEL:
-            case MetaABMActPackage.ABUILD_PROJECTION__DESCRIPTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ABuildProjection.class)) {
+			case MetaABMActPackage.ABUILD_PROJECTION__PLURAL_LABEL:
+			case MetaABMActPackage.ABUILD_PROJECTION__DESCRIPTION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
-    public String suggestLabel(IID object) {
-        SProjection projection = ((ABuildProjection) object).getProjection();
-        return "Build "
-            + (projection != null && projection.getLabel() != null ? StringUtils.capitalize(projection.getLabel())
-                : "[?]");
-    }
+	public String suggestLabel(IID object) {
+		SProjection projection = ((ABuildProjection) object).getProjection();
+		return "Build " + (projection != null && projection.getLabel() != null ? StringUtils.capitalize(projection.getLabel()) : "[?]");
+	}
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildSpaceItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildSpaceItemProvider.java
index 17baa56..6c2464d 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildSpaceItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ABuildSpaceItemProvider.java
@@ -36,112 +36,94 @@
 import org.metaabm.act.ABuildSpace;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ABuildSpace}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ABuildSpace} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ABuildSpaceItemProvider extends ABuildProjectionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ABuildSpaceItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ABuildSpaceItemProvider extends ABuildProjectionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ABuildSpaceItemProvider(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);
+	/**
+	 * 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);
 
-            addSpaceTypePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addSpaceTypePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Space Type feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addSpaceTypePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ABuildSpace_spaceType_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ABuildSpace_spaceType_feature",
-                                                                           "_UI_ABuildSpace_type"),
-                                                                 MetaABMActPackage.Literals.ABUILD_SPACE__SPACE_TYPE,
-                                                                 true, false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Space Type feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSpaceTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ABuildSpace_spaceType_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ABuildSpace_spaceType_feature", "_UI_ABuildSpace_type"), MetaABMActPackage.Literals.ABUILD_SPACE__SPACE_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ABuildSpace.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuildSpace"));
-    }
+	/**
+	 * This returns ABuildSpace.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ABuildSpace"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ABuildSpace.class)) {
-            case MetaABMActPackage.ABUILD_SPACE__SPACE_TYPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ABuildSpace.class)) {
+			case MetaABMActPackage.ABUILD_SPACE__SPACE_TYPE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACauseItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACauseItemProvider.java
index f0e0961..7215320 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACauseItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACauseItemProvider.java
@@ -31,110 +31,100 @@
  * <!-- end-user-doc -->
  * @generated
  */
-public class ACauseItemProvider extends ACommandItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public ACauseItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ACauseItemProvider extends ACommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ACauseItemProvider(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);
+	/**
+	 * 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);
 
-            addResultPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addResultPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Result feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addResultPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ACause_result_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ACause_result_feature",
-                                                                           "_UI_ACause_type"),
-                                                                 MetaABMActPackage.Literals.ACAUSE__RESULT, true,
-                                                                 false, true, null, null, null));
-    }
+	/**
+	 * This adds a property descriptor for the Result feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addResultPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ACause_result_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ACause_result_feature", "_UI_ACause_type"), MetaABMActPackage.Literals.ACAUSE__RESULT, true, false, true, null, null, null));
+	}
 
-    /**
-     * This returns ACause.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ACause"));
-    }
+	/**
+	 * This returns ACause.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ACause"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        ACause cause = (ACause) object;
-        if (cause.getResult() != null) {
-            return "Cause " + cause.getResult().getLabel();
-        }
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		ACause cause = (ACause) object;
+		if (cause.getResult() != null) {
+			return "Cause " + cause.getResult().getLabel();
+		}
+		return super.getText(object);
+	}
 
-    public String suggestLabel(IID object) {
-        ACause cause = (ACause) object;
-        if (cause.getResult() != null) {
-            return "Cause " + cause.getResult();
-        }
-        return super.suggestLabel(object);
-    }
+	public String suggestLabel(IID object) {
+		ACause cause = (ACause) object;
+		if (cause.getResult() != null) {
+			return "Cause " + cause.getResult();
+		}
+		return super.suggestLabel(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACommandItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACommandItemProvider.java
index 4657d4d..909dd02 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACommandItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACommandItemProvider.java
@@ -32,79 +32,77 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.metaabm.act.ACommand;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ACommand}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ACommand} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ACommandItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public ACommandItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ACommandItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ACommandItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns ACommand.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ACommand"));
-    }
+	/**
+	 * This returns ACommand.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ACommand"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AConnectItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AConnectItemProvider.java
index c151053..91f9316 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AConnectItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AConnectItemProvider.java
@@ -37,125 +37,102 @@
 import org.metaabm.act.AConnect;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AConnect}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AConnect} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AConnectItemProvider extends ANetworkItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AConnectItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AConnectItemProvider extends ANetworkItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AConnectItemProvider(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);
+	/**
+	 * 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);
 
-            addDirectedPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addDirectedPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Directed feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addDirectedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_AConnect_directed_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_AConnect_directed_feature",
-                                                                           "_UI_AConnect_type"),
-                                                                 MetaABMActPackage.Literals.ACONNECT__DIRECTED, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Directed feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDirectedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AConnect_directed_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AConnect_directed_feature", "_UI_AConnect_type"), MetaABMActPackage.Literals.ACONNECT__DIRECTED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns AConnect.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AConnect"));
-    }
+	/**
+	 * This returns AConnect.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AConnect"));
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(AConnect.class)) {
-            case MetaABMActPackage.ACONNECT__DIRECTED:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AConnect.class)) {
+			case MetaABMActPackage.ACONNECT__DIRECTED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
-    public String suggestLabel(IID object) {
-        AConnect connect = (AConnect) object;
-        String name = "Connect";
-        name = name
-            + ((connect.getSelected() != null && connect.getSelected().getAgent() != null) ? (" " + connect
-                    .getSelected().getAgent().getLabel()) : "");
-        name = name
-            + ((connect.getDestination() != null && connect.getDestination().getAgent() != null) ? (" to " + connect
-                    .getDestination().getAgent().getLabel()) : "");
-        name = name
-            + ((connect.getDestination() != null && connect.getDestination().getSpace() != null) ? (" in " + connect
-                    .getDestination().getSpace().getLabel()) : "");
-        return name;
-    }
+	public String suggestLabel(IID object) {
+		AConnect connect = (AConnect) object;
+		String name = "Connect";
+		name = name + ((connect.getSelected() != null && connect.getSelected().getAgent() != null) ? (" " + connect.getSelected().getAgent().getLabel()) : "");
+		name = name + ((connect.getDestination() != null && connect.getDestination().getAgent() != null) ? (" to " + connect.getDestination().getAgent().getLabel()) : "");
+		name = name + ((connect.getDestination() != null && connect.getDestination().getSpace() != null) ? (" in " + connect.getDestination().getSpace().getLabel()) : "");
+		return name;
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACreateAgentsItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACreateAgentsItemProvider.java
index 8fd8482..06652c4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACreateAgentsItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACreateAgentsItemProvider.java
@@ -35,120 +35,104 @@
 import org.metaabm.IID;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ACreateAgents}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ACreateAgents} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ACreateAgentsItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ACreateAgentsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ACreateAgentsItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ACreateAgentsItemProvider(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);
+	/**
+	 * 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);
 
-            addAgentCountPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addAgentCountPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Agent Count feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addAgentCountPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                                  getResourceLocator(),
-                                                  getString("_UI_ACreateAgents_agentCount_feature"),
-                                                  getString("_UI_PropertyDescriptor_description",
-                                                            "_UI_ACreateAgents_agentCount_feature",
-                                                            "_UI_ACreateAgents_type"),
-                                                  MetaABMActPackage.Literals.ACREATE_AGENTS__AGENT_COUNT, true, false,
-                                                  true, null, getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Agent Count feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAgentCountPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ACreateAgents_agentCount_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ACreateAgents_agentCount_feature", "_UI_ACreateAgents_type"), MetaABMActPackage.Literals.ACREATE_AGENTS__AGENT_COUNT, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ACreateAgents.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ACreateAgents"));
-    }
+	/**
+	 * This returns ACreateAgents.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ACreateAgents"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
+	}
 
-    // public String suggestLabel(IID object) {
-    // SAgent agent = ((ACreateAgents) object).getAgent();
-    // return agent != null ?
-    // SetLabelCommand.LABEL_TO_AGENT_CREATOR_LABEL_TRANSLATOR
-    // .translateName(agent.getLabel())
-    // : super.suggestID(object);
-    // }
-    //
-    // public String suggestID(IID object) {
-    // return "";
-    // }
+	// public String suggestLabel(IID object) {
+	// SAgent agent = ((ACreateAgents) object).getAgent();
+	// return agent != null ?
+	// SetLabelCommand.LABEL_TO_AGENT_CREATOR_LABEL_TRANSLATOR
+	// .translateName(agent.getLabel())
+	// : super.suggestID(object);
+	// }
+	//
+	// public String suggestID(IID object) {
+	// return "";
+	// }
 
-    public String suggestLabel(IID object) {
-        return getString("_UI_" + object.eClass().getName() + "_type");
-    }
+	public String suggestLabel(IID object) {
+		return getString("_UI_" + object.eClass().getName() + "_type");
+	}
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACreateShapedAgentsItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACreateShapedAgentsItemProvider.java
index 397c5b2..8ebcf1f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACreateShapedAgentsItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ACreateShapedAgentsItemProvider.java
@@ -36,114 +36,94 @@
 import org.metaabm.act.ACreateShapedAgents;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link
- * org.metaabm.act.ACreateShapedAgents} object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ACreateShapedAgents} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
-public class ACreateShapedAgentsItemProvider extends ACreateAgentsItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ACreateShapedAgentsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ACreateShapedAgentsItemProvider extends ACreateAgentsItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ACreateShapedAgentsItemProvider(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);
+	/**
+	 * 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);
 
-            addShapePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addShapePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Shape feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addShapePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_AShaped_shape_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_AShaped_shape_feature",
-                                                                           "_UI_AShaped_type"),
-                                                                 MetaABMActPackage.Literals.ASHAPED__SHAPE, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Shape feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addShapePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AShaped_shape_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AShaped_shape_feature", "_UI_AShaped_type"), MetaABMActPackage.Literals.ASHAPED__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ACreateShapedAgents.gif.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ACreateShapedAgents"));
-    }
+	/**
+	 * This returns ACreateShapedAgents.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ACreateShapedAgents"));
+	}
 
-    /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((ACreateShapedAgents) object).getID();
-        return label == null || label.length() == 0 ? getString("_UI_ACreateShapedAgents_type")
-            : getString("_UI_ACreateShapedAgents_type") + " " + label;
-    }
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ACreateShapedAgents) object).getID();
+		return label == null || label.length() == 0 ? getString("_UI_ACreateShapedAgents_type") : getString("_UI_ACreateShapedAgents_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 -->
-     * @generated
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ACreateShapedAgents.class)) {
-            case MetaABMActPackage.ACREATE_SHAPED_AGENTS__SHAPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ACreateShapedAgents.class)) {
+			case MetaABMActPackage.ACREATE_SHAPED_AGENTS__SHAPE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADeriveItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADeriveItemProvider.java
index 806c82a..031fc15 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADeriveItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADeriveItemProvider.java
@@ -34,147 +34,123 @@
  * end-user-doc -->
  * @generated
  */
-public class ADeriveItemProvider extends AAccessorItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public ADeriveItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ADeriveItemProvider extends AAccessorItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ADeriveItemProvider(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);
+	/**
+	 * 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);
 
-            addAgentPropertyDescriptor(object);
-            addSpacePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addAgentPropertyDescriptor(object);
+			addSpacePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Agent feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addAgentPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASelect_agent_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASelect_agent_feature",
-                                                                           "_UI_ASelect_type"),
-                                                                 MetaABMActPackage.Literals.ASELECT__AGENT, true,
-                                                                 false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Agent feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAgentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASelect_agent_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASelect_agent_feature", "_UI_ASelect_type"), MetaABMActPackage.Literals.ASELECT__AGENT, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                .getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAccessor_attribute_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AAccessor_attribute_feature", "_UI_AAccessor_type"),
-            MetaABMActPackage.Literals.AACCESSOR__ATTRIBUTE, true, false, true, null,
-            getString("_UI_ActPropertyCategory"), null) {
-            @SuppressWarnings("unchecked")
-            public Collection<?> getChoiceOfValues(Object object) {
-                ADerive derive = (ADerive) object;
-                Collection<SAttribute> attributes = derive.getReference().getAttributes();
-                Collection<SAttribute> derivedAttributes = new ArrayList<SAttribute>();
-                for (SAttribute attr : attributes) {
-                    if (attr.isDerived()) {
-                        derivedAttributes.add(attr);
-                    }
-                }
-                return derivedAttributes;
-            }
+	/**
+	 * This adds a property descriptor for the Attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addAttributePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AAccessor_attribute_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AAccessor_attribute_feature", "_UI_AAccessor_type"), MetaABMActPackage.Literals.AACCESSOR__ATTRIBUTE, true, false, true, null, getString("_UI_ActPropertyCategory"), null) {
+			@SuppressWarnings("unchecked")
+			public Collection<?> getChoiceOfValues(Object object) {
+				ADerive derive = (ADerive) object;
+				Collection<SAttribute> attributes = derive.getReference().getAttributes();
+				Collection<SAttribute> derivedAttributes = new ArrayList<SAttribute>();
+				for (SAttribute attr : attributes) {
+					if (attr.isDerived()) {
+						derivedAttributes.add(attr);
+					}
+				}
+				return derivedAttributes;
+			}
 
-        });
-    }
+		});
+	}
 
-    /**
-     * This adds a property descriptor for the Space feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addSpacePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASelect_space_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASelect_space_feature",
-                                                                           "_UI_ASelect_type"),
-                                                                 MetaABMActPackage.Literals.ASELECT__SPACE, true,
-                                                                 false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Space feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSpacePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASelect_space_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASelect_space_feature", "_UI_ASelect_type"), MetaABMActPackage.Literals.ASELECT__SPACE, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ADerive.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ADerive"));
-    }
+	/**
+	 * This returns ADerive.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ADerive"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ADerive.class)) {
-            case MetaABMActPackage.ADERIVE__AGENT:
-            case MetaABMActPackage.ADERIVE__SPACE:
-            case MetaABMActPackage.ADERIVE__FOR:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ADerive.class)) {
+			case MetaABMActPackage.ADERIVE__AGENT:
+			case MetaABMActPackage.ADERIVE__SPACE:
+			case MetaABMActPackage.ADERIVE__FOR:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADieItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADieItemProvider.java
index 87ea8eb..a86b35f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADieItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADieItemProvider.java
@@ -33,92 +33,85 @@
 import org.metaabm.IID;
 import org.metaabm.act.ADie;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.ADie} object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ADieItemProvider extends ATransformItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ADieItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ADieItemProvider extends ATransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ADieItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns ADie.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ADie"));
-    }
+	/**
+	 * This returns ADie.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ADie"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
+	}
 
-    public String suggestLabel(IID object) {
-        ADie die = (ADie) object;
-        String name = (die.getSelected() != null && die.getSelected().getAgent() != null) ? (die.getSelected()
-                .getAgent().getLabel() + " ") : "";
-        name = name + "Die";
-        name = name + ((die.getSelected() != null) ? (" in " + die.getSelected().getLabel()) : "");
-        return name;
-    }
+	public String suggestLabel(IID object) {
+		ADie die = (ADie) object;
+		String name = (die.getSelected() != null && die.getSelected().getAgent() != null) ? (die.getSelected().getAgent().getLabel() + " ") : "";
+		name = name + "Die";
+		name = name + ((die.getSelected() != null) ? (" in " + die.getSelected().getLabel()) : "");
+		return name;
+	}
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADiffuseItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADiffuseItemProvider.java
index af35209..2592826 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADiffuseItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADiffuseItemProvider.java
@@ -38,162 +38,147 @@
  * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
-public class ADiffuseItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ADiffuseItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ADiffuseItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public ADiffuseItemProvider(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);
+	/**
+	 * 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);
 
-            addDiffusedPropertyDescriptor(object);
-            addDiffusionRatePropertyDescriptor(object);
-            addEvaporationRatePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addDiffusedPropertyDescriptor(object);
+			addDiffusionRatePropertyDescriptor(object);
+			addEvaporationRatePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    protected void filterAttributes(EList<SAttribute> potential, Collection<SAttribute> applicable) {
-        for (SAttribute attr : potential) {
-            if (!attr.isImmutable() && SAttributeType.NUMERIC_ACCEPTS.contains(attr.getSType())) {
-                applicable.add(attr);
-            }
-        }
-    }
+	protected void filterAttributes(EList<SAttribute> potential, Collection<SAttribute> applicable) {
+		for (SAttribute attr : potential) {
+			if (!attr.isImmutable() && SAttributeType.NUMERIC_ACCEPTS.contains(attr.getSType())) {
+				applicable.add(attr);
+			}
+		}
+	}
 
-    protected Collection<?> getAssignableValues(Object object) {
-        ASelect diffuse = (ASelect) object;
-        Collection<SAttribute> potentialRates = new ArrayList<SAttribute>();
-        SContext parent = diffuse.getAgent().getOwner();
-        while (parent != null) {
-            filterAttributes(parent.getAttributes(), potentialRates);
-            parent = parent.getOwner();
-        }
-        return potentialRates;
-    }
+	protected Collection<?> getAssignableValues(Object object) {
+		ASelect diffuse = (ASelect) object;
+		Collection<SAttribute> potentialRates = new ArrayList<SAttribute>();
+		SContext parent = diffuse.getAgent().getOwner();
+		while (parent != null) {
+			filterAttributes(parent.getAttributes(), potentialRates);
+			parent = parent.getOwner();
+		}
+		return potentialRates;
+	}
 
-    /**
-     * This adds a property descriptor for the Diffused feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addDiffusedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                .getRootAdapterFactory(), getResourceLocator(), getString("_UI_ADiffuse_diffused_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_ADiffuse_diffused_feature", "_UI_ADiffuse_type"),
-            MetaABMActPackage.Literals.ADIFFUSE__DIFFUSED, true, false, true, null,
-            getString("_UI_ActPropertyCategory"), null) {
-            public Collection<?> getChoiceOfValues(Object object) {
-                ADiffuse diffuse = (ADiffuse) object;
-                Collection<SAttribute> diffusable = new ArrayList<SAttribute>();
-                filterAttributes(diffuse.getAgent().getAttributes(), diffusable);
-                return diffusable;
-            }
+	/**
+	 * This adds a property descriptor for the Diffused feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addDiffusedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ADiffuse_diffused_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ADiffuse_diffused_feature", "_UI_ADiffuse_type"), MetaABMActPackage.Literals.ADIFFUSE__DIFFUSED, true, false, true, null, getString("_UI_ActPropertyCategory"), null) {
+			public Collection<?> getChoiceOfValues(Object object) {
+				ADiffuse diffuse = (ADiffuse) object;
+				Collection<SAttribute> diffusable = new ArrayList<SAttribute>();
+				filterAttributes(diffuse.getAgent().getAttributes(), diffusable);
+				return diffusable;
+			}
 
-        });
-    }
+		});
+	}
 
-    /**
-     * This adds a property descriptor for the Diffusion Rate feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addDiffusionRatePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                .getRootAdapterFactory(), getResourceLocator(), getString("_UI_ADiffuse_diffusionRate_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_ADiffuse_diffusionRate_feature", "_UI_ADiffuse_type"),
-            MetaABMActPackage.Literals.ADIFFUSE__DIFFUSION_RATE, true, false, true, null,
-            getString("_UI_ActPropertyCategory"), null) {
-            public Collection<?> getChoiceOfValues(Object object) {
-                return getAssignableValues(object);
-            }
-        });
-    }
+	/**
+	 * This adds a property descriptor for the Diffusion Rate feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addDiffusionRatePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ADiffuse_diffusionRate_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ADiffuse_diffusionRate_feature", "_UI_ADiffuse_type"), MetaABMActPackage.Literals.ADIFFUSE__DIFFUSION_RATE, true, false, true, null, getString("_UI_ActPropertyCategory"), null) {
+			public Collection<?> getChoiceOfValues(Object object) {
+				return getAssignableValues(object);
+			}
+		});
+	}
 
-    /**
-     * This adds a property descriptor for the Evaporation Rate feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addEvaporationRatePropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                    getResourceLocator(), getString("_UI_ADiffuse_evaporationRate_feature"),
-                    getString("_UI_PropertyDescriptor_description", "_UI_ADiffuse_evaporationRate_feature",
-                              "_UI_ADiffuse_type"), MetaABMActPackage.Literals.ADIFFUSE__EVAPORATION_RATE, true, false,
-                    true, null, getString("_UI_ActPropertyCategory"), null) {
-                    public Collection<?> getChoiceOfValues(Object object) {
-                        return getAssignableValues(object);
-                    }
-                });
-    }
+	/**
+	 * This adds a property descriptor for the Evaporation Rate feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addEvaporationRatePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ADiffuse_evaporationRate_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ADiffuse_evaporationRate_feature", "_UI_ADiffuse_type"), MetaABMActPackage.Literals.ADIFFUSE__EVAPORATION_RATE, true, false, true, null, getString("_UI_ActPropertyCategory"), null) {
+			public Collection<?> getChoiceOfValues(Object object) {
+				return getAssignableValues(object);
+			}
+		});
+	}
 
-    /**
-     * This returns ADiffuse.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ADiffuse"));
-    }
+	/**
+	 * This returns ADiffuse.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ADiffuse"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
-    public String suggestLabel(IID object) {
-        return "Diffuse";
-    }
+	public String suggestLabel(IID object) {
+		return "Diffuse";
+	}
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADisconnectItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADisconnectItemProvider.java
index e5a91d1..7cb486e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADisconnectItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ADisconnectItemProvider.java
@@ -32,86 +32,78 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.metaabm.act.ADisconnect;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ADisconnect}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ADisconnect} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ADisconnectItemProvider extends ANetworkItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ADisconnectItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ADisconnectItemProvider extends ANetworkItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ADisconnectItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns ADisconnect.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ADisconnect"));
-    }
+	/**
+	 * This returns ADisconnect.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ADisconnect"));
+	}
 
-    /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((ADisconnect) object).getID();
-        return label == null || label.length() == 0 ? getString("_UI_ADisconnect_type")
-            : getString("_UI_ADisconnect_type") + " " + label;
-    }
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ADisconnect) object).getID();
+		return label == null || label.length() == 0 ? getString("_UI_ADisconnect_type") : getString("_UI_ADisconnect_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 -->
-     * @generated
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
-    }
+	/**
+	 * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AEvaluateItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AEvaluateItemProvider.java
index 62b12e8..619e4ea 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AEvaluateItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AEvaluateItemProvider.java
@@ -37,119 +37,112 @@
 import org.metaabm.act.AEvaluate;
 import org.metaabm.function.FFunction;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AEvaluate}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AEvaluate} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class AEvaluateItemProvider extends ASinkItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+public class AEvaluateItemProvider extends ASinkItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
 
-    static URI TANGERINE_COLOR = URI.createURI("color://rgb/255/140/0");
+	static URI TANGERINE_COLOR = URI.createURI("color://rgb/255/140/0");
 
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AEvaluateItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AEvaluateItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
 
-    /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public List<IItemPropertyDescriptor> getPropertyDescriptorsGen(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List<IItemPropertyDescriptor> getPropertyDescriptorsGen(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
 
-        }
-        return itemPropertyDescriptors;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    static Map<FFunction, Object> queryImages = new HashMap<FFunction, Object>();
+	static Map<FFunction, Object> queryImages = new HashMap<FFunction, Object>();
 
-    public Map<FFunction, Object> getImageCache() {
-        return queryImages;
-    }
+	public Map<FFunction, Object> getImageCache() {
+		return queryImages;
+	}
 
-    /**
-     * This returns AEvaluate.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public Object getImage(Object object) {
-        return super.getImage(object);
-    }
+	/**
+	 * This returns AEvaluate.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return super.getImage(object);
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    protected FFunction baseFunction(Object object) {
-        return ((AEvaluate) object).getFunction();
-    }
+	protected FFunction baseFunction(Object object) {
+		return ((AEvaluate) object).getFunction();
+	}
 
-    /**
-     * 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 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);
+	}
 
-    public String getQualifier() {
-        return "F";
-    }
+	public String getQualifier() {
+		return "F";
+	}
 
-    // @Override
-    // public Object getForeground(Object object) {
-    // return TANGERINE_COLOR;
-    // }
+	// @Override
+	// public Object getForeground(Object object) {
+	// return TANGERINE_COLOR;
+	// }
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AGroupItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AGroupItemProvider.java
index 0d81979..4f6c5a9 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AGroupItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AGroupItemProvider.java
@@ -58,344 +58,278 @@
 import org.metaabm.act.MetaABMActPackage;
 import org.metaabm.commands.RemoveMultiValueCommand;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AGroup}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AGroup} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AGroupItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AGroupItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AGroupItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AGroupItemProvider(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);
+	/**
+	 * 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);
 
-            addPluralLabelPropertyDescriptor(object);
-            addDescriptionPropertyDescriptor(object);
-            addRootsPropertyDescriptor(object);
-            addMembersPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addPluralLabelPropertyDescriptor(object);
+			addDescriptionPropertyDescriptor(object);
+			addRootsPropertyDescriptor(object);
+			addMembersPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Plural Label feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addPluralLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_pluralLabel_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_pluralLabel_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Plural Label feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPluralLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_pluralLabel_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_pluralLabel_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Description feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_description_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_description_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__DESCRIPTION, true,
-                                                                 true, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_description_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__DESCRIPTION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Roots feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addRootsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_AGroup_roots_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_AGroup_roots_feature",
-                                                                           "_UI_AGroup_type"),
-                                                                 MetaABMActPackage.Literals.AGROUP__ROOTS, false,
-                                                                 false, false, null,
-                                                                 getString("_UI_RelationsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Roots feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addRootsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AGroup_roots_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AGroup_roots_feature", "_UI_AGroup_type"), MetaABMActPackage.Literals.AGROUP__ROOTS, false, false, false, null, getString("_UI_RelationsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Members feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addMembersPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                                  getResourceLocator(),
-                                                  getString("_UI_AGroup_members_feature"),
-                                                  getString("_UI_PropertyDescriptor_description",
-                                                            "_UI_AGroup_members_feature", "_UI_AGroup_type"),
-                                                  MetaABMActPackage.Literals.AGROUP__MEMBERS, true, true, false, null,
-                                                  getString("_UI_RelationsPropertyCategory"),
-                                                  new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Members feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMembersPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AGroup_members_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AGroup_members_feature", "_UI_AGroup_type"), MetaABMActPackage.Literals.AGROUP__MEMBERS, true, true, false, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    // public Collection getChildren(Object object) {
-    // if (children == null) {
-    // Collection children = super.getChildren(object);
-    // children.add(registerIntermediary(object,
-    // MetaABMActPackage.Literals.AGROUP__MEMBERS));
-    // }
-    // return children;
-    // }
+	// public Collection getChildren(Object object) {
+	// if (children == null) {
+	// Collection children = super.getChildren(object);
+	// children.add(registerIntermediary(object,
+	// MetaABMActPackage.Literals.AGROUP__MEMBERS));
+	// }
+	// return children;
+	// }
 
-    /**
-     * 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 -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            childrenFeatures = new ArrayList<EStructuralFeature>();
-            childrenFeatures.add(MetaABMActPackage.Literals.AGROUP__ROOTS);
-        }
-        return childrenFeatures;
-    }
+	/**
+	 * 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 -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			childrenFeatures = new ArrayList<EStructuralFeature>();
+			childrenFeatures.add(MetaABMActPackage.Literals.AGROUP__ROOTS);
+		}
+		return childrenFeatures;
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
-    }
+		return super.getChildFeature(object, child);
+	}
 
-    /**
-     * This returns AGroup.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AGroup"));
-    }
+	/**
+	 * This returns AGroup.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AGroup"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public String getText(Object object) {
-        if (getParent(object) instanceof SAgent) {
-            return "Actions";
-        } else {
-            return super.getText(object);
-        }
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public String getText(Object object) {
+		if (getParent(object) instanceof SAgent) {
+			return "Actions";
+		} else {
+			return super.getText(object);
+		}
+	}
 
-    // @Override
-    // protected boolean isWrappingNeeded(Object object) {
-    // return false;
-    // }
+	// @Override
+	// protected boolean isWrappingNeeded(Object object) {
+	// return false;
+	// }
 
-    /**
-     * 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 NOT
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+	/**
+	 * 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 NOT
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
 
-        switch (notification.getFeatureID(AGroup.class)) {
-            case MetaABMActPackage.AGROUP__PLURAL_LABEL:
-            case MetaABMActPackage.AGROUP__DESCRIPTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case MetaABMActPackage.AGROUP__ROOTS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                fireNotifyChanged(new ViewerNotification(notification, getParent(notification.getNotifier()), true,
-                    false));
-            case MetaABMActPackage.AGROUP__MEMBERS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AGroup.class)) {
+			case MetaABMActPackage.AGROUP__PLURAL_LABEL:
+			case MetaABMActPackage.AGROUP__DESCRIPTION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case MetaABMActPackage.AGROUP__ROOTS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				fireNotifyChanged(new ViewerNotification(notification, getParent(notification.getNotifier()), true, false));
+			case MetaABMActPackage.AGROUP__MEMBERS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
 
-    @SuppressWarnings("unchecked")
-    protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature,
-            Collection<?> collection) {
-        if (feature == MetaABMActPackage.Literals.AGROUP__ROOTS) {
-            return createRemoveCommand(domain, owner, (EStructuralFeature) MetaABMActPackage.Literals.AGROUP__MEMBERS,
-                                       collection);
-        } else if (feature == MetaABMActPackage.Literals.AGROUP__MEMBERS) {
-            CompoundCommand cmd = new CompoundCommand();
-            // Map usages = EcoreUtil.UsageCrossReferencer.findAll(collection,
-            // domain.getResourceSet());
-            for (AAct act : (Collection<AAct>) collection) {
-                cmd.appendIfCanExecute(RemoveCommand.create(domain, act, MetaABMActPackage.Literals.AACT__TARGETS,
-                                                            act.getTargets()));
-                if (act.getSelected() == act) {
-                    cmd.append(SetCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SELECTED, null));
-                }
-                if (act instanceof ASink) {
-                    ASink sink = (ASink) act;
-                    if (sink.isMultiValue()) {
-                        cmd.append(new RemoveMultiValueCommand(domain, sink));
-                    }
-                    // cmd.appendIfCanExecute(SetCommand.create(domain, act,
-                    // (EStructuralFeature)
-                    // MetaABMActPackage.Literals.ASINK__FUNCTION, null));
-                }
-            }
-            for (AAct act : (Collection<AAct>) collection) {
-                cmd.appendIfCanExecute(RemoveCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SOURCES,
-                                                            act.getSources()));
-            }
-            cmd.append(super.createRemoveCommand(domain, owner,
-                                                 (EStructuralFeature) MetaABMActPackage.Literals.AGROUP__MEMBERS,
-                                                 collection));
-            return cmd;
-        }
-        return super.createRemoveCommand(domain, owner, feature, collection);
-    }
+	@SuppressWarnings("unchecked")
+	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
+		if (feature == MetaABMActPackage.Literals.AGROUP__ROOTS) {
+			return createRemoveCommand(domain, owner, (EStructuralFeature) MetaABMActPackage.Literals.AGROUP__MEMBERS, collection);
+		} else if (feature == MetaABMActPackage.Literals.AGROUP__MEMBERS) {
+			CompoundCommand cmd = new CompoundCommand();
+			// Map usages = EcoreUtil.UsageCrossReferencer.findAll(collection,
+			// domain.getResourceSet());
+			for (AAct act : (Collection<AAct>) collection) {
+				cmd.appendIfCanExecute(RemoveCommand.create(domain, act, MetaABMActPackage.Literals.AACT__TARGETS, act.getTargets()));
+				if (act.getSelected() == act) {
+					cmd.append(SetCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SELECTED, null));
+				}
+				if (act instanceof ASink) {
+					ASink sink = (ASink) act;
+					if (sink.isMultiValue()) {
+						cmd.append(new RemoveMultiValueCommand(domain, sink));
+					}
+					// cmd.appendIfCanExecute(SetCommand.create(domain, act,
+					// (EStructuralFeature)
+					// MetaABMActPackage.Literals.ASINK__FUNCTION, null));
+				}
+			}
+			for (AAct act : (Collection<AAct>) collection) {
+				cmd.appendIfCanExecute(RemoveCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SOURCES, act.getSources()));
+			}
+			cmd.append(super.createRemoveCommand(domain, owner, (EStructuralFeature) MetaABMActPackage.Literals.AGROUP__MEMBERS, collection));
+			return cmd;
+		}
+		return super.createRemoveCommand(domain, owner, feature, collection);
+	}
 
-    @SuppressWarnings("unchecked")
-    protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature,
-            Collection<?> collection, int index) {
-        if (feature == MetaABMActPackage.Literals.AGROUP__ROOTS) {
-            CompoundCommand cmd = new CompoundCommand();
-            cmd.append(createAddCommand(domain, owner, (EStructuralFeature) MetaABMActPackage.Literals.AGROUP__MEMBERS,
-                                        collection, index));
-            return cmd;
-        } else if (feature == MetaABMActPackage.Literals.AGROUP__MEMBERS) {
-            CompoundCommand cmd = new CompoundCommand();
-            // SuggestLabelCommand suggestLabelCommand = new
-            // SuggestLabelCommand(domain,
-            // collection);
-            Set<Object> affected = new HashSet<Object>(collection);
+	@SuppressWarnings("unchecked")
+	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
+		if (feature == MetaABMActPackage.Literals.AGROUP__ROOTS) {
+			CompoundCommand cmd = new CompoundCommand();
+			cmd.append(createAddCommand(domain, owner, (EStructuralFeature) MetaABMActPackage.Literals.AGROUP__MEMBERS, collection, index));
+			return cmd;
+		} else if (feature == MetaABMActPackage.Literals.AGROUP__MEMBERS) {
+			CompoundCommand cmd = new CompoundCommand();
+			// SuggestLabelCommand suggestLabelCommand = new
+			// SuggestLabelCommand(domain,
+			// collection);
+			Set<Object> affected = new HashSet<Object>(collection);
 
-            // Reassign all 'downstream' targets
-            for (AAct act : (Collection<AAct>) collection) {
-                if (act.getGroup() != null && act.getGroup() != owner) {
-                    affected.addAll(act.getAllTargets());
-                }
-            }
-            cmd.append(super.createAddCommand(domain, owner, feature, affected, index));
-            for (AAct act : (Collection<AAct>) collection) {
-                if (act.getSelected() == null) {
-                    if (act instanceof ARoot) {
-                        cmd.appendIfCanExecute(SetCommand.create(domain, act,
-                                                                 MetaABMActPackage.Literals.AACT__SELECTED, act));
-                    }
-                }
-                if (act instanceof ASelect) {
-                    AGroup group = (AGroup) owner;
-                    SContext context = group.getReference().getOwner();
-                    Command create = SetCommand.create(domain, act, MetaABMActPackage.Literals.ASELECT__AGENT,
-                                                       group.getReference());
-                    cmd.appendIfCanExecute(create);
-                    if (context != null) {
-                        if (context.getProjections().size() == 1) {
-                            cmd.appendIfCanExecute(SetCommand.create(domain, act,
-                                                                     MetaABMActPackage.Literals.ASELECT__SPACE, context
-                                                                             .getProjections().get(0)));
-                        }
-                    }
-                }
-                return cmd;
-            }
-        }
-        return super.createAddCommand(domain, owner, feature, collection, index);
-    }
+			// Reassign all 'downstream' targets
+			for (AAct act : (Collection<AAct>) collection) {
+				if (act.getGroup() != null && act.getGroup() != owner) {
+					affected.addAll(act.getAllTargets());
+				}
+			}
+			cmd.append(super.createAddCommand(domain, owner, feature, affected, index));
+			for (AAct act : (Collection<AAct>) collection) {
+				if (act.getSelected() == null) {
+					if (act instanceof ARoot) {
+						cmd.appendIfCanExecute(SetCommand.create(domain, act, MetaABMActPackage.Literals.AACT__SELECTED, act));
+					}
+				}
+				if (act instanceof ASelect) {
+					AGroup group = (AGroup) owner;
+					SContext context = group.getReference().getOwner();
+					Command create = SetCommand.create(domain, act, MetaABMActPackage.Literals.ASELECT__AGENT, group.getReference());
+					cmd.appendIfCanExecute(create);
+					if (context != null) {
+						if (context.getProjections().size() == 1) {
+							cmd.appendIfCanExecute(SetCommand.create(domain, act, MetaABMActPackage.Literals.ASELECT__SPACE, context.getProjections().get(0)));
+						}
+					}
+				}
+				return cmd;
+			}
+		}
+		return super.createAddCommand(domain, owner, feature, collection, index);
+	}
 
-    @Override
-    protected boolean isWrappingNeeded(Object object) {
-        return false;
-    }
+	@Override
+	protected boolean isWrappingNeeded(Object object) {
+		return false;
+	}
 
-    static Collection<CommandParameter> ROOT_ACTS;
+	static Collection<CommandParameter> ROOT_ACTS;
 
-    /**
-     * This adds to the collection of
-     * {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of
-     * the children that can be created under this object. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        // Don't allow creation of targets
-        for (EClassifier cl : MetaABMActPackage.eINSTANCE.getEClassifiers()) {
-            if (cl instanceof EClass) {
-                EClass actClass = (EClass) cl;
-                if (MetaABMActPackage.Literals.AROOT.isSuperTypeOf(actClass) && !actClass.isAbstract()) {
-                    newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.AGROUP__MEMBERS,
-                                                                 MetaABMActFactory.eINSTANCE.create(actClass)));
-                }
-            }
+	/**
+	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of the
+	 * children that can be created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		// Don't allow creation of targets
+		for (EClassifier cl : MetaABMActPackage.eINSTANCE.getEClassifiers()) {
+			if (cl instanceof EClass) {
+				EClass actClass = (EClass) cl;
+				if (MetaABMActPackage.Literals.AROOT.isSuperTypeOf(actClass) && !actClass.isAbstract()) {
+					newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.AGROUP__MEMBERS, MetaABMActFactory.eINSTANCE.create(actClass)));
+				}
+			}
 
-        }
-    }
+		}
+	}
 
-    /**
-     * This returns the label text for
-     * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-        return super.getCreateChildText(owner, feature, child, selection);
-    }
+	/**
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		return super.getCreateChildText(owner, feature, child, selection);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AInitializeItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AInitializeItemProvider.java
index 41eae9f..97c6eb2 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AInitializeItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AInitializeItemProvider.java
@@ -38,136 +38,107 @@
 import org.metaabm.act.AInitialize;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AInitialize}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AInitialize} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AInitializeItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AInitializeItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AInitializeItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AInitializeItemProvider(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);
+	/**
+	 * 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);
 
-            addPluralLabelPropertyDescriptor(object);
-            addDescriptionPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addPluralLabelPropertyDescriptor(object);
+			addDescriptionPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Plural Label feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addPluralLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_pluralLabel_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_pluralLabel_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Plural Label feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPluralLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_pluralLabel_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_pluralLabel_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Description feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_description_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_description_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__DESCRIPTION, true,
-                                                                 true, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_description_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__DESCRIPTION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This returns AInitialize.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AInitialize"));
-    }
+	/**
+	 * This returns AInitialize.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AInitialize"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    public String suggestLabel(IID object) {
-        return "Initialize";
-    }
+	public String suggestLabel(IID object) {
+		return "Initialize";
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(AInitialize.class)) {
-            case MetaABMActPackage.AINITIALIZE__PLURAL_LABEL:
-            case MetaABMActPackage.AINITIALIZE__DESCRIPTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AInitialize.class)) {
+			case MetaABMActPackage.AINITIALIZE__PLURAL_LABEL:
+			case MetaABMActPackage.AINITIALIZE__DESCRIPTION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AInputItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AInputItemProvider.java
index 7967ac7..2cbbb09 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AInputItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AInputItemProvider.java
@@ -59,348 +59,315 @@
 import org.metaabm.provider.MetaABMEditPlugin;
 import org.metaabm.provider.MetaABMItemProvider;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AInput}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AInput} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AInputItemProvider extends MetaABMItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+public class AInputItemProvider extends MetaABMItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
 
-    static URI LIGHT_GRAY_BLUE_COLOR = URI.createURI("color://rgb/100/120/200");
+	static URI LIGHT_GRAY_BLUE_COLOR = URI.createURI("color://rgb/100/120/200");
 
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AInputItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AInputItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
 
-    /**
-     * This returns the property descriptors for the adapted class. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-        if (itemPropertyDescriptors == null) {
-            super.getPropertyDescriptors(object);
+	/**
+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
 
-            addValuePropertyDescriptor(object);
-            addSelectedPropertyDescriptor(object);
-            addLiteralPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addValuePropertyDescriptor(object);
+			addSelectedPropertyDescriptor(object);
+			addLiteralPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    public boolean inputValueFor(SAgent agent, IValue value) {
-        if (agent.getAttributes().contains(value)) {
-            return true;
-        } else if (agent.getOwner() != null && inputValueFor(agent.getOwner(), value)) {
-            return true;
-        }
-        return false;
-    }
+	public boolean inputValueFor(SAgent agent, IValue value) {
+		if (agent.getAttributes().contains(value)) {
+			return true;
+		} else if (agent.getOwner() != null && inputValueFor(agent.getOwner(), value)) {
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     * This adds a property descriptor for the Value feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addValuePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                .getRootAdapterFactory(), getResourceLocator(), getString("_UI_AInput_value_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AInput_value_feature", "_UI_AInput_type"),
-            MetaABMActPackage.Literals.AINPUT__VALUE, true, false, true, null, null, null) {
-            @SuppressWarnings("unchecked")
-            public Collection<?> getChoiceOfValues(Object object) {
-                AInput input = (AInput) object;
-                return input.potentialValues((Collection<IValue>) super.getChoiceOfValues(object));
-            }
-        });
-    }
+	/**
+	 * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addValuePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AInput_value_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AInput_value_feature", "_UI_AInput_type"), MetaABMActPackage.Literals.AINPUT__VALUE, true, false, true, null, null, null) {
+			@SuppressWarnings("unchecked")
+			public Collection<?> getChoiceOfValues(Object object) {
+				AInput input = (AInput) object;
+				return input.potentialValues((Collection<IValue>) super.getChoiceOfValues(object));
+			}
+		});
+	}
 
-    /**
-     * 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 -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(MetaABMActPackage.Literals.AINPUT__LITERAL);
-        }
-        return childrenFeatures;
-    }
+	/**
+	 * 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 -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(MetaABMActPackage.Literals.AINPUT__LITERAL);
+		}
+		return childrenFeatures;
+	}
 
-    // @Override
-    public Collection<?> getChildren(Object object) {
-        Collection<?> children = super.getChildren(object);
-        if (children.size() == 1 && children.toArray()[0] instanceof ALiteral) {
-            return children;
-        }
-        return Collections.EMPTY_LIST;
-    }
+	// @Override
+	public Collection<?> getChildren(Object object) {
+		Collection<?> children = super.getChildren(object);
+		if (children.size() == 1 && children.toArray()[0] instanceof ALiteral) {
+			return children;
+		}
+		return Collections.EMPTY_LIST;
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
-    }
+		return super.getChildFeature(object, child);
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean hasChildren(Object object) {
-        return hasChildren(object, true);
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean hasChildren(Object object) {
+		return hasChildren(object, true);
+	}
 
-    /**
-     * This adds a property descriptor for the Selected feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addSelectedPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                .getRootAdapterFactory(), getResourceLocator(), getString("_UI_AInput_selected_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AInput_selected_feature", "_UI_AInput_type"),
-            MetaABMActPackage.Literals.AINPUT__SELECTED, true, false, true, null, null, null) {
-            @SuppressWarnings("unchecked")
-            public Collection<?> getChoiceOfValues(Object object) {
-                Collection<AAct> original = (Collection<AAct>) super.getChoiceOfValues(object);
-                Collection<AAct> potential = new ArrayList<AAct>();
-                for (AAct candidate : original) {
-                    if (((AInput) object).getSink().isTargetOf(candidate)) {
-                        potential.add(candidate);
-                    }
-                }
-                return potential;
-            }
+	/**
+	 * This adds a property descriptor for the Selected feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addSelectedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AInput_selected_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AInput_selected_feature", "_UI_AInput_type"), MetaABMActPackage.Literals.AINPUT__SELECTED, true, false, true, null, null, null) {
+			@SuppressWarnings("unchecked")
+			public Collection<?> getChoiceOfValues(Object object) {
+				Collection<AAct> original = (Collection<AAct>) super.getChoiceOfValues(object);
+				Collection<AAct> potential = new ArrayList<AAct>();
+				for (AAct candidate : original) {
+					if (((AInput) object).getSink().isTargetOf(candidate)) {
+						potential.add(candidate);
+					}
+				}
+				return potential;
+			}
 
-        });
-    }
+		});
+	}
 
-    /**
-     * This adds a property descriptor for the Literal feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addLiteralPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                                  getResourceLocator(),
-                                                  getString("_UI_AInput_literal_feature"),
-                                                  getString("_UI_PropertyDescriptor_description",
-                                                            "_UI_AInput_literal_feature", "_UI_AInput_type"),
-                                                  MetaABMActPackage.Literals.AINPUT__LITERAL, false, false, false,
-                                                  null, getString("_UI_RelationsPropertyCategory"),
-                                                  new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Literal feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLiteralPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AInput_literal_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AInput_literal_feature", "_UI_AInput_type"), MetaABMActPackage.Literals.AINPUT__LITERAL, false, false, false, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value,
-            int index) {
-        if (feature == MetaABMActPackage.Literals.AINPUT__VALUE
-            || feature == MetaABMActPackage.Literals.AINPUT__LITERAL) {
-            AInput input = (AInput) owner;
-            ASink sink = input.getSink();
-            SuggestLabelCommand suggestSinkLabelCommand = null;
-            if (sink != null) {
-                suggestSinkLabelCommand = new SuggestLabelCommand(domain, sink);
-            }
-            // force a store of old value..
-            CompoundCommand cmd = new CompoundCommand("Set Input Value");
-            cmd.append(super.createSetCommand(domain, owner, feature, value, index));
-            if (feature == MetaABMActPackage.Literals.AINPUT__VALUE) {
-                if (value instanceof ALiteral) {
-                    cmd.append(super.createSetCommand(domain, owner, MetaABMActPackage.Literals.AINPUT__LITERAL, value));
-                } else if (input.getLiteral() != null) {
-                    cmd.append(super.createSetCommand(domain, owner, MetaABMActPackage.Literals.AINPUT__LITERAL, null));
-                }
-            } else if (feature == MetaABMActPackage.Literals.AINPUT__LITERAL) {
-                cmd.append(super.createSetCommand(domain, owner, MetaABMActPackage.Literals.AINPUT__VALUE, value));
-            }
-            if (suggestSinkLabelCommand != null && !sink.isMultiValue()) {
-                cmd.appendIfCanExecute(suggestSinkLabelCommand);
-            }
-            return cmd;
-        }
-        return super.createSetCommand(domain, owner, feature, value, index);
-    }
+	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value, int index) {
+		if (feature == MetaABMActPackage.Literals.AINPUT__VALUE || feature == MetaABMActPackage.Literals.AINPUT__LITERAL) {
+			AInput input = (AInput) owner;
+			ASink sink = input.getSink();
+			SuggestLabelCommand suggestSinkLabelCommand = null;
+			if (sink != null) {
+				suggestSinkLabelCommand = new SuggestLabelCommand(domain, sink);
+			}
+			// force a store of old value..
+			CompoundCommand cmd = new CompoundCommand("Set Input Value");
+			cmd.append(super.createSetCommand(domain, owner, feature, value, index));
+			if (feature == MetaABMActPackage.Literals.AINPUT__VALUE) {
+				if (value instanceof ALiteral) {
+					cmd.append(super.createSetCommand(domain, owner, MetaABMActPackage.Literals.AINPUT__LITERAL, value));
+				} else if (input.getLiteral() != null) {
+					cmd.append(super.createSetCommand(domain, owner, MetaABMActPackage.Literals.AINPUT__LITERAL, null));
+				}
+			} else if (feature == MetaABMActPackage.Literals.AINPUT__LITERAL) {
+				cmd.append(super.createSetCommand(domain, owner, MetaABMActPackage.Literals.AINPUT__VALUE, value));
+			}
+			if (suggestSinkLabelCommand != null && !sink.isMultiValue()) {
+				cmd.appendIfCanExecute(suggestSinkLabelCommand);
+			}
+			return cmd;
+		}
+		return super.createSetCommand(domain, owner, feature, value, index);
+	}
 
-    public boolean isAccessed(IValue value) {
-        return value != null && !(value instanceof SAttribute && ((SAttribute) value).isImmutable())
-            && !(value instanceof ALiteral);
-    }
+	public boolean isAccessed(IValue value) {
+		return value != null && !(value instanceof SAttribute && ((SAttribute) value).isImmutable()) && !(value instanceof ALiteral);
+	}
 
-    public String suggestLabel(IID object) {
-        AInput input = (AInput) object;
-        if (input.getLiteral() == null) {
-            String label = input.getValue() != null ? input.getValue().getLabel() : "null";
-            label += input.getSink() != null ? " " + input.getSink().getInputs().indexOf(input) : "[]";
-            label += " Input";
-            return label;
-        } else {
-            return input.getLiteral().getLabel() + " Input";
-        }
-    }
+	public String suggestLabel(IID object) {
+		AInput input = (AInput) object;
+		if (input.getLiteral() == null) {
+			String label = input.getValue() != null ? input.getValue().getLabel() : "null";
+			label += input.getSink() != null ? " " + input.getSink().getInputs().indexOf(input) : "[]";
+			label += " Input";
+			return label;
+		} else {
+			return input.getLiteral().getLabel() + " Input";
+		}
+	}
 
-    /**
-     * This returns AInput.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AInput"));
-    }
+	/**
+	 * This returns AInput.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AInput"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        AInput input = (AInput) object;
-        if (input.getLiteral() == null) {
-            IValue value = ((AInput) object).getValue();
-            if (value != null && value.getLabel() != null) {
-                String text;
-                // valProvider = (MetaABMItemProvider)
-                // MetaABMItemProviderAdapterFactory
-                // .getGenericAdapterFactory().adapt(value,
-                // IEditingDomainItemProvider.class);
-                // if (valProvider != null) {
-                // text = valProvider.getText(value);
-                // } else {
-                text = value.getLabel();
-                // }
-                if (input.getSelected() != null && input.getSink() != null
-                    && input.getSelected() != input.getSink().getRootSelected()) {
-                    text = input.getSelected().getLabel() + ": " + text;
-                }
-                return text;
-            } else {
-                return getString("_UI_" + ((EObject) object).eClass().getName() + "_type");
-            }
-        } else {
-            if (input.getLiteral() instanceof AMultiValue) {
-                return "Multiple Values";
-            } else {
-                return "\"" + input.getLiteral().getValueLiteral() + "\"";
-            }
-        }
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		AInput input = (AInput) object;
+		if (input.getLiteral() == null) {
+			IValue value = ((AInput) object).getValue();
+			if (value != null && value.getLabel() != null) {
+				String text;
+				// valProvider = (MetaABMItemProvider)
+				// MetaABMItemProviderAdapterFactory
+				// .getGenericAdapterFactory().adapt(value,
+				// IEditingDomainItemProvider.class);
+				// if (valProvider != null) {
+				// text = valProvider.getText(value);
+				// } else {
+				text = value.getLabel();
+				// }
+				if (input.getSelected() != null && input.getSink() != null && input.getSelected() != input.getSink().getRootSelected()) {
+					text = input.getSelected().getLabel() + ": " + text;
+				}
+				return text;
+			} else {
+				return getString("_UI_" + ((EObject) object).eClass().getName() + "_type");
+			}
+		} else {
+			if (input.getLiteral() instanceof AMultiValue) {
+				return "Multiple Values";
+			} else {
+				return "\"" + input.getLiteral().getValueLiteral() + "\"";
+			}
+		}
+	}
 
-    /**
-     * 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 NOT
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+	/**
+	 * 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 NOT
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
 
-        switch (notification.getFeatureID(AInput.class)) {
-            // case MetaABMActPackage.AINPUT__SINK:
-            // case MetaABMActPackage.AINPUT__SELECTED:
-            // fireNotifyChanged(new ViewerNotification(notification,
-            // notification.getNotifier(), true, true));
-            // return;
-            case MetaABMActPackage.AINPUT__LITERAL:
-            case MetaABMActPackage.AINPUT__VALUE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
-                return;
-            case MetaABMActPackage.AINPUT__SELECTED:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                // fireNotifyChanged(new ViewerNotification(notification,
-                // notification.getOldValue(), true, false));
-                // fireNotifyChanged(new ViewerNotification(notification,
-                // notification.getNewValue(), true, false));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AInput.class)) {
+			// case MetaABMActPackage.AINPUT__SINK:
+			// case MetaABMActPackage.AINPUT__SELECTED:
+			// fireNotifyChanged(new ViewerNotification(notification,
+			// notification.getNotifier(), true, true));
+			// return;
+			case MetaABMActPackage.AINPUT__LITERAL:
+			case MetaABMActPackage.AINPUT__VALUE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
+				return;
+			case MetaABMActPackage.AINPUT__SELECTED:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				// fireNotifyChanged(new ViewerNotification(notification,
+				// notification.getOldValue(), true, false));
+				// fireNotifyChanged(new ViewerNotification(notification,
+				// notification.getNewValue(), true, false));
+				return;
+		}
+		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);
+	/**
+	 * 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(MetaABMActPackage.Literals.AINPUT__LITERAL,
-                                                     MetaABMActFactory.eINSTANCE.createALiteral()));
+		newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.AINPUT__LITERAL, MetaABMActFactory.eINSTANCE.createALiteral()));
 
-        newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.AINPUT__LITERAL,
-                                                     MetaABMActFactory.eINSTANCE.createAMultiValue()));
-    }
+		newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.AINPUT__LITERAL, MetaABMActFactory.eINSTANCE.createAMultiValue()));
+	}
 
-    @Override
-    public String getColumnText(Object object, int columnIndex) {
-        IValue value = ((AInput) object).getValue();
-        if (value != null && columnIndex == 0) {
-            return value.getLabel();
-        } else if (columnIndex == 1) {
-            if (value instanceof SNamed) {
-                return ((SNamed) value).getDescription();
-            } else {
-                return getText(object);
-            }
-        }
-        return super.getColumnText(object, columnIndex);
-    }
+	@Override
+	public String getColumnText(Object object, int columnIndex) {
+		IValue value = ((AInput) object).getValue();
+		if (value != null && columnIndex == 0) {
+			return value.getLabel();
+		} else if (columnIndex == 1) {
+			if (value instanceof SNamed) {
+				return ((SNamed) value).getDescription();
+			} else {
+				return getText(object);
+			}
+		}
+		return super.getColumnText(object, columnIndex);
+	}
 
-    @Override
-    public Object getForeground(Object object) {
-        return LIGHT_GRAY_BLUE_COLOR;
-    }
+	@Override
+	public Object getForeground(Object object) {
+		return LIGHT_GRAY_BLUE_COLOR;
+	}
 
-    // @Override
-    // public Object getBackground(Object object) {
-    // AInput input = (AInput) object;
-    // return AActItemProvider.selectionColor(input.getSelected());
-    // }
+	// @Override
+	// public Object getBackground(Object object) {
+	// AInput input = (AInput) object;
+	// return AActItemProvider.selectionColor(input.getSelected());
+	// }
 
-    /**
-     * Return the resource locator for this item provider's resources. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return MetaABMEditPlugin.INSTANCE;
-    }
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return MetaABMEditPlugin.INSTANCE;
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALeaveItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALeaveItemProvider.java
index d809d96..76cb359 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALeaveItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALeaveItemProvider.java
@@ -33,94 +33,85 @@
 import org.metaabm.IID;
 import org.metaabm.act.ALeave;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ALeave}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ALeave} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ALeaveItemProvider extends ATransformItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ALeaveItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ALeaveItemProvider extends ATransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ALeaveItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns ALeave.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ALeave"));
-    }
+	/**
+	 * This returns ALeave.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ALeave"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
+	}
 
-    public String suggestLabel(IID object) {
-        ALeave leave = (ALeave) object;
-        String name = ((leave.getSelected() != null) && (leave.getSelected().getAgent() != null)) ? (leave
-                .getSelected().getAgent().getLabel() + " ") : "";
-        name = name + "Leave";
-        name = name
-            + ((leave.getSelected() != null && leave.getSelected().getSpace() != null) ? (" " + leave.getSelected()
-                    .getSpace().getLabel()) : "");
-        return name;
-    }
+	public String suggestLabel(IID object) {
+		ALeave leave = (ALeave) object;
+		String name = ((leave.getSelected() != null) && (leave.getSelected().getAgent() != null)) ? (leave.getSelected().getAgent().getLabel() + " ") : "";
+		name = name + "Leave";
+		name = name + ((leave.getSelected() != null && leave.getSelected().getSpace() != null) ? (" " + leave.getSelected().getSpace().getLabel()) : "");
+		return name;
+	}
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALiteralItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALiteralItemProvider.java
index a717dda..d7f1450 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALiteralItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALiteralItemProvider.java
@@ -49,203 +49,170 @@
 import org.metaabm.provider.IIDItemProvider;
 import org.metaabm.provider.MetaABMEditPlugin;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ALiteral}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ALiteral} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ALiteralItemProvider extends IIDItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ALiteralItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ALiteralItemProvider extends IIDItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ALiteralItemProvider(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);
+	/**
+	 * 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);
 
-            addAvailableTypesPropertyDescriptor(object);
-            addValueLiteralPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addAvailableTypesPropertyDescriptor(object);
+			addValueLiteralPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Available Types feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addAvailableTypesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                                  getResourceLocator(),
-                                                  getString("_UI_IValue_availableTypes_feature"),
-                                                  getString("_UI_PropertyDescriptor_description",
-                                                            "_UI_IValue_availableTypes_feature", "_UI_IValue_type"),
-                                                  MetaABMPackage.Literals.IVALUE__AVAILABLE_TYPES, true, false, false,
-                                                  ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-                                                  new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Available Types feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAvailableTypesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IValue_availableTypes_feature"), getString("_UI_PropertyDescriptor_description", "_UI_IValue_availableTypes_feature", "_UI_IValue_type"), MetaABMPackage.Literals.IVALUE__AVAILABLE_TYPES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the Value Literal feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addValueLiteralPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ALiteral_valueLiteral_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ALiteral_valueLiteral_feature",
-                                                                           "_UI_ALiteral_type"),
-                                                                 MetaABMActPackage.Literals.ALITERAL__VALUE_LITERAL,
-                                                                 true, false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Value Literal feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addValueLiteralPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ALiteral_valueLiteral_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ALiteral_valueLiteral_feature", "_UI_ALiteral_type"), MetaABMActPackage.Literals.ALITERAL__VALUE_LITERAL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), 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 -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            // childrenFeatures.add(MetaABMPackage.Literals.IVALUE__ACCESSORS);
-        }
-        return childrenFeatures;
-    }
+	/**
+	 * 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 -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			// childrenFeatures.add(MetaABMPackage.Literals.IVALUE__ACCESSORS);
+		}
+		return childrenFeatures;
+	}
 
-    public String suggestLabel(IID object) {
-        return "Literal " + getText(object);
-    }
+	public String suggestLabel(IID object) {
+		return "Literal " + getText(object);
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
-    }
+		return super.getChildFeature(object, child);
+	}
 
-    /**
-     * This returns ALiteral.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ALiteral"));
-    }
+	/**
+	 * This returns ALiteral.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ALiteral"));
+	}
 
-    /**
-     * 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 = ((ALiteral) object).getValueLiteral();
-        return (label == null || label.length() == 0) ? "Literal" : label;
-    }
+	/**
+	 * 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 = ((ALiteral) object).getValueLiteral();
+		return (label == null || label.length() == 0) ? "Literal" : label;
+	}
 
-    @Override
-    protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value,
-            int index) {
-        if (feature == MetaABMActPackage.Literals.ALITERAL__VALUE_LITERAL) {
-            CompoundCommand cmd = new CompoundCommand("Set Literal");
-            SuggestLabelCommand suggestLabelCommand = new SuggestLabelCommand(this, domain, (IID) owner);
-            ;
-            ALiteral literal = (ALiteral) owner;
-            AInput input = (AInput) literal.eContainer();
-            SuggestLabelCommand suggestLabelCommand2 = new SuggestLabelCommand(domain, input.getSink());
-            cmd.append(super.createSetCommand(domain, owner, feature, value, index));
-            cmd.append(suggestLabelCommand);
-            cmd.append(suggestLabelCommand2);
-            return cmd;
-        } else if ((feature == MetaABMPackage.Literals.IID__LABEL)
-            || (feature == MetaABMPackage.Literals.SNAMED__PLURAL_LABEL)) {
-            return SetLabelCommand.create(domain, owner, feature, value, index);
-        } else {
-            return super.createSetCommand(domain, owner, feature, value, index);
-        }
-    }
+	@Override
+	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value, int index) {
+		if (feature == MetaABMActPackage.Literals.ALITERAL__VALUE_LITERAL) {
+			CompoundCommand cmd = new CompoundCommand("Set Literal");
+			SuggestLabelCommand suggestLabelCommand = new SuggestLabelCommand(this, domain, (IID) owner);
+			;
+			ALiteral literal = (ALiteral) owner;
+			AInput input = (AInput) literal.eContainer();
+			SuggestLabelCommand suggestLabelCommand2 = new SuggestLabelCommand(domain, input.getSink());
+			cmd.append(super.createSetCommand(domain, owner, feature, value, index));
+			cmd.append(suggestLabelCommand);
+			cmd.append(suggestLabelCommand2);
+			return cmd;
+		} else if ((feature == MetaABMPackage.Literals.IID__LABEL) || (feature == MetaABMPackage.Literals.SNAMED__PLURAL_LABEL)) {
+			return SetLabelCommand.create(domain, owner, feature, value, index);
+		} else {
+			return super.createSetCommand(domain, owner, feature, value, index);
+		}
+	}
 
-    /**
-     * 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 NOT
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+	/**
+	 * 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 NOT
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
 
-        switch (notification.getFeatureID(ALiteral.class)) {
-            case MetaABMActPackage.ALITERAL__VALUE_LITERAL:
-            case MetaABMActPackage.ALITERAL__ID:
-            case MetaABMActPackage.ALITERAL__LABEL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
-                fireNotifyChanged(new ViewerNotification(notification,
-                    ((ALiteral) notification.getNotifier()).eContainer(), true, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ALiteral.class)) {
+			case MetaABMActPackage.ALITERAL__VALUE_LITERAL:
+			case MetaABMActPackage.ALITERAL__ID:
+			case MetaABMActPackage.ALITERAL__LABEL:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
+				fireNotifyChanged(new ViewerNotification(notification, ((ALiteral) notification.getNotifier()).eContainer(), true, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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 MetaABMEditPlugin.INSTANCE;
-    }
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return MetaABMEditPlugin.INSTANCE;
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALoadAgentsItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALoadAgentsItemProvider.java
index 5271626..d8c124e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALoadAgentsItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALoadAgentsItemProvider.java
@@ -36,111 +36,93 @@
 import org.metaabm.act.ALoadAgents;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ALoadAgents}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ALoadAgents} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ALoadAgentsItemProvider extends ACreateAgentsItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ALoadAgentsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ALoadAgentsItemProvider extends ACreateAgentsItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ALoadAgentsItemProvider(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);
+	/**
+	 * 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);
 
-            addSourceURLPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addSourceURLPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Source URL feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addSourceURLPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ALoadAgents_sourceURL_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ALoadAgents_sourceURL_feature",
-                                                                           "_UI_ALoadAgents_type"),
-                                                                 MetaABMActPackage.Literals.ALOAD_AGENTS__SOURCE_URL,
-                                                                 true, false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Source URL feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSourceURLPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ALoadAgents_sourceURL_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ALoadAgents_sourceURL_feature", "_UI_ALoadAgents_type"), MetaABMActPackage.Literals.ALOAD_AGENTS__SOURCE_URL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ALoadAgents.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ALoadAgents"));
-    }
+	/**
+	 * This returns ALoadAgents.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ALoadAgents"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ALoadAgents.class)) {
-            case MetaABMActPackage.ALOAD_AGENTS__SOURCE_URL:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ALoadAgents.class)) {
+			case MetaABMActPackage.ALOAD_AGENTS__SOURCE_URL:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALoadShapedAgentsItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALoadShapedAgentsItemProvider.java
index 8ea7165..da94b4e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALoadShapedAgentsItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ALoadShapedAgentsItemProvider.java
@@ -36,112 +36,93 @@
 import org.metaabm.act.ALoadShapedAgents;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link
- * org.metaabm.act.ALoadShapedAgents} object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ALoadShapedAgents} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
  * @generated
  */
-public class ALoadShapedAgentsItemProvider extends ALoadAgentsItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ALoadShapedAgentsItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ALoadShapedAgentsItemProvider extends ALoadAgentsItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ALoadShapedAgentsItemProvider(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);
+	/**
+	 * 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);
 
-            addShapePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addShapePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Shape feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addShapePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_AShaped_shape_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_AShaped_shape_feature",
-                                                                           "_UI_AShaped_type"),
-                                                                 MetaABMActPackage.Literals.ASHAPED__SHAPE, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Shape feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addShapePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AShaped_shape_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AShaped_shape_feature", "_UI_AShaped_type"), MetaABMActPackage.Literals.ASHAPED__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ALoadShapedAgents.gif.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ALoadShapedAgents"));
-    }
+	/**
+	 * This returns ALoadShapedAgents.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ALoadShapedAgents"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ALoadShapedAgents.class)) {
-            case MetaABMActPackage.ALOAD_SHAPED_AGENTS__SHAPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ALoadShapedAgents.class)) {
+			case MetaABMActPackage.ALOAD_SHAPED_AGENTS__SHAPE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMethodItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMethodItemProvider.java
index c7e8ce6..c761b9e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMethodItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMethodItemProvider.java
@@ -37,176 +37,127 @@
 import org.metaabm.act.AMethod;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AMethod}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AMethod} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class AMethodItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AMethodItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AMethodItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AMethodItemProvider(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);
+	/**
+	 * 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);
 
-            addPluralLabelPropertyDescriptor(object);
-            addDescriptionPropertyDescriptor(object);
-            addBodyPropertyDescriptor(object);
-            addGeneratePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addPluralLabelPropertyDescriptor(object);
+			addDescriptionPropertyDescriptor(object);
+			addBodyPropertyDescriptor(object);
+			addGeneratePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Plural Label feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addPluralLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_pluralLabel_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_pluralLabel_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Plural Label feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPluralLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_pluralLabel_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_pluralLabel_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Description feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_description_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_description_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__DESCRIPTION, true,
-                                                                 true, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_description_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__DESCRIPTION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Body feature.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addBodyPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_AMethod_body_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_AMethod_body_feature",
-                                                                           "_UI_AMethod_type"),
-                                                                 MetaABMActPackage.Literals.AMETHOD__BODY, true, true,
-                                                                 false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Body feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addBodyPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AMethod_body_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AMethod_body_feature", "_UI_AMethod_type"), MetaABMActPackage.Literals.AMETHOD__BODY, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Generate feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addGeneratePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_AMethod_generate_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_AMethod_generate_feature",
-                                                                           "_UI_AMethod_type"),
-                                                                 MetaABMActPackage.Literals.AMETHOD__GENERATE, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Generate feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addGeneratePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AMethod_generate_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AMethod_generate_feature", "_UI_AMethod_type"), MetaABMActPackage.Literals.AMETHOD__GENERATE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns AMethod.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AMethod"));
-    }
+	/**
+	 * This returns AMethod.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AMethod"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(AMethod.class)) {
-            case MetaABMActPackage.AMETHOD__PLURAL_LABEL:
-            case MetaABMActPackage.AMETHOD__DESCRIPTION:
-            case MetaABMActPackage.AMETHOD__BODY:
-            case MetaABMActPackage.AMETHOD__GENERATE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AMethod.class)) {
+			case MetaABMActPackage.AMETHOD__PLURAL_LABEL:
+			case MetaABMActPackage.AMETHOD__DESCRIPTION:
+			case MetaABMActPackage.AMETHOD__BODY:
+			case MetaABMActPackage.AMETHOD__GENERATE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMoveItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMoveItemProvider.java
index 486ad33..e21d27f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMoveItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMoveItemProvider.java
@@ -34,102 +34,90 @@
 import org.metaabm.IID;
 import org.metaabm.act.AMove;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.AMove} object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AMoveItemProvider extends ATransformItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AMoveItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AMoveItemProvider extends ATransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AMoveItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns AMove.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AMove"));
-    }
+	/**
+	 * This returns AMove.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AMove"));
+	}
 
-    /**
-     * 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 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);
+	}
 
-    public String suggestLabel(IID object) {
-        AMove move = (AMove) object;
-        String name = "Move";
-        name = name
-            + (move.getSelected() != null && move.getSelected().getAgent() != null ? " "
-                + move.getSelected().getAgent().getLabel() : "");
-        name = name
-            + (move.getDestination() != null && move.getDestination().getAgent() != null ? " to "
-                + move.getDestination().getAgent().getLabel() : "");
-        name = name
-            + (move.getDestination() != null && move.getDestination().getSpace() != null ? " in "
-                + move.getDestination().getSpace().getLabel() : "");
-        return name;
-    }
+	public String suggestLabel(IID object) {
+		AMove move = (AMove) object;
+		String name = "Move";
+		name = name + (move.getSelected() != null && move.getSelected().getAgent() != null ? " " + move.getSelected().getAgent().getLabel() : "");
+		name = name + (move.getDestination() != null && move.getDestination().getAgent() != null ? " to " + move.getDestination().getAgent().getLabel() : "");
+		name = name + (move.getDestination() != null && move.getDestination().getSpace() != null ? " in " + move.getDestination().getSpace().getLabel() : "");
+		return name;
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-        // AMove cmd = (AMove) object;
-        // return getString("_UI_" + ((EObject) object).eClass().getName() + "_type") + ": "
-        // + (cmd.getSelected() != null ? cmd.getSelected().getLabel() : "[?]") + " to "
-        // + (cmd.getDestination() != null ? cmd.getDestination().getLabel() : "[?]");
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+		// AMove cmd = (AMove) object;
+		// return getString("_UI_" + ((EObject) object).eClass().getName() + "_type") + ": "
+		// + (cmd.getSelected() != null ? cmd.getSelected().getLabel() : "[?]") + " to "
+		// + (cmd.getDestination() != null ? cmd.getDestination().getLabel() : "[?]");
+	}
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMultiValueItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMultiValueItemProvider.java
index c7b174d..f4ce9f2 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMultiValueItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AMultiValueItemProvider.java
@@ -49,194 +49,179 @@
 import org.metaabm.commands.AddMultiValueStateCommand;
 import org.metaabm.commands.RemoveMultiValueStateCommand;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AMultiValue}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AMultiValue} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AMultiValueItemProvider extends ALiteralItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AMultiValueItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AMultiValueItemProvider extends ALiteralItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AMultiValueItemProvider(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);
+	/**
+	 * 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);
 
-            addValuesPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addValuesPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    @Override
-    protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature,
-            Collection<?> collection, int index) {
-        if (feature == MetaABMActPackage.Literals.AMULTI_VALUE__VALUES) {
-            EObject container = ((AMultiValue) owner).eContainer();
-            if (container != null) {
-                ASink sink = ((AInput) container).getSink();
-                if (sink.getInputs().get(0).getValue() == owner) {
-                    collection = validValues(collection);
-                    CompoundCommand cmd = new CompoundCommand();
-                    cmd.append(super.createAddCommand(domain, owner, feature, collection, index));
-                    cmd.append(new AddMultiValueStateCommand(domain, sink, sink.getInputs(), collection, index));
-                    return cmd;
-                }
-            }
-        }
-        return super.createAddCommand(domain, owner, feature, collection, index);
-    }
+	@Override
+	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
+		if (feature == MetaABMActPackage.Literals.AMULTI_VALUE__VALUES) {
+			EObject container = ((AMultiValue) owner).eContainer();
+			if (container != null) {
+				ASink sink = ((AInput) container).getSink();
+				if (sink.getInputs().get(0).getValue() == owner) {
+					collection = validValues(collection);
+					CompoundCommand cmd = new CompoundCommand();
+					cmd.append(super.createAddCommand(domain, owner, feature, collection, index));
+					cmd.append(new AddMultiValueStateCommand(domain, sink, sink.getInputs(), collection, index));
+					return cmd;
+				}
+			}
+		}
+		return super.createAddCommand(domain, owner, feature, collection, index);
+	}
 
-    @Override
-    protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature,
-            Collection<?> collection) {
-        if (feature == MetaABMActPackage.Literals.AMULTI_VALUE__VALUES) {
-            ASink sink = ((AInput) ((AMultiValue) owner).eContainer()).getSink();
-            if (sink.getInputs().get(0).getValue() == owner) {
-                CompoundCommand cmd = new CompoundCommand();
-                cmd.append(super.createRemoveCommand(domain, owner, feature, collection));
-                cmd.append(new RemoveMultiValueStateCommand(domain, sink, sink.getInputs(), collection, 0));
-                return cmd;
-            }
-        }
-        return super.createRemoveCommand(domain, owner, feature, collection);
-    }
+	@Override
+	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
+		if (feature == MetaABMActPackage.Literals.AMULTI_VALUE__VALUES) {
+			ASink sink = ((AInput) ((AMultiValue) owner).eContainer()).getSink();
+			if (sink.getInputs().get(0).getValue() == owner) {
+				CompoundCommand cmd = new CompoundCommand();
+				cmd.append(super.createRemoveCommand(domain, owner, feature, collection));
+				cmd.append(new RemoveMultiValueStateCommand(domain, sink, sink.getInputs(), collection, 0));
+				return cmd;
+			}
+		}
+		return super.createRemoveCommand(domain, owner, feature, collection);
+	}
 
-    /**
-     * This adds a property descriptor for the Values feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addValuesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                .getRootAdapterFactory(), getResourceLocator(), getString("_UI_AMultiValue_values_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_AMultiValue_values_feature", "_UI_AMultiValue_type"),
-            MetaABMActPackage.Literals.AMULTI_VALUE__VALUES, true, true, false, null, null, null) {
-            public Collection<?> getChoiceOfValues(Object object) {
-                Collection<?> choiceOfValues = super.getChoiceOfValues(object);
-                ASink sink = ((AInput) ((AMultiValue) object).eContainer()).getSink();
-                if (sink.getInputs().get(0).getValue() == object) {
-                    return validValues(choiceOfValues);
-                }
-                return choiceOfValues;
-            }
-        });
-    }
+	/**
+	 * This adds a property descriptor for the Values feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addValuesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AMultiValue_values_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AMultiValue_values_feature", "_UI_AMultiValue_type"), MetaABMActPackage.Literals.AMULTI_VALUE__VALUES, true, true, false, null, null, null) {
+			public Collection<?> getChoiceOfValues(Object object) {
+				Collection<?> choiceOfValues = super.getChoiceOfValues(object);
+				ASink sink = ((AInput) ((AMultiValue) object).eContainer()).getSink();
+				if (sink.getInputs().get(0).getValue() == object) {
+					return validValues(choiceOfValues);
+				}
+				return choiceOfValues;
+			}
+		});
+	}
 
-    protected Collection<IValue> validValues(Collection potential) {
-        Collection<IValue> choices = new ArrayList<IValue>();
-        for (Object value : potential) {
-            if (value instanceof SState) {
-                choices.add((IValue) value);
-            }
-        }
-        return choices;
-    }
+	protected Collection<IValue> validValues(Collection potential) {
+		Collection<IValue> choices = new ArrayList<IValue>();
+		for (Object value : potential) {
+			if (value instanceof SState) {
+				choices.add((IValue) value);
+			}
+		}
+		return choices;
+	}
 
-    /**
-     * 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 -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            super.getChildrenFeatures(object);
-            childrenFeatures.add(MetaABMActPackage.Literals.AMULTI_VALUE__VALUES);
-        }
-        return childrenFeatures;
-    }
+	/**
+	 * 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 -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(MetaABMActPackage.Literals.AMULTI_VALUE__VALUES);
+		}
+		return childrenFeatures;
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
-    }
+		return super.getChildFeature(object, child);
+	}
 
-    /**
-     * This returns AMultiValue.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AMultiValue"));
-    }
+	/**
+	 * This returns AMultiValue.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AMultiValue"));
+	}
 
-    /**
-     * 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 = ((AMultiValue) object).getLabel();
-        return label == null || label.length() == 0 ? getString("_UI_AMultiValue_type") : label;
-    }
+	/**
+	 * 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 = ((AMultiValue) object).getLabel();
+		return label == null || label.length() == 0 ? getString("_UI_AMultiValue_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 -->
-     * @generated
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(AMultiValue.class)) {
-            case MetaABMActPackage.AMULTI_VALUE__VALUES:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AMultiValue.class)) {
+			case MetaABMActPackage.AMULTI_VALUE__VALUES:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
 
-    @Override
-    public String suggestLabel(IID object) {
-        return "Multiple value " + getText(object);
-    }
+	@Override
+	public String suggestLabel(IID object) {
+		return "Multiple value " + getText(object);
+	}
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ANetworkItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ANetworkItemProvider.java
index d8e43cf..3b31502 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ANetworkItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ANetworkItemProvider.java
@@ -34,93 +34,77 @@
 import org.metaabm.act.ANetwork;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ANetwork}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ANetwork} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ANetworkItemProvider extends ATransformItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ANetworkItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ANetworkItemProvider extends ATransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ANetworkItemProvider(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);
+	/**
+	 * 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);
 
-            addWithinPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addWithinPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Within feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addWithinPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ANetwork_within_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ANetwork_within_feature",
-                                                                           "_UI_ANetwork_type"),
-                                                                 MetaABMActPackage.Literals.ANETWORK__WITHIN, true,
-                                                                 false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Within feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addWithinPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ANetwork_within_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ANetwork_within_feature", "_UI_ANetwork_type"), MetaABMActPackage.Literals.ANETWORK__WITHIN, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ANoneItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ANoneItemProvider.java
index 1c4796a..1c5f098 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ANoneItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ANoneItemProvider.java
@@ -34,93 +34,87 @@
 import org.metaabm.IID;
 import org.metaabm.act.ANone;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.ANone} object.
  * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ANoneItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ANoneItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ANoneItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ANoneItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns ANone.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ANone"));
-    }
+	/**
+	 * This returns ANone.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ANone"));
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    public String suggestID(IID object) {
-        String id = "none";
-        id += StringUtils.join(idsCaps(((ANone) object).getSources()).toArray());
-        return id;
-    }
+	public String suggestID(IID object) {
+		String id = "none";
+		id += StringUtils.join(idsCaps(((ANone) object).getSources()).toArray());
+		return id;
+	}
 
-    public String suggestLabel(IID object) {
-        return "!(" + suggestSeperatedSourceLabel(object, "|") + ")";
-    }
+	public String suggestLabel(IID object) {
+		return "!(" + suggestSeperatedSourceLabel(object, "|") + ")";
+	}
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/APerformItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/APerformItemProvider.java
index 3ab837b..5bbad38 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/APerformItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/APerformItemProvider.java
@@ -29,82 +29,80 @@
  * <!-- end-user-doc -->
  * @generated
  */
-public class APerformItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public APerformItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class APerformItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public APerformItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns APerform.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/APerform"));
-    }
+	/**
+	 * This returns APerform.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/APerform"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
-    public String suggestLabel(IID object) {
-        return "Perform";
-    }
+	public String suggestLabel(IID object) {
+		return "Perform";
+	}
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AQueryItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AQueryItemProvider.java
index 6537999..04b141b 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AQueryItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AQueryItemProvider.java
@@ -39,110 +39,103 @@
 import org.metaabm.act.ASink;
 import org.metaabm.function.FFunction;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AQuery}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AQuery} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AQueryItemProvider extends ASinkItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AQueryItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AQueryItemProvider extends ASinkItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AQueryItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
 
-    static URI GRAY_BLUE_COLOR = URI.createURI("color://rgb/25/60/240");
+	static URI GRAY_BLUE_COLOR = URI.createURI("color://rgb/25/60/240");
 
-    /**
-     * 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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    static Map<FFunction, Object> queryImages = new HashMap<FFunction, Object>();
+	static Map<FFunction, Object> queryImages = new HashMap<FFunction, Object>();
 
-    public Map<FFunction, Object> getImageCache() {
-        return queryImages;
-    }
+	public Map<FFunction, Object> getImageCache() {
+		return queryImages;
+	}
 
-    /**
-     * Image from Function if defined. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated NOT
-     */
-    public Object getImage(Object object) {
-        if (((ASink) object).getFunction() != null) {
-            return super.getImage(object);
-        }
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AQuery"));
-    }
+	/**
+	 * Image from Function if defined. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public Object getImage(Object object) {
+		if (((ASink) object).getFunction() != null) {
+			return super.getImage(object);
+		}
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AQuery"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    protected FFunction baseFunction(Object object) {
-        return ((AQuery) object).getFunction();
-    }
+	protected FFunction baseFunction(Object object) {
+		return ((AQuery) object).getFunction();
+	}
 
-    public String suggestLabel(IID object) {
-        return super.suggestLabel(object) + " Query";
-    }
+	public String suggestLabel(IID object) {
+		return super.suggestLabel(object) + " Query";
+	}
 
-    /**
-     * 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 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);
+	}
 
-    public String getQualifier() {
-        return "Q";
-    }
+	public String getQualifier() {
+		return "Q";
+	}
 
-    // @Override
-    // public Object getForeground(Object object) {
-    // return GRAY_BLUE_COLOR;
-    // }
+	// @Override
+	// public Object getForeground(Object object) {
+	// return GRAY_BLUE_COLOR;
+	// }
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AReplaceItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AReplaceItemProvider.java
index 0bc71db..37d0499 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AReplaceItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AReplaceItemProvider.java
@@ -32,85 +32,78 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.metaabm.act.AReplace;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AReplace}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AReplace} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AReplaceItemProvider extends AConnectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AReplaceItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AReplaceItemProvider extends AConnectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AReplaceItemProvider(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);
+	/**
+	 * 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;
-    }
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This returns AReplace.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AReplace"));
-    }
+	/**
+	 * This returns AReplace.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AReplace"));
+	}
 
-    /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((AReplace) object).getID();
-        return label == null || label.length() == 0 ? getString("_UI_AReplace_type") : getString("_UI_AReplace_type")
-            + " " + label;
-    }
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((AReplace) object).getID();
+		return label == null || label.length() == 0 ? getString("_UI_AReplace_type") : getString("_UI_AReplace_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 -->
-     * @generated
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
-        super.notifyChanged(notification);
-    }
+	/**
+	 * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ARuleItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ARuleItemProvider.java
index 5a450e4..1129707 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ARuleItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ARuleItemProvider.java
@@ -39,138 +39,110 @@
 import org.metaabm.act.ARule;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.ARule} object.
  * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ARuleItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ARuleItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ARuleItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ARuleItemProvider(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);
+	/**
+	 * 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);
 
-            addPluralLabelPropertyDescriptor(object);
-            addDescriptionPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addPluralLabelPropertyDescriptor(object);
+			addDescriptionPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Plural Label feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addPluralLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_pluralLabel_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_pluralLabel_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Plural Label feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPluralLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_pluralLabel_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_pluralLabel_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Description feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_description_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_description_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__DESCRIPTION, true,
-                                                                 true, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_description_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__DESCRIPTION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ARule.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ARule"));
-    }
+	/**
+	 * This returns ARule.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ARule"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ARule.class)) {
-            case MetaABMActPackage.ARULE__PLURAL_LABEL:
-            case MetaABMActPackage.ARULE__DESCRIPTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ARule.class)) {
+			case MetaABMActPackage.ARULE__PLURAL_LABEL:
+			case MetaABMActPackage.ARULE__DESCRIPTION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
 
-    public String suggestLabel(IID object) {
-        SAgent reference = ((ARule) object).getReference();
-        return (reference != null ? reference.getLabel() + " " : "") + "Rule";
-    }
+	public String suggestLabel(IID object) {
+		SAgent reference = ((ARule) object).getReference();
+		return (reference != null ? reference.getLabel() + " " : "") + "Rule";
+	}
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AScheduleItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AScheduleItemProvider.java
index 2ba83d6..399381c 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AScheduleItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AScheduleItemProvider.java
@@ -38,236 +38,164 @@
 import org.metaabm.act.ASchedule;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ASchedule}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ASchedule} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class AScheduleItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AScheduleItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AScheduleItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AScheduleItemProvider(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);
+	/**
+	 * 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);
 
-            addPluralLabelPropertyDescriptor(object);
-            addDescriptionPropertyDescriptor(object);
-            addStartPropertyDescriptor(object);
-            addIntervalPropertyDescriptor(object);
-            addPriorityPropertyDescriptor(object);
-            addPickPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addPluralLabelPropertyDescriptor(object);
+			addDescriptionPropertyDescriptor(object);
+			addStartPropertyDescriptor(object);
+			addIntervalPropertyDescriptor(object);
+			addPriorityPropertyDescriptor(object);
+			addPickPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Plural Label feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addPluralLabelPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_pluralLabel_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_pluralLabel_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Plural Label feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPluralLabelPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_pluralLabel_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_pluralLabel_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__PLURAL_LABEL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Description feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addDescriptionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_SNamed_description_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_SNamed_description_feature",
-                                                                           "_UI_SNamed_type"),
-                                                                 MetaABMPackage.Literals.SNAMED__DESCRIPTION, true,
-                                                                 true, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_IDsPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Description feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDescriptionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_SNamed_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_SNamed_description_feature", "_UI_SNamed_type"), MetaABMPackage.Literals.SNAMED__DESCRIPTION, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_IDsPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Start feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addStartPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASchedule_start_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASchedule_start_feature",
-                                                                           "_UI_ASchedule_type"),
-                                                                 MetaABMActPackage.Literals.ASCHEDULE__START, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Start feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addStartPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASchedule_start_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASchedule_start_feature", "_UI_ASchedule_type"), MetaABMActPackage.Literals.ASCHEDULE__START, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Interval feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addIntervalPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASchedule_interval_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASchedule_interval_feature",
-                                                                           "_UI_ASchedule_type"),
-                                                                 MetaABMActPackage.Literals.ASCHEDULE__INTERVAL, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Interval feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addIntervalPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASchedule_interval_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASchedule_interval_feature", "_UI_ASchedule_type"), MetaABMActPackage.Literals.ASCHEDULE__INTERVAL, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Priority feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addPriorityPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASchedule_priority_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASchedule_priority_feature",
-                                                                           "_UI_ASchedule_type"),
-                                                                 MetaABMActPackage.Literals.ASCHEDULE__PRIORITY, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Priority feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPriorityPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASchedule_priority_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASchedule_priority_feature", "_UI_ASchedule_type"), MetaABMActPackage.Literals.ASCHEDULE__PRIORITY, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Pick feature.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addPickPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASchedule_pick_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASchedule_pick_feature",
-                                                                           "_UI_ASchedule_type"),
-                                                                 MetaABMActPackage.Literals.ASCHEDULE__PICK, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Pick feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addPickPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASchedule_pick_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASchedule_pick_feature", "_UI_ASchedule_type"), MetaABMActPackage.Literals.ASCHEDULE__PICK, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns ASchedule.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ASchedule"));
-    }
+	/**
+	 * This returns ASchedule.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ASchedule"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ASchedule.class)) {
-            case MetaABMActPackage.ASCHEDULE__PLURAL_LABEL:
-            case MetaABMActPackage.ASCHEDULE__DESCRIPTION:
-            case MetaABMActPackage.ASCHEDULE__START:
-            case MetaABMActPackage.ASCHEDULE__INTERVAL:
-            case MetaABMActPackage.ASCHEDULE__PRIORITY:
-            case MetaABMActPackage.ASCHEDULE__PICK:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ASchedule.class)) {
+			case MetaABMActPackage.ASCHEDULE__PLURAL_LABEL:
+			case MetaABMActPackage.ASCHEDULE__DESCRIPTION:
+			case MetaABMActPackage.ASCHEDULE__START:
+			case MetaABMActPackage.ASCHEDULE__INTERVAL:
+			case MetaABMActPackage.ASCHEDULE__PRIORITY:
+			case MetaABMActPackage.ASCHEDULE__PICK:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
 
-    public String suggestLabel(IID object) {
-        ASchedule sch = (ASchedule) object;
-        StringBuffer label = new StringBuffer();
-        label.append("At ");
-        label.append(sch.getStart());
-        if (sch.getInterval() != 1) {
-            label.append(" Every ");
-            label.append(sch.getInterval());
-        }
-        return label.toString();
-    }
+	public String suggestLabel(IID object) {
+		ASchedule sch = (ASchedule) object;
+		StringBuffer label = new StringBuffer();
+		label.append("At ");
+		label.append(sch.getStart());
+		if (sch.getInterval() != 1) {
+			label.append(" Every ");
+			label.append(sch.getInterval());
+		}
+		return label.toString();
+	}
 
-    public String suggestID(IID object) {
-        return "";
-    }
+	public String suggestID(IID object) {
+		return "";
+	}
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASelectItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASelectItemProvider.java
index 73da126..6aca929 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASelectItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASelectItemProvider.java
@@ -37,150 +37,124 @@
 import org.metaabm.act.ASelect;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ASelect}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ASelect} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ASelectItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ASelectItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ASelectItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ASelectItemProvider(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);
+	/**
+	 * 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);
 
-            addAgentPropertyDescriptor(object);
-            addSpacePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addAgentPropertyDescriptor(object);
+			addSpacePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Agent feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addAgentPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASelect_agent_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASelect_agent_feature",
-                                                                           "_UI_ASelect_type"),
-                                                                 MetaABMActPackage.Literals.ASELECT__AGENT, true,
-                                                                 false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Agent feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAgentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASelect_agent_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASelect_agent_feature", "_UI_ASelect_type"), MetaABMActPackage.Literals.ASELECT__AGENT, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Space feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addSpacePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASelect_space_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASelect_space_feature",
-                                                                           "_UI_ASelect_type"),
-                                                                 MetaABMActPackage.Literals.ASELECT__SPACE, true,
-                                                                 false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Space feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSpacePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASelect_space_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASelect_space_feature", "_UI_ASelect_type"), MetaABMActPackage.Literals.ASELECT__SPACE, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * This returns ASelect.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ASelect"));
-    }
+	/**
+	 * This returns ASelect.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ASelect"));
+	}
 
-    public String suggestLabel(IID object) {
-        ASelect select = (ASelect) object;
-        StringBuffer label = new StringBuffer();
-        if (select.getAgent() != null && select.getAgent().getLabel() != null) {
-            label.append(select.getAgent().getLabel());
-        } else {
-            label.append("[?]");
-        }
-        if (select.getSpace() != null && select.getSpace().getLabel() != null) {
-            label.append(" In ");
-            label.append(select.getSpace().getLabel());
-        }
-        if (select.getSelected() != null && select.getSelected().getLabel() != null) {
-            label.append(" From ");
-            label.append(select.getSelected().getLabel());
-        }
-        return label.toString();
-    }
+	public String suggestLabel(IID object) {
+		ASelect select = (ASelect) object;
+		StringBuffer label = new StringBuffer();
+		if (select.getAgent() != null && select.getAgent().getLabel() != null) {
+			label.append(select.getAgent().getLabel());
+		} else {
+			label.append("[?]");
+		}
+		if (select.getSpace() != null && select.getSpace().getLabel() != null) {
+			label.append(" In ");
+			label.append(select.getSpace().getLabel());
+		}
+		if (select.getSelected() != null && select.getSelected().getLabel() != null) {
+			label.append(" From ");
+			label.append(select.getSelected().getLabel());
+		}
+		return label.toString();
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(ASelect.class)) {
-            case MetaABMActPackage.ASELECT__AGENT:
-            case MetaABMActPackage.ASELECT__SPACE:
-            case MetaABMActPackage.ASELECT__FOR:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ASelect.class)) {
+			case MetaABMActPackage.ASELECT__AGENT:
+			case MetaABMActPackage.ASELECT__SPACE:
+			case MetaABMActPackage.ASELECT__FOR:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASetItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASetItemProvider.java
index 91ca242..2d66877 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASetItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASetItemProvider.java
@@ -40,132 +40,120 @@
 import org.metaabm.act.ASet;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.ASet} object.
  * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ASetItemProvider extends AAccessorItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ASetItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ASetItemProvider extends AAccessorItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ASetItemProvider(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);
+	/**
+	 * 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);
 
-            addParameterPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addParameterPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Parameter feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addParameterPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                .getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASet_parameter_feature"),
-            getString("_UI_PropertyDescriptor_description", "_UI_ASet_parameter_feature", "_UI_ASet_type"),
-            MetaABMActPackage.Literals.ASET__PARAMETER, true, false, true, null, getString("_UI_ActPropertyCategory"),
-            null) {
-            @SuppressWarnings("unchecked")
-            public Collection<?> getChoiceOfValues(Object object) {
-                ASet set = (ASet) object;
-                Collection<IValue> original = (Collection<IValue>) super.getChoiceOfValues(object);
-                Collection<IValue> potential = new ArrayList<IValue>();
-                if (set.getAttribute() != null) {
-                    if (set.getAttribute() instanceof SState) {
-                        potential.addAll(((SState) set.getAttribute()).getOptions());
-                    }
+	/**
+	 * This adds a property descriptor for the Parameter feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addParameterPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASet_parameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASet_parameter_feature", "_UI_ASet_type"), MetaABMActPackage.Literals.ASET__PARAMETER, true, false, true, null, getString("_UI_ActPropertyCategory"), null) {
+			@SuppressWarnings("unchecked")
+			public Collection<?> getChoiceOfValues(Object object) {
+				ASet set = (ASet) object;
+				Collection<IValue> original = (Collection<IValue>) super.getChoiceOfValues(object);
+				Collection<IValue> potential = new ArrayList<IValue>();
+				if (set.getAttribute() != null) {
+					if (set.getAttribute() instanceof SState) {
+						potential.addAll(((SState) set.getAttribute()).getOptions());
+					}
 
-                    for (IValue candidate : original) {
-                        if (set.isReachable(candidate) && set.getAttribute().accepts(candidate)) {
-                            potential.add(candidate);
-                        }
-                    }
-                }
-                return potential;
-            }
-        });
-    }
+					for (IValue candidate : original) {
+						if (set.isReachable(candidate) && set.getAttribute().accepts(candidate)) {
+							potential.add(candidate);
+						}
+					}
+				}
+				return potential;
+			}
+		});
+	}
 
-    /**
-     * This returns ASet.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ASet"));
-    }
+	/**
+	 * This returns ASet.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ASet"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-        // ASet set = (ASet) object;
-        // MetaABMItemProvider valueProvider = providerFor(set.getAttribute());
-        // MetaABMItemProvider parameterProvider = providerFor(set.getParameter());
-        // String selected = set.getSelected() != null && set.getSelected() != set.getGroup() ? set.getSelected()
-        // .getLabel()
-        // + " " : "";
-        // return "Set " + selected + (valueProvider != null ? valueProvider.getText(set.getAttribute()) : "[?]") +
-        // " to "
-        // + (parameterProvider != null ? parameterProvider.getText(set.getParameter()) : "[?]");
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+		// ASet set = (ASet) object;
+		// MetaABMItemProvider valueProvider = providerFor(set.getAttribute());
+		// MetaABMItemProvider parameterProvider = providerFor(set.getParameter());
+		// String selected = set.getSelected() != null && set.getSelected() != set.getGroup() ? set.getSelected()
+		// .getLabel()
+		// + " " : "";
+		// return "Set " + selected + (valueProvider != null ? valueProvider.getText(set.getAttribute()) : "[?]") +
+		// " to "
+		// + (parameterProvider != null ? parameterProvider.getText(set.getParameter()) : "[?]");
+	}
 
-    /**
-     * 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 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);
+	}
 
-    public String suggestLabel(IID object) {
-        ASet acc = (ASet) object;
-        return "Set " + (acc.getAttribute() != null ? acc.getAttribute().getLabel() : "[?]") + " To "
-            + (acc.getParameter() != null ? acc.getParameter().getLabel() : "[?]");
-    }
+	public String suggestLabel(IID object) {
+		ASet acc = (ASet) object;
+		return "Set " + (acc.getAttribute() != null ? acc.getAttribute().getLabel() : "[?]") + " To " + (acc.getParameter() != null ? acc.getParameter().getLabel() : "[?]");
+	}
 
-    /**
-     * 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);
-    }
+	/**
+	 * 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);
+	}
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AShapedItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AShapedItemProvider.java
index 2a15bbd..625cc96 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AShapedItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AShapedItemProvider.java
@@ -36,121 +36,104 @@
 import org.metaabm.act.AShaped;
 import org.metaabm.act.MetaABMActPackage;
 import org.metaabm.provider.MetaABMEditPlugin;
+import org.metaabm.provider.MetaABMItemProvider;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AShaped}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AShaped} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class AShapedItemProvider extends ASelectItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AShapedItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AShapedItemProvider extends MetaABMItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AShapedItemProvider(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);
+	/**
+	 * 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);
 
-            addShapePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addShapePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Shape feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addShapePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_AShaped_shape_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_AShaped_shape_feature",
-                                                                           "_UI_AShaped_type"),
-                                                                 MetaABMActPackage.Literals.ASHAPED__SHAPE, true,
-                                                                 false, false,
-                                                                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Shape feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addShapePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_AShaped_shape_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AShaped_shape_feature", "_UI_AShaped_type"), MetaABMActPackage.Literals.ASHAPED__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean hasChildren(Object object) {
-        return hasChildren(object, true);
-    }
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean hasChildren(Object object) {
+		return hasChildren(object, true);
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(AShaped.class)) {
-            case MetaABMActPackage.ASHAPED__SHAPE:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AShaped.class)) {
+			case MetaABMActPackage.ASHAPED__SHAPE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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 MetaABMEditPlugin.INSTANCE;
-    }
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return MetaABMEditPlugin.INSTANCE;
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASinkItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASinkItemProvider.java
index d10cf42..615ad29 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASinkItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ASinkItemProvider.java
@@ -63,402 +63,368 @@
 import org.metaabm.function.FLibrary;
 import org.metaabm.function.FOperator;
 
-/*
+/**
  * This is the item provider adapter for a {@link org.metaabm.act.ASink} object.
  * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class ASinkItemProvider extends AActItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+public class ASinkItemProvider extends AActItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
 
-    /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    public ASinkItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ASinkItemProvider(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);
+	/**
+	 * 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);
 
-            addAvailableTypesPropertyDescriptor(object);
-            addInputsPropertyDescriptor(object);
-            addFunctionPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addAvailableTypesPropertyDescriptor(object);
+			addInputsPropertyDescriptor(object);
+			addFunctionPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * 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 -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-        if (childrenFeatures == null) {
-            childrenFeatures = new ArrayList<EStructuralFeature>();
-            childrenFeatures.add(MetaABMActPackage.Literals.ASINK__INPUTS);
-            childrenFeatures.add(MetaABMActPackage.Literals.AACT__TARGETS);
-        }
-        return childrenFeatures;
-    }
+	/**
+	 * 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 -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			childrenFeatures = new ArrayList<EStructuralFeature>();
+			childrenFeatures.add(MetaABMActPackage.Literals.ASINK__INPUTS);
+			childrenFeatures.add(MetaABMActPackage.Literals.AACT__TARGETS);
+		}
+		return childrenFeatures;
+	}
 
-    public Collection<?> getChildren(Object object) {
-        return ((ASink) object).getInputs();
-    }
+	public Collection<?> getChildren(Object object) {
+		return ((ASink) object).getInputs();
+	}
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper feature to use for
-        // adding (see {@link AddCommand}) it as a child.
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
 
-        return super.getChildFeature(object, child);
-    }
+		return super.getChildFeature(object, child);
+	}
 
-    /**
-     * This adds a property descriptor for the Available Types feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addAvailableTypesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                                  getResourceLocator(),
-                                                  getString("_UI_IValue_availableTypes_feature"),
-                                                  getString("_UI_PropertyDescriptor_description",
-                                                            "_UI_IValue_availableTypes_feature", "_UI_IValue_type"),
-                                                  MetaABMPackage.Literals.IVALUE__AVAILABLE_TYPES, true, false, false,
-                                                  ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-                                                  new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Available Types feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAvailableTypesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IValue_availableTypes_feature"), getString("_UI_PropertyDescriptor_description", "_UI_IValue_availableTypes_feature", "_UI_IValue_type"), MetaABMPackage.Literals.IVALUE__AVAILABLE_TYPES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the Inputs feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addInputsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                                                  getResourceLocator(),
-                                                  getString("_UI_ASink_inputs_feature"),
-                                                  getString("_UI_PropertyDescriptor_description",
-                                                            "_UI_ASink_inputs_feature", "_UI_ASink_type"),
-                                                  MetaABMActPackage.Literals.ASINK__INPUTS, true, true, false, null,
-                                                  getString("_UI_RelationsPropertyCategory"),
-                                                  new String[] { "org.eclipse.ui.views.properties.expert" }));
-    }
+	/**
+	 * This adds a property descriptor for the Inputs feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addInputsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASink_inputs_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASink_inputs_feature", "_UI_ASink_type"), MetaABMActPackage.Literals.ASINK__INPUTS, true, true, false, null, getString("_UI_RelationsPropertyCategory"), new String[] { "org.eclipse.ui.views.properties.expert" }));
+	}
 
-    /**
-     * This adds a property descriptor for the Function feature.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected void addFunctionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASink_function_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASink_function_feature",
-                                                                           "_UI_ASink_type"),
-                                                                 MetaABMActPackage.Literals.ASINK__FUNCTION, true,
-                                                                 false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Function feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addFunctionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASink_function_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASink_function_feature", "_UI_ASink_type"), MetaABMActPackage.Literals.ASINK__FUNCTION, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    @SuppressWarnings("unchecked")
-    protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature,
-            Collection<?> collection, int index) {
-        if (feature == MetaABMActPackage.Literals.ASINK__INPUTS) {
-            CompoundCommand cmd = new CompoundCommand("Add Sink Inputs");
-            SuggestLabelCommand suggestLabelCommand = new SuggestLabelCommand(this, domain, (IID) owner);
-            cmd.append(super.createAddCommand(domain, owner, feature, collection, index));
-            for (AInput input : (Collection<AInput>) collection) {
-                ASelect selected = ((ASink) owner).getSelected();
-                if (selected != null) {
-                    cmd.appendIfCanExecute(SetCommand.create(domain, input,
-                                                             MetaABMActPackage.Literals.AINPUT__SELECTED, selected));
-                }
-                // cmd.appendIfCanExecute(AddCommand.create(domain,
-                // input.getValue(),
-                // (EStructuralFeature)
-                // MetaABMPackage.Literals.IVALUE__ACCESSORS, input));
-            }
-            cmd.appendIfCanExecute(suggestLabelCommand);
-            return cmd;
-        } else {
-            return super.createAddCommand(domain, owner, feature, collection, index);
-        }
-    }
+	@SuppressWarnings("unchecked")
+	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
+		if (feature == MetaABMActPackage.Literals.ASINK__INPUTS) {
+			CompoundCommand cmd = new CompoundCommand("Add Sink Inputs");
+			SuggestLabelCommand suggestLabelCommand = new SuggestLabelCommand(this, domain, (IID) owner);
+			cmd.append(super.createAddCommand(domain, owner, feature, collection, index));
+			for (AInput input : (Collection<AInput>) collection) {
+				ASelect selected = ((ASink) owner).getSelected();
+				if (selected != null) {
+					cmd.appendIfCanExecute(SetCommand.create(domain, input, MetaABMActPackage.Literals.AINPUT__SELECTED, selected));
+				}
+				// cmd.appendIfCanExecute(AddCommand.create(domain,
+				// input.getValue(),
+				// (EStructuralFeature)
+				// MetaABMPackage.Literals.IVALUE__ACCESSORS, input));
+			}
+			cmd.appendIfCanExecute(suggestLabelCommand);
+			return cmd;
+		} else {
+			return super.createAddCommand(domain, owner, feature, collection, index);
+		}
+	}
 
-    @SuppressWarnings("unchecked")
-    protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature,
-            Collection<?> collection) {
-        if (feature == MetaABMActPackage.Literals.ASINK__INPUTS) {
-            CompoundCommand cmd = new CompoundCommand();
-            for (AInput input : (Collection<AInput>) collection) {
-                cmd.append(SetCommand.create(domain, input, MetaABMActPackage.Literals.AINPUT__VALUE, null));
-            }
-            cmd.append(super.createRemoveCommand(domain, owner, feature, collection));
-            return cmd;
-        } else {
-            return super.createRemoveCommand(domain, owner, feature, collection);
-        }
-    }
+	@SuppressWarnings("unchecked")
+	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
+		if (feature == MetaABMActPackage.Literals.ASINK__INPUTS) {
+			CompoundCommand cmd = new CompoundCommand();
+			for (AInput input : (Collection<AInput>) collection) {
+				cmd.append(SetCommand.create(domain, input, MetaABMActPackage.Literals.AINPUT__VALUE, null));
+			}
+			cmd.append(super.createRemoveCommand(domain, owner, feature, collection));
+			return cmd;
+		} else {
+			return super.createRemoveCommand(domain, owner, feature, collection);
+		}
+	}
 
-    protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value,
-            int index) {
-        ASink sink = (ASink) owner;
-        if (feature == MetaABMActPackage.Literals.ASINK__FUNCTION && value == null || value instanceof FFunction) {
-            FFunction function = (FFunction) value;
-            CompoundCommand cmd = new CompoundCommand("Set Sink Function");
-            cmd.append(super.createSetCommand(domain, owner, feature, value, index));
-            cmd.appendIfCanExecute(new SetSinkFunctionCommand(domain, sink, function));
-            if (value != null && !((FFunction) value).isMultiValue()) {
-                cmd.appendIfCanExecute(new SuggestLabelCommand(domain, (IID) owner));
-            }
-            return cmd;
-        } else if (feature == MetaABMPackage.Literals.IID__LABEL) {
-            CompoundCommand cmd = new CompoundCommand("Sink Label Command");
-            cmd.append(super.createSetCommand(domain, owner, feature, value, index));
-            cmd.appendIfCanExecute(new SetSinkLabelCommand(domain, sink, (String) value));
-            return cmd;
-        }
-        return super.createSetCommand(domain, owner, feature, value, index);
-    }
+	protected Command createSetCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Object value, int index) {
+		ASink sink = (ASink) owner;
+		if (feature == MetaABMActPackage.Literals.ASINK__FUNCTION && value == null || value instanceof FFunction) {
+			FFunction function = (FFunction) value;
+			CompoundCommand cmd = new CompoundCommand("Set Sink Function");
+			cmd.append(super.createSetCommand(domain, owner, feature, value, index));
+			cmd.appendIfCanExecute(new SetSinkFunctionCommand(domain, sink, function));
+			if (value != null && !((FFunction) value).isMultiValue()) {
+				cmd.appendIfCanExecute(new SuggestLabelCommand(domain, (IID) owner));
+			}
+			return cmd;
+		} else if (feature == MetaABMPackage.Literals.IID__LABEL) {
+			CompoundCommand cmd = new CompoundCommand("Sink Label Command");
+			cmd.append(super.createSetCommand(domain, owner, feature, value, index));
+			cmd.appendIfCanExecute(new SetSinkLabelCommand(domain, sink, (String) value));
+			return cmd;
+		}
+		return super.createSetCommand(domain, owner, feature, value, index);
+	}
 
-    // public boolean reachable(ASink from, IValue value) {
-    // if (from.isSourceFor(value)) {
-    // return true;
-    // } else if (reachable(from.getReference(), value)) {
-    // return true;
-    // } else if ((from.getSelected() != null) &&
-    // (reachable(from.getSelected().getAgent(), value))) {
-    // return true;
-    // }
-    // return false;
-    // }
+	// public boolean reachable(ASink from, IValue value) {
+	// if (from.isSourceFor(value)) {
+	// return true;
+	// } else if (reachable(from.getReference(), value)) {
+	// return true;
+	// } else if ((from.getSelected() != null) &&
+	// (reachable(from.getSelected().getAgent(), value))) {
+	// return true;
+	// }
+	// return false;
+	// }
 
-    /**
-     * 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 NOT
-     */
-    @Override
-    public void notifyChanged(Notification notification) {
-        updateChildren(notification);
+	/**
+	 * 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 NOT
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
 
-        switch (notification.getFeatureID(ASink.class)) {
-            case MetaABMActPackage.ASINK__SELECTED:
-            case MetaABMActPackage.ASINK__FUNCTION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
-                return;
-            case MetaABMActPackage.ASINK__INPUTS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(ASink.class)) {
+			case MetaABMActPackage.ASINK__SELECTED:
+			case MetaABMActPackage.ASINK__FUNCTION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, true));
+				return;
+			case MetaABMActPackage.ASINK__INPUTS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
 
-    public static String getImageNameForFunction(FFunction function) {
-        if (function != null) {
-            if (function instanceof FOperator) {
-                return StringUtils.capitalize(function.getID());
-            } else if (function.eContainer() instanceof FLibrary
-                && ((FLibrary) function.eContainer()).getID().equals("spatial")) {
-                return "Spatial";
-            } else if (function.eContainer() instanceof FLibrary
-                && ((FLibrary) function.eContainer()).getID().equals("random")) {
-                return "Random";
-            } else if (function instanceof FGenericLogical) {
-                return "GenericLogical";
-            }
-        }
-        return "GenericFunction";
-    }
+	public static String getImageNameForFunction(FFunction function) {
+		if (function != null) {
+			if (function instanceof FOperator) {
+				return StringUtils.capitalize(function.getID());
+			} else if (function.eContainer() instanceof FLibrary && ((FLibrary) function.eContainer()).getID().equals("spatial")) {
+				return "Spatial";
+			} else if (function.eContainer() instanceof FLibrary && ((FLibrary) function.eContainer()).getID().equals("random")) {
+				return "Random";
+			} else if (function instanceof FGenericLogical) {
+				return "GenericLogical";
+			}
+		}
+		return "GenericFunction";
+	}
 
-    static Map<FFunction, Object> sinkImages = new HashMap<FFunction, Object>();
+	static Map<FFunction, Object> sinkImages = new HashMap<FFunction, Object>();
 
-    public Map<FFunction, Object> getImageCache() {
-        return sinkImages;
-    }
+	public Map<FFunction, Object> getImageCache() {
+		return sinkImages;
+	}
 
-    /**
-     * Image from Function if defined. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    public Object getImage(Object object) {
-        Object img = getImageCache().get(((ASink) object).getFunction());
-        if (img == null) {
-            img = getImageForFunction(getResourceLocator(), object, getQualifier());
-            img = overlayImage(object, img);
-            getImageCache().put(((ASink) object).getFunction(), img);
-        }
-        return img;
-    }
+	/**
+	 * Image from Function if defined. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	public Object getImage(Object object) {
+		Object img = getImageCache().get(((ASink) object).getFunction());
+		if (img == null) {
+			img = getImageForFunction(getResourceLocator(), object, getQualifier());
+			img = overlayImage(object, img);
+			getImageCache().put(((ASink) object).getFunction(), img);
+		}
+		return img;
+	}
 
-    public static Object getImageForFunction(ResourceLocator locator, Object object, String qualifier) {
-        Object img = null;
-        String path = "full/obj16/";
-        ASink sink = (ASink) object;
-        FFunction baseFunction = sink.getFunction();
-        if (baseFunction != null) {
-            String imageNameForFunction = getImageNameForFunction(baseFunction);
-            String imagePath = path + qualifier + imageNameForFunction;
-            try {
-                return locator.getImage(imagePath);
-            } catch (MissingResourceException e) {
-                System.err.println("Couldn't find image at: " + imagePath);
-            }
-        }
-        try {
-            return locator.getImage(path + "AEvaluate");
-        } catch (MissingResourceException e2) {
-            System.err.println("Couldn't find image at: " + path);
-        }
-        if (img == null) {
-            throw new RuntimeException("Couldn't find image at: " + path);
-        }
-        return img;
-    }
+	public static Object getImageForFunction(ResourceLocator locator, Object object, String qualifier) {
+		Object img = null;
+		String path = "full/obj16/";
+		ASink sink = (ASink) object;
+		FFunction baseFunction = sink.getFunction();
+		if (baseFunction != null) {
+			String imageNameForFunction = getImageNameForFunction(baseFunction);
+			String imagePath = path + qualifier + imageNameForFunction;
+			try {
+				return locator.getImage(imagePath);
+			} catch (MissingResourceException e) {
+				System.err.println("Couldn't find image at: " + imagePath);
+			}
+		}
+		try {
+			return locator.getImage(path + "AEvaluate");
+		} catch (MissingResourceException e2) {
+			System.err.println("Couldn't find image at: " + path);
+		}
+		if (img == null) {
+			throw new RuntimeException("Couldn't find image at: " + path);
+		}
+		return img;
+	}
 
-    public String getQualifier() {
-        return "A";
-    }
+	public String getQualifier() {
+		return "A";
+	}
 
-    /**
-     * 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 NOT
-     */
-    @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
+	/**
+	 * 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 NOT
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.ASINK__INPUTS,
-                                                     MetaABMActFactory.eINSTANCE.createAInput()));
-    }
+		newChildDescriptors.add(createChildParameter(MetaABMActPackage.Literals.ASINK__INPUTS, MetaABMActFactory.eINSTANCE.createAInput()));
+	}
 
-    private String getInputLabel(ASink sink, int index) {
-        EList<AInput> inputs = sink.getInputs();
-        if (inputs.size() > index) {
-            IValue value = inputs.get(index).getValue();
-            if (value != null) {
-                return value.getLabel();
-            }
-        }
-        return "[?]";
-    }
+	private String getInputLabel(ASink sink, int index) {
+		EList<AInput> inputs = sink.getInputs();
+		if (inputs.size() > index) {
+			IValue value = inputs.get(index).getValue();
+			if (value != null) {
+				return value.getLabel();
+			}
+		}
+		return "[?]";
+	}
 
-    public static List<String> getInputLabels(ASink sink) {
-        List<String> inputs = new ArrayList<String>();
-        for (AInput in : sink.getInputs()) {
-            if (in.getValue() != null) {
-                inputs.add(in.getValue().getLabel());
-            }
-        }
-        return inputs;
-    }
+	public static List<String> getInputLabels(ASink sink) {
+		List<String> inputs = new ArrayList<String>();
+		for (AInput in : sink.getInputs()) {
+			if (in.getValue() != null) {
+				inputs.add(in.getValue().getLabel());
+			}
+		}
+		return inputs;
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        // ASink sink = (ASink) object;
-        // String label = sink.getLabel();
-        // // Don't show selected if it is root
-        // if (sink.getRootSelected() != null && sink.getRootSelected().getLabel() != null) {
-        // label = label.replace(sink.getRootSelected().getLabel() + ": ", "");
-        // }
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		// ASink sink = (ASink) object;
+		// String label = sink.getLabel();
+		// // Don't show selected if it is root
+		// if (sink.getRootSelected() != null && sink.getRootSelected().getLabel() != null) {
+		// label = label.replace(sink.getRootSelected().getLabel() + ": ", "");
+		// }
+		return super.getText(object);
+	}
 
-    public String suggestLabel(IID object) {
-        ASink sink = (ASink) object;
-        StringBuffer expression = new StringBuffer();
-        // if (sink.getSelected() != null && sink.getSelected().getLabel() != null) {
-        // expression.append(sink.getSelected().getLabel());
-        // expression.append(": ");
-        // }
-        appendFunctionLabel(sink, expression);
-        return expression.toString();
-    }
+	public String suggestLabel(IID object) {
+		ASink sink = (ASink) object;
+		StringBuffer expression = new StringBuffer();
+		// if (sink.getSelected() != null && sink.getSelected().getLabel() != null) {
+		// expression.append(sink.getSelected().getLabel());
+		// expression.append(": ");
+		// }
+		appendFunctionLabel(sink, expression);
+		return expression.toString();
+	}
 
-    private void appendFunctionLabel(ASink sink, StringBuffer expression) {
-        FFunction baseFunction = sink.getFunction();
-        if (baseFunction == null) {
-            expression.append("[Unspecified](" + StringUtils.join(getInputLabels(sink).iterator(), ", ") + ")");
-        } else if (baseFunction instanceof FGeneric) {
-            expression.append(baseFunction.getLabel());
-            expression.append("(");
-            expression.append(StringUtils.join(getInputLabels(sink).iterator(), ", "));
-            expression.append(")");
-        } else if (baseFunction instanceof FOperator) {
-            FOperator operator = (FOperator) baseFunction;
-            int arity = operator.getArity();
-            switch (arity) {
-                // typically literal
-                case 0:
-                    break;
-                case 1:
-                    expression.append(operator.getLabel());
-                    expression.append(" ");
-                    expression.append(getInputLabel(sink, 0));
-                    break;
-                case 2:
-                    expression.append(getInputLabel(sink, 0));
-                    expression.append(" ");
-                    expression.append(operator.getLabel());
-                    expression.append(" ");
-                    expression.append(getInputLabel(sink, 1));
-                    break;
-                default:
-                    expression.append("[Unsupported Arity:" + arity + "]");
-            }
-        } else {
-            expression.append("[Unsupported Function Type");
-        }
-    }
+	private void appendFunctionLabel(ASink sink, StringBuffer expression) {
+		FFunction baseFunction = sink.getFunction();
+		if (baseFunction == null) {
+			expression.append("[Unspecified](" + StringUtils.join(getInputLabels(sink).iterator(), ", ") + ")");
+		} else if (baseFunction instanceof FGeneric) {
+			expression.append(baseFunction.getLabel());
+			expression.append("(");
+			expression.append(StringUtils.join(getInputLabels(sink).iterator(), ", "));
+			expression.append(")");
+		} else if (baseFunction instanceof FOperator) {
+			FOperator operator = (FOperator) baseFunction;
+			int arity = operator.getArity();
+			switch (arity) {
+				// typically literal
+				case 0:
+					break;
+				case 1:
+					expression.append(operator.getLabel());
+					expression.append(" ");
+					expression.append(getInputLabel(sink, 0));
+					break;
+				case 2:
+					expression.append(getInputLabel(sink, 0));
+					expression.append(" ");
+					expression.append(operator.getLabel());
+					expression.append(" ");
+					expression.append(getInputLabel(sink, 1));
+					break;
+				default:
+					expression.append("[Unsupported Arity:" + arity + "]");
+			}
+		} else {
+			expression.append("[Unsupported Function Type");
+		}
+	}
 
-    public boolean hasChildren(Object object) {
-        return ((ASink) object).getInputs().size() > 0 || super.hasChildren(object);
-    }
+	public boolean hasChildren(Object object) {
+		return ((ASink) object).getInputs().size() > 0 || super.hasChildren(object);
+	}
 
-    // public String suggestID(IID object) {
-    // ASink sink = (ASink) object;
-    // String id;
-    // if (sink.getFunction() != null) {
-    // id = sink.getFunction().getID();
-    // } else {
-    // id = "Ident";
-    // }
-    // id += StringUtils.join(idsCaps(sink.getInputs()).toArray());
-    // return super.suggestID(object) + id;
-    // }
+	// public String suggestID(IID object) {
+	// ASink sink = (ASink) object;
+	// String id;
+	// if (sink.getFunction() != null) {
+	// id = sink.getFunction().getID();
+	// } else {
+	// id = "Ident";
+	// }
+	// id += StringUtils.join(idsCaps(sink.getInputs()).toArray());
+	// return super.suggestID(object) + id;
+	// }
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ATransformItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ATransformItemProvider.java
index 1778e96..9bb7029 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ATransformItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/ATransformItemProvider.java
@@ -37,114 +37,101 @@
 import org.metaabm.act.AAct;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.ATransform}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.ATransform} object.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
  * @generated
  */
-public class ATransformItemProvider extends ACommandItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public ATransformItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class ATransformItemProvider extends ACommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ATransformItemProvider(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);
+	/**
+	 * 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);
 
-            addDestinationPropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addDestinationPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Destination feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    protected void addDestinationPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-                    getResourceLocator(), getString("_UI_ATransform_destination_feature"),
-                    getString("_UI_PropertyDescriptor_description", "_UI_ATransform_destination_feature",
-                              "_UI_ATransform_type"), MetaABMActPackage.Literals.ATRANSFORM__DESTINATION, true, false,
-                    true, null, getString("_UI_ActPropertyCategory"), null) {
+	/**
+	 * This adds a property descriptor for the Destination feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected void addDestinationPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ATransform_destination_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ATransform_destination_feature", "_UI_ATransform_type"), MetaABMActPackage.Literals.ATRANSFORM__DESTINATION, true, false, true, null, getString("_UI_ActPropertyCategory"), null) {
 
-                    @SuppressWarnings("unchecked")
-                    public Collection<?> getChoiceOfValues(Object object) {
-                        Collection<AAct> original = (Collection<AAct>) super.getChoiceOfValues(object);
-                        Collection<AAct> potential = new ArrayList<AAct>();
-                        for (AAct candidate : original) {
-                            if (((AAct) object).isTargetOf(candidate)) {
-                                potential.add(candidate);
-                            }
-                        }
-                        return potential;
-                    }
+			@SuppressWarnings("unchecked")
+			public Collection<?> getChoiceOfValues(Object object) {
+				Collection<AAct> original = (Collection<AAct>) super.getChoiceOfValues(object);
+				Collection<AAct> potential = new ArrayList<AAct>();
+				for (AAct candidate : original) {
+					if (((AAct) object).isTargetOf(candidate)) {
+						potential.add(candidate);
+					}
+				}
+				return potential;
+			}
 
-                });
-    }
+		});
+	}
 
-    /**
-     * This returns ATransform.gif. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ATransform"));
-    }
+	/**
+	 * This returns ATransform.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ATransform"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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 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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AWatchItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AWatchItemProvider.java
index a866518..6f1ac96 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AWatchItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/AWatchItemProvider.java
@@ -36,132 +36,106 @@
 import org.metaabm.act.AWatch;
 import org.metaabm.act.MetaABMActPackage;
 
-/*
- * This is the item provider adapter for a {@link org.metaabm.act.AWatch}
- * object. <!-- begin-user-doc -->
+/**
+ * This is the item provider adapter for a {@link org.metaabm.act.AWatch} object.
+ * <!-- begin-user-doc -->
+ * 
  * @author Miles Parker <!-- end-user-doc -->
  * @generated
  */
-public class AWatchItemProvider extends AAccessorItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-        ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    public AWatchItemProvider(AdapterFactory adapterFactory) {
-        super(adapterFactory);
-    }
+public class AWatchItemProvider extends AAccessorItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider, ITableItemColorProvider, IItemColorProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AWatchItemProvider(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);
+	/**
+	 * 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);
 
-            addAgentPropertyDescriptor(object);
-            addSpacePropertyDescriptor(object);
-        }
-        return itemPropertyDescriptors;
-    }
+			addAgentPropertyDescriptor(object);
+			addSpacePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
 
-    /**
-     * This adds a property descriptor for the Agent feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addAgentPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASelect_agent_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASelect_agent_feature",
-                                                                           "_UI_ASelect_type"),
-                                                                 MetaABMActPackage.Literals.ASELECT__AGENT, true,
-                                                                 false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Agent feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAgentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASelect_agent_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASelect_agent_feature", "_UI_ASelect_type"), MetaABMActPackage.Literals.ASELECT__AGENT, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This adds a property descriptor for the Space feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected void addSpacePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory)
-                                                                         .getRootAdapterFactory(),
-                                                                 getResourceLocator(),
-                                                                 getString("_UI_ASelect_space_feature"),
-                                                                 getString("_UI_PropertyDescriptor_description",
-                                                                           "_UI_ASelect_space_feature",
-                                                                           "_UI_ASelect_type"),
-                                                                 MetaABMActPackage.Literals.ASELECT__SPACE, true,
-                                                                 false, true, null,
-                                                                 getString("_UI_ActPropertyCategory"), null));
-    }
+	/**
+	 * This adds a property descriptor for the Space feature.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSpacePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ASelect_space_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ASelect_space_feature", "_UI_ASelect_type"), MetaABMActPackage.Literals.ASELECT__SPACE, true, false, true, null, getString("_UI_ActPropertyCategory"), null));
+	}
 
-    /**
-     * This returns AWatch.gif.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/AWatch"));
-    }
+	/**
+	 * This returns AWatch.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AWatch"));
+	}
 
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * 
-     * @generated NOT
-     */
-    @Override
-    public String getText(Object object) {
-        return super.getText(object);
-    }
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		return super.getText(object);
+	}
 
-    /**
-     * 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);
+	/**
+	 * 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);
 
-        switch (notification.getFeatureID(AWatch.class)) {
-            case MetaABMActPackage.AWATCH__AGENT:
-            case MetaABMActPackage.AWATCH__SPACE:
-            case MetaABMActPackage.AWATCH__FOR:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-        }
-        super.notifyChanged(notification);
-    }
+		switch (notification.getFeatureID(AWatch.class)) {
+			case MetaABMActPackage.AWATCH__AGENT:
+			case MetaABMActPackage.AWATCH__SPACE:
+			case MetaABMActPackage.AWATCH__FOR:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+		}
+		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);
-    }
+	/**
+	 * 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);
+	}
 
 }
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/MetaABMActItemProviderAdapterFactory.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/MetaABMActItemProviderAdapterFactory.java
index c4224de..33e8740 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/MetaABMActItemProviderAdapterFactory.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/src/org/metaabm/act/provider/MetaABMActItemProviderAdapterFactory.java
@@ -39,906 +39,905 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.metaabm.act.util.MetaABMActAdapterFactory;
 
-/*
- * This is the factory that is used to provide the interfaces needed to support
- * Viewers. The adapters generated by this factory convert EMF adapter
- * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The
- * adapters also support Eclipse property sheets. Note that most of the adapters
- * are shared among multiple instances. <!-- begin-user-doc --> <!--
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * @generated
  */
-public class MetaABMActItemProviderAdapterFactory extends MetaABMActAdapterFactory implements
-        ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-    /**
-     * This keeps track of the root adapter factory that delegates to this adapter factory.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected ComposedAdapterFactory parentAdapterFactory;
+public class MetaABMActItemProviderAdapterFactory extends MetaABMActAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
 
-    /**
-     * This is used to implement
-     * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected IChangeNotifier changeNotifier = new ChangeNotifier();
+	/**
+	 * This is used to implement
+	 * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
-    /**
-     * This keeps track of all the item providers created, so that they can be {@link #dispose disposed}.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected Disposable disposable = new Disposable();
+	/**
+	 * This keeps track of all the item providers created, so that they can be {@link #dispose disposed}.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Disposable disposable = new Disposable();
 
-    /**
-     * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected Collection<Object> supportedTypes = new ArrayList<Object>();
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
-    /**
-     * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    public MetaABMActItemProviderAdapterFactory() {
-        supportedTypes.add(IEditingDomainItemProvider.class);
-        supportedTypes.add(IStructuredItemContentProvider.class);
-        supportedTypes.add(ITreeItemContentProvider.class);
-        supportedTypes.add(IItemLabelProvider.class);
-        supportedTypes.add(IItemPropertySource.class);
-        supportedTypes.add(ITableItemLabelProvider.class);
-        supportedTypes.add(ITableItemColorProvider.class);
-        supportedTypes.add(IItemColorProvider.class);
-    }
+	/**
+	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
+	 * @generated
+	 */
+	public MetaABMActItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+		supportedTypes.add(ITableItemLabelProvider.class);
+		supportedTypes.add(ITableItemColorProvider.class);
+		supportedTypes.add(IItemColorProvider.class);
+	}
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AInput}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAInputAdapter() {
-        return new AInputItemProvider(this);
-    }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AInput}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAInputAdapter() {
+		return new AInputItemProvider(this);
+	}
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ALiteral}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createALiteralAdapter() {
-        return new ALiteralItemProvider(this);
-    }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ALiteral}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createALiteralAdapter() {
+		return new ALiteralItemProvider(this);
+	}
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AMultiValue}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAMultiValueAdapter() {
-        return new AMultiValueItemProvider(this);
-    }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AMultiValue}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAMultiValueAdapter() {
+		return new AMultiValueItemProvider(this);
+	}
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AGroup}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAGroupAdapter() {
-        return new AGroupItemProvider(this);
-    }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AGroup}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAGroupAdapter() {
+		return new AGroupItemProvider(this);
+	}
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ASchedule}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAScheduleAdapter() {
-        return new AScheduleItemProvider(this);
-    }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ASchedule}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAScheduleAdapter() {
+		return new AScheduleItemProvider(this);
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ARule} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected ARuleItemProvider aRuleItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ARule} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected ARuleItemProvider aRuleItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ARule}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createARuleAdapter() {
-        if (aRuleItemProvider == null) {
-            aRuleItemProvider = new ARuleItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ARule}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createARuleAdapter() {
+		if (aRuleItemProvider == null) {
+			aRuleItemProvider = new ARuleItemProvider(this);
+		}
 
-        return aRuleItemProvider;
-    }
+		return aRuleItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuild} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected ABuildItemProvider aBuildItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuild} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected ABuildItemProvider aBuildItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ABuild}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createABuildAdapter() {
-        if (aBuildItemProvider == null) {
-            aBuildItemProvider = new ABuildItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ABuild}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createABuildAdapter() {
+		if (aBuildItemProvider == null) {
+			aBuildItemProvider = new ABuildItemProvider(this);
+		}
 
-        return aBuildItemProvider;
-    }
+		return aBuildItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AInitialize} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected AInitializeItemProvider aInitializeItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AInitialize} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AInitializeItemProvider aInitializeItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AInitialize}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAInitializeAdapter() {
-        if (aInitializeItemProvider == null) {
-            aInitializeItemProvider = new AInitializeItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AInitialize}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAInitializeAdapter() {
+		if (aInitializeItemProvider == null) {
+			aInitializeItemProvider = new AInitializeItemProvider(this);
+		}
 
-        return aInitializeItemProvider;
-    }
+		return aInitializeItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AMethod} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AMethodItemProvider aMethodItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AMethod} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AMethodItemProvider aMethodItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AMethod}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAMethodAdapter() {
-        if (aMethodItemProvider == null) {
-            aMethodItemProvider = new AMethodItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AMethod}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAMethodAdapter() {
+		if (aMethodItemProvider == null) {
+			aMethodItemProvider = new AMethodItemProvider(this);
+		}
 
-        return aMethodItemProvider;
-    }
+		return aMethodItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AAny} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AAnyItemProvider aAnyItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AAny} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AAnyItemProvider aAnyItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AAny}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAAnyAdapter() {
-        if (aAnyItemProvider == null) {
-            aAnyItemProvider = new AAnyItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AAny}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAAnyAdapter() {
+		if (aAnyItemProvider == null) {
+			aAnyItemProvider = new AAnyItemProvider(this);
+		}
 
-        return aAnyItemProvider;
-    }
+		return aAnyItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AAll} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AAllItemProvider aAllItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AAll} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AAllItemProvider aAllItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AAll}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAAllAdapter() {
-        if (aAllItemProvider == null) {
-            aAllItemProvider = new AAllItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AAll}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAAllAdapter() {
+		if (aAllItemProvider == null) {
+			aAllItemProvider = new AAllItemProvider(this);
+		}
 
-        return aAllItemProvider;
-    }
+		return aAllItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ANone} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected ANoneItemProvider aNoneItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ANone} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected ANoneItemProvider aNoneItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ANone}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createANoneAdapter() {
-        if (aNoneItemProvider == null) {
-            aNoneItemProvider = new ANoneItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ANone}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createANoneAdapter() {
+		if (aNoneItemProvider == null) {
+			aNoneItemProvider = new ANoneItemProvider(this);
+		}
 
-        return aNoneItemProvider;
-    }
+		return aNoneItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AQuery} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AQueryItemProvider aQueryItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AQuery} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AQueryItemProvider aQueryItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AQuery}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAQueryAdapter() {
-        if (aQueryItemProvider == null) {
-            aQueryItemProvider = new AQueryItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AQuery}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAQueryAdapter() {
+		if (aQueryItemProvider == null) {
+			aQueryItemProvider = new AQueryItemProvider(this);
+		}
 
-        return aQueryItemProvider;
-    }
+		return aQueryItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AEvaluate} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AEvaluateItemProvider aEvaluateItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AEvaluate} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AEvaluateItemProvider aEvaluateItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AEvaluate}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAEvaluateAdapter() {
-        if (aEvaluateItemProvider == null) {
-            aEvaluateItemProvider = new AEvaluateItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AEvaluate}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAEvaluateAdapter() {
+		if (aEvaluateItemProvider == null) {
+			aEvaluateItemProvider = new AEvaluateItemProvider(this);
+		}
 
-        return aEvaluateItemProvider;
-    }
+		return aEvaluateItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AWatch} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AWatchItemProvider aWatchItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AWatch} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AWatchItemProvider aWatchItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AWatch}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAWatchAdapter() {
-        if (aWatchItemProvider == null) {
-            aWatchItemProvider = new AWatchItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AWatch}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAWatchAdapter() {
+		if (aWatchItemProvider == null) {
+			aWatchItemProvider = new AWatchItemProvider(this);
+		}
 
-        return aWatchItemProvider;
-    }
+		return aWatchItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ASet} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected ASetItemProvider aSetItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ASet} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected ASetItemProvider aSetItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ASet}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createASetAdapter() {
-        if (aSetItemProvider == null) {
-            aSetItemProvider = new ASetItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ASet}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createASetAdapter() {
+		if (aSetItemProvider == null) {
+			aSetItemProvider = new ASetItemProvider(this);
+		}
 
-        return aSetItemProvider;
-    }
+		return aSetItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ACreateAgents} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ACreateAgentsItemProvider aCreateAgentsItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ACreateAgents} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ACreateAgentsItemProvider aCreateAgentsItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ACreateAgents}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createACreateAgentsAdapter() {
-        if (aCreateAgentsItemProvider == null) {
-            aCreateAgentsItemProvider = new ACreateAgentsItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ACreateAgents}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createACreateAgentsAdapter() {
+		if (aCreateAgentsItemProvider == null) {
+			aCreateAgentsItemProvider = new ACreateAgentsItemProvider(this);
+		}
 
-        return aCreateAgentsItemProvider;
-    }
+		return aCreateAgentsItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuildNetwork} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ABuildNetworkItemProvider aBuildNetworkItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuildNetwork} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ABuildNetworkItemProvider aBuildNetworkItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ABuildNetwork}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createABuildNetworkAdapter() {
-        if (aBuildNetworkItemProvider == null) {
-            aBuildNetworkItemProvider = new ABuildNetworkItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ABuildNetwork}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createABuildNetworkAdapter() {
+		if (aBuildNetworkItemProvider == null) {
+			aBuildNetworkItemProvider = new ABuildNetworkItemProvider(this);
+		}
 
-        return aBuildNetworkItemProvider;
-    }
+		return aBuildNetworkItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuildSpace} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ABuildSpaceItemProvider aBuildSpaceItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuildSpace} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ABuildSpaceItemProvider aBuildSpaceItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ABuildSpace}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createABuildSpaceAdapter() {
-        if (aBuildSpaceItemProvider == null) {
-            aBuildSpaceItemProvider = new ABuildSpaceItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ABuildSpace}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createABuildSpaceAdapter() {
+		if (aBuildSpaceItemProvider == null) {
+			aBuildSpaceItemProvider = new ABuildSpaceItemProvider(this);
+		}
 
-        return aBuildSpaceItemProvider;
-    }
+		return aBuildSpaceItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuildGeography} instances.
-     * <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     * @generated
-     */
-    protected ABuildGeographyItemProvider aBuildGeographyItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuildGeography} instances.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ABuildGeographyItemProvider aBuildGeographyItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ABuildGeography}.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Adapter createABuildGeographyAdapter() {
-        if (aBuildGeographyItemProvider == null) {
-            aBuildGeographyItemProvider = new ABuildGeographyItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ABuildGeography}.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createABuildGeographyAdapter() {
+		if (aBuildGeographyItemProvider == null) {
+			aBuildGeographyItemProvider = new ABuildGeographyItemProvider(this);
+		}
 
-        return aBuildGeographyItemProvider;
-    }
+		return aBuildGeographyItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuildGrid} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ABuildGridItemProvider aBuildGridItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ABuildGrid} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ABuildGridItemProvider aBuildGridItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ABuildGrid}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createABuildGridAdapter() {
-        if (aBuildGridItemProvider == null) {
-            aBuildGridItemProvider = new ABuildGridItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ABuildGrid}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createABuildGridAdapter() {
+		if (aBuildGridItemProvider == null) {
+			aBuildGridItemProvider = new ABuildGridItemProvider(this);
+		}
 
-        return aBuildGridItemProvider;
-    }
+		return aBuildGridItemProvider;
+	}
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ASelect}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createASelectAdapter() {
-        return new ASelectItemProvider(this);
-    }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ASelect}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createASelectAdapter() {
+		return new ASelectItemProvider(this);
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AMove} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AMoveItemProvider aMoveItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AMove} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AMoveItemProvider aMoveItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AMove}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAMoveAdapter() {
-        if (aMoveItemProvider == null) {
-            aMoveItemProvider = new AMoveItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AMove}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAMoveAdapter() {
+		if (aMoveItemProvider == null) {
+			aMoveItemProvider = new AMoveItemProvider(this);
+		}
 
-        return aMoveItemProvider;
-    }
+		return aMoveItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ALeave} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected ALeaveItemProvider aLeaveItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ALeave} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected ALeaveItemProvider aLeaveItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ALeave}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createALeaveAdapter() {
-        if (aLeaveItemProvider == null) {
-            aLeaveItemProvider = new ALeaveItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ALeave}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createALeaveAdapter() {
+		if (aLeaveItemProvider == null) {
+			aLeaveItemProvider = new ALeaveItemProvider(this);
+		}
 
-        return aLeaveItemProvider;
-    }
+		return aLeaveItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ADie} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected ADieItemProvider aDieItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ADie} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected ADieItemProvider aDieItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ADie}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createADieAdapter() {
-        if (aDieItemProvider == null) {
-            aDieItemProvider = new ADieItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ADie}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createADieAdapter() {
+		if (aDieItemProvider == null) {
+			aDieItemProvider = new ADieItemProvider(this);
+		}
 
-        return aDieItemProvider;
-    }
+		return aDieItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AConnect} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AConnectItemProvider aConnectItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AConnect} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AConnectItemProvider aConnectItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AConnect}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAConnectAdapter() {
-        if (aConnectItemProvider == null) {
-            aConnectItemProvider = new AConnectItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AConnect}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAConnectAdapter() {
+		if (aConnectItemProvider == null) {
+			aConnectItemProvider = new AConnectItemProvider(this);
+		}
 
-        return aConnectItemProvider;
-    }
+		return aConnectItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ADisconnect} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ADisconnectItemProvider aDisconnectItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ADisconnect} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ADisconnectItemProvider aDisconnectItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ADisconnect}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createADisconnectAdapter() {
-        if (aDisconnectItemProvider == null) {
-            aDisconnectItemProvider = new ADisconnectItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ADisconnect}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createADisconnectAdapter() {
+		if (aDisconnectItemProvider == null) {
+			aDisconnectItemProvider = new ADisconnectItemProvider(this);
+		}
 
-        return aDisconnectItemProvider;
-    }
+		return aDisconnectItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.AReplace} instances.
-     * <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * @generated
-     */
-    protected AReplaceItemProvider aReplaceItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.AReplace} instances.
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * @generated
+	 */
+	protected AReplaceItemProvider aReplaceItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.AReplace}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createAReplaceAdapter() {
-        if (aReplaceItemProvider == null) {
-            aReplaceItemProvider = new AReplaceItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.AReplace}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Adapter createAReplaceAdapter() {
+		if (aReplaceItemProvider == null) {
+			aReplaceItemProvider = new AReplaceItemProvider(this);
+		}
 
-        return aReplaceItemProvider;
-    }
+		return aReplaceItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ACause} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ACauseItemProvider aCauseItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ACause} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ACauseItemProvider aCauseItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ACause}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Adapter createACauseAdapter() {
-        if (aCauseItemProvider == null) {
-            aCauseItemProvider = new ACauseItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ACause}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createACauseAdapter() {
+		if (aCauseItemProvider == null) {
+			aCauseItemProvider = new ACauseItemProvider(this);
+		}
 
-        return aCauseItemProvider;
-    }
+		return aCauseItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ADiffuse} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ADiffuseItemProvider aDiffuseItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.ADiffuse} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ADiffuseItemProvider aDiffuseItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.ADiffuse}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Adapter createADiffuseAdapter() {
-        if (aDiffuseItemProvider == null) {
-            aDiffuseItemProvider = new ADiffuseItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.ADiffuse}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createADiffuseAdapter() {
+		if (aDiffuseItemProvider == null) {
+			aDiffuseItemProvider = new ADiffuseItemProvider(this);
+		}
 
-        return aDiffuseItemProvider;
-    }
+		return aDiffuseItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.APerform} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected APerformItemProvider aPerformItemProvider;
+	/**
+	 * This keeps track of the one adapter used for all {@link org.metaabm.act.APerform} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected APerformItemProvider aPerformItemProvider;
 
-    /**
-     * This creates an adapter for a {@link org.metaabm.act.APerform}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Adapter createAPerformAdapter() {
-        if (aPerformItemProvider == null) {
-            aPerformItemProvider = new APerformItemProvider(this);
-        }
+	/**
+	 * This creates an adapter for a {@link org.metaabm.act.APerform}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAPerformAdapter() {
+		if (aPerformItemProvider == null) {
+			aPerformItemProvider = new APerformItemProvider(this);
+		}
 
-        return aPerformItemProvider;
-    }
+		return aPerformItemProvider;
+	}
 
-    /**
-     * This keeps track of the one adapter used for all {@link org.metaabm.act.ADerive} instances.
-     * <!-- begin-user-doc