Auto-completion works, other improvments.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AParItemProviderAdapterFactory.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AParItemProviderAdapterFactory.java
index 07895d0..9ae322b 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AParItemProviderAdapterFactory.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AParItemProviderAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AParItemProviderAdapterFactory.java,v 1.8 2010/04/02 03:12:06 mparker Exp $
+ * $Id: AParItemProviderAdapterFactory.java,v 1.9 2010/05/03 20:44:06 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
@@ -97,29 +97,6 @@
}
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.amp.amf.parameters.aPar.AgentParameters} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected AgentParametersItemProvider agentParametersItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.amp.amf.parameters.aPar.AgentParameters}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createAgentParametersAdapter() {
- if (agentParametersItemProvider == null) {
- agentParametersItemProvider = new AgentParametersItemProvider(this);
- }
-
- return agentParametersItemProvider;
- }
-
- /**
* This keeps track of the one adapter used for all {@link org.eclipse.amp.amf.parameters.aPar.Import} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -288,7 +265,6 @@
*/
public void dispose() {
if (modelItemProvider != null) modelItemProvider.dispose();
- if (agentParametersItemProvider != null) agentParametersItemProvider.dispose();
if (importItemProvider != null) importItemProvider.dispose();
if (incorporatesItemProvider != null) incorporatesItemProvider.dispose();
if (parameterItemProvider != null) parameterItemProvider.dispose();
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AgentParametersItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AgentParametersItemProvider.java
deleted file mode 100644
index a795642..0000000
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/AgentParametersItemProvider.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AgentParametersItemProvider.java,v 1.1 2010/04/02 03:12:05 mparker Exp $
- */
-package org.eclipse.amp.amf.parameters.aPar.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.amp.amf.parameters.aPar.AParFactory;
-import org.eclipse.amp.amf.parameters.aPar.AParPackage;
-import org.eclipse.amp.amf.parameters.aPar.AgentParameters;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.amp.amf.parameters.aPar.AgentParameters} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AgentParametersItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AgentParametersItemProvider(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);
-
- addAgentPropertyDescriptor(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_AgentParameters_agent_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_AgentParameters_agent_feature", "_UI_AgentParameters_type"),
- AParPackage.Literals.AGENT_PARAMETERS__AGENT,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(AParPackage.Literals.AGENT_PARAMETERS__PARAMETERS);
- }
- 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.
-
- return super.getChildFeature(object, child);
- }
-
- /**
- * This returns AgentParameters.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/AgentParameters"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object) {
- return getString("_UI_AgentParameters_type");
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(AgentParameters.class)) {
- case AParPackage.AGENT_PARAMETERS__PARAMETERS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), 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);
-
- newChildDescriptors.add
- (createChildParameter
- (AParPackage.Literals.AGENT_PARAMETERS__PARAMETERS,
- AParFactory.eINSTANCE.createParameter()));
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return AParEditPlugin.INSTANCE;
- }
-
-}
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ModelItemProvider.java b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ModelItemProvider.java
index 370fc3e..139e4ec 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ModelItemProvider.java
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/src/org/eclipse/amp/amf/parameters/aPar/provider/ModelItemProvider.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ModelItemProvider.java,v 1.8 2010/04/02 03:12:05 mparker Exp $
+ * $Id: ModelItemProvider.java,v 1.9 2010/05/03 20:44:06 mparker Exp $
*/
package org.eclipse.amp.amf.parameters.aPar.provider;
@@ -94,7 +94,7 @@
super.getChildrenFeatures(object);
childrenFeatures.add(AParPackage.Literals.MODEL__MODEL);
childrenFeatures.add(AParPackage.Literals.MODEL__INCORPORATES);
- childrenFeatures.add(AParPackage.Literals.MODEL__AGENTS);
+ childrenFeatures.add(AParPackage.Literals.MODEL__PARAMETERS);
}
return childrenFeatures;
}
@@ -152,7 +152,7 @@
return;
case AParPackage.MODEL__MODEL:
case AParPackage.MODEL__INCORPORATES:
- case AParPackage.MODEL__AGENTS:
+ case AParPackage.MODEL__PARAMETERS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -181,8 +181,8 @@
newChildDescriptors.add
(createChildParameter
- (AParPackage.Literals.MODEL__AGENTS,
- AParFactory.eINSTANCE.createAgentParameters()));
+ (AParPackage.Literals.MODEL__PARAMETERS,
+ AParFactory.eINSTANCE.createParameter()));
}
/**