Intent metamodel refactoring: Step 2.2

- Update .edit plugin to obtain previous behavior
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.compiler/src/org/eclipse/mylyn/docs/intent/client/compiler/ModelingUnitCompiler.java b/plugins/org.eclipse.mylyn.docs.intent.client.compiler/src/org/eclipse/mylyn/docs/intent/client/compiler/ModelingUnitCompiler.java
index 7e1ba6b..44478a2 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.compiler/src/org/eclipse/mylyn/docs/intent/client/compiler/ModelingUnitCompiler.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.compiler/src/org/eclipse/mylyn/docs/intent/client/compiler/ModelingUnitCompiler.java
@@ -362,7 +362,7 @@
 				} else {
 					linkResolver.registerInPackageRegistry(instanciation, ePackage);
 				}
-			} else if (!(generatedElement instanceof EPackage)) {
+			} else {
 				validateGeneratedElement(generatedElement);
 			}
 		}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/Chapter.gif b/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/chapter.gif
similarity index 100%
copy from plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/Chapter.gif
copy to plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/chapter.gif
Binary files differ
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/descriptionBloc.gif b/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/descriptionBloc.gif
new file mode 100644
index 0000000..2a2b4b6
--- /dev/null
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/descriptionBloc.gif
Binary files differ
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/descriptionunit.gif b/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/descriptionunit.gif
new file mode 100644
index 0000000..484d828
--- /dev/null
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/descriptionunit.gif
Binary files differ
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/document.gif b/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/document.gif
new file mode 100644
index 0000000..f32c28d
--- /dev/null
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/icon/outline/document.gif
Binary files differ
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/outline/IntentOutlinePageItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/outline/IntentOutlinePageItemProvider.java
index 683b4ed..d3fd76f 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/outline/IntentOutlinePageItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/outline/IntentOutlinePageItemProvider.java
@@ -10,47 +10,21 @@
  *******************************************************************************/
 package org.eclipse.mylyn.docs.intent.client.ui.editor.outline;
 
-import java.util.Collection;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.ReflectiveItemProvider;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.DecorationOverlayIcon;
 import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.mylyn.docs.intent.client.ui.IntentEditorActivator;
 import org.eclipse.mylyn.docs.intent.core.compiler.CompilationMessageType;
 import org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatus;
 import org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatusSeverity;
-import org.eclipse.mylyn.docs.intent.core.document.IntentDocument;
-import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentPackage;
 import org.eclipse.mylyn.docs.intent.core.document.IntentGenericElement;
-import org.eclipse.mylyn.docs.intent.core.document.IntentReferenceInstruction;
-import org.eclipse.mylyn.docs.intent.core.document.IntentSection;
-import org.eclipse.mylyn.docs.intent.core.document.IntentStructuredElement;
-import org.eclipse.mylyn.docs.intent.core.document.LabelDeclaration;
-import org.eclipse.mylyn.docs.intent.core.document.LabelReferenceInstruction;
-import org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionBloc;
 import org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionUnit;
-import org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionUnitPackage;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ContributionInstruction;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ExternalContentReference;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.InstanciationInstruction;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.IntentReferenceInModelingUnit;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnit;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitInstructionReference;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.NativeValue;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ReferenceValue;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ResourceDeclaration;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.StructuralFeatureAffectation;
-import org.eclipse.mylyn.docs.intent.core.query.DescriptionUnitHelper;
 import org.eclipse.mylyn.docs.intent.core.query.IntentHelper;
-import org.eclipse.mylyn.docs.intent.core.query.StructuredElementHelper;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
@@ -62,34 +36,26 @@
  */
 public class IntentOutlinePageItemProvider extends ReflectiveItemProvider {
 
-	private static final int STRUCTURED_ELEMENT_TITLE_MAXLENGTH = 50;
-
 	/**
 	 * Indicates if this content provider will have to hide description units content.
 	 */
 	private boolean hideDescriptionUnitsContent;
 
+	private ComposedAdapterFactory adapterFactory;
+
 	/**
 	 * Constructor.
 	 * 
-	 * @param adapterFactory
-	 *            is the adapter factory
-	 */
-	public IntentOutlinePageItemProvider(IntentOutlinePageItemProviderAdapterFactory adapterFactory) {
-		this(adapterFactory, false);
-	}
-
-	/**
-	 * constructor.
-	 * 
-	 * @param adapterFactory
+	 * @param intentOutlinePageItemProviderAdapterFactory
 	 *            is the adapter factory
 	 * @param hideDescriptionUnitsContent
 	 *            indicates if this content provider will have to hide description units content
 	 */
-	public IntentOutlinePageItemProvider(IntentOutlinePageItemProviderAdapterFactory adapterFactory,
+	public IntentOutlinePageItemProvider(
+			IntentOutlinePageItemProviderAdapterFactory intentOutlinePageItemProviderAdapterFactory,
 			boolean hideDescriptionUnitsContent) {
-		super(adapterFactory);
+		super(intentOutlinePageItemProviderAdapterFactory);
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
 		this.hideDescriptionUnitsContent = hideDescriptionUnitsContent;
 	}
 
@@ -99,132 +65,39 @@
 	 * @see org.eclipse.emf.edit.provider.ReflectiveItemProvider#getImage(java.lang.Object)
 	 */
 	@Override
-	public Object getImage(Object object) {
-		String imagePath = null;
-		Image returnedImage = null;
-
-		if (object instanceof ExternalContentReference) {
-			EObject externalContent = ((ExternalContentReference)object).getExternalContent();
-			if (externalContent != null) {
-				IItemLabelProvider labeProvider = (IItemLabelProvider)new ComposedAdapterFactory(
-						ComposedAdapterFactory.Descriptor.Registry.INSTANCE).adapt(externalContent,
-						IItemLabelProvider.class);
-				if (labeProvider != null) {
-					return labeProvider.getImage(externalContent);
-				}
-			}
-		}
-
-		imagePath = getImageForStructureElement(object);
-
-		if (imagePath == null) {
-			imagePath = getImageForDescriptionUnitElement(object);
-		}
-
-		if (imagePath == null) {
-			imagePath = getImageForModelingUnitElement(object);
-		}
-
-		if (imagePath != null) {
-			returnedImage = IntentEditorActivator.getDefault().getImage("icon/outline/" + imagePath); //$NON-NLS-1$
-		} else {
-			returnedImage = IntentEditorActivator.getDefault().getImage("icon/outline/default.gif");
-		}
-
+	public Image getImage(Object object) {
 		// We decorate the image according to errors and warning
-		returnedImage = decorateImageAccordingToStatus(returnedImage, object);
-		return returnedImage;
+		final IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(object,
+				IItemLabelProvider.class);
+		Image returnedImage = null;
+		if (labelProvider != null) {
+			ImageDescriptor descriptor = ExtendedImageRegistry.getInstance().getImageDescriptor(
+					labelProvider.getImage(object));
+			if (descriptor == null) {
+				descriptor = ImageDescriptor.getMissingImageDescriptor();
+			}
+			returnedImage = ExtendedImageRegistry.getInstance().getImage(descriptor);
+		}
+		if (returnedImage != null) {
+			return decorateImageAccordingToStatus(returnedImage, object);
+		}
+		return null;
 	}
 
 	/**
-	 * Returns the image name for the given description unit element.
+	 * {@inheritDoc}
 	 * 
-	 * @param object
-	 *            a description unit element
-	 * @return the image name
+	 * @see org.eclipse.emf.edit.provider.ReflectiveItemProvider#getText(java.lang.Object)
 	 */
-	private String getImageForDescriptionUnitElement(Object object) {
-		String imagePath = null;
-		if (object instanceof DescriptionUnit) {
-			imagePath = "descriptionunit.gif"; //$NON-NLS-1$
-		}
+	@Override
+	public String getText(Object object) {
 
-		if (object instanceof DescriptionBloc) {
-			imagePath = "descriptionBloc.gif"; //$NON-NLS-1$
+		if (this.hideDescriptionUnitsContent && object instanceof DescriptionUnit) {
+			return "Paragraph";
 		}
-
-		if ((object instanceof LabelReferenceInstruction) || (object instanceof IntentReferenceInstruction)) {
-			imagePath = "labelorreference.gif"; //$NON-NLS-1$
-		}
-
-		if (object instanceof LabelDeclaration) {
-			imagePath = "labdef.gif"; //$NON-NLS-1$
-		}
-		return imagePath;
-	}
-
-	/**
-	 * Returns the image name for the given modeling unit element.
-	 * 
-	 * @param object
-	 *            a modeling unit element
-	 * @return the image name
-	 */
-	private String getImageForModelingUnitElement(Object object) {
-		String imagePath = null;
-		if (object instanceof ModelingUnit) {
-			imagePath = "modelingunit.png"; //$NON-NLS-1$
-		}
-
-		if (object instanceof StructuralFeatureAffectation) {
-			imagePath = "modelingunit_affect.png"; //$NON-NLS-1$
-		}
-
-		if (object instanceof InstanciationInstruction) {
-			imagePath = "modelingunit_new_element.png"; //$NON-NLS-1$
-		}
-
-		if (object instanceof ContributionInstruction) {
-			imagePath = "modelingunit_contribution.png"; //$NON-NLS-1$
-		}
-
-		if (object instanceof ReferenceValue) {
-			imagePath = "modelingunit_ref.png"; //$NON-NLS-1$
-		}
-
-		if (object instanceof NativeValue) {
-			imagePath = "modelingunit_value.gif"; //$NON-NLS-1$
-		}
-
-		if (object instanceof ResourceDeclaration) {
-			imagePath = "modelingunit_resource.gif"; //$NON-NLS-1$
-		}
-
-		if (object instanceof ModelingUnitInstructionReference) {
-			imagePath = "modelingunit_ref.png"; //$NON-NLS-1$
-		}
-		return imagePath;
-	}
-
-	/**
-	 * Returns the image name for the given structure element.
-	 * 
-	 * @param object
-	 *            a structure element
-	 * @return the image name
-	 */
-	private String getImageForStructureElement(Object object) {
-		String imagePath = null;
-		if (object instanceof IntentDocument) {
-			imagePath = "document.gif"; //$NON-NLS-1$
-		}
-		if (object instanceof IntentSection && ((IntentSection)object).eContainer() instanceof IntentDocument) {
-			imagePath = "chapter.gif"; //$NON-NLS-1$
-		}
-		if (object instanceof IntentSection) {
-			imagePath = "section.gif"; //$NON-NLS-1$
-		}
-		return imagePath;
+		IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(object,
+				IItemLabelProvider.class);
+		return labelProvider.getText(object);
 	}
 
 	/**
@@ -283,212 +156,4 @@
 		}
 		return decoratedImage;
 	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ReflectiveItemProvider#getText(java.lang.Object)
-	 */
-	@Override
-	public String getText(Object object) {
-		StringBuffer text = new StringBuffer();
-		if (object instanceof EObject) {
-			EObject eObject = (EObject)object;
-			EClass eClass = eObject.eClass();
-
-			if (eClass.getEPackage() == ModelingUnitPackage.eINSTANCE) {
-				getTextForModelingUnitElement(text, eObject, eClass);
-			}
-			if (eClass.getEPackage() == IntentDocumentPackage.eINSTANCE) {
-				getTextForStructureElement(object, text, eClass);
-			}
-
-			if (eClass.getEPackage() == DescriptionUnitPackage.eINSTANCE) {
-				getTextForDescriptionUnitElement(object, text, eClass);
-			}
-		}
-		return text.toString().trim();
-	}
-
-	/**
-	 * Sets the text for the given description unit element.
-	 * 
-	 * @param object
-	 *            the description unit element
-	 * @param text
-	 *            the string buffer to fill
-	 * @param eClass
-	 *            the element type
-	 */
-	private void getTextForDescriptionUnitElement(Object object, StringBuffer text, EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DescriptionUnitPackage.DESCRIPTION_UNIT:
-				// If we have to hide the content of the description unit, we return a sample text
-				if (this.hideDescriptionUnitsContent) {
-					text.append("Description zone");
-				} else {
-					text.append(DescriptionUnitHelper.getDescriptionUnitTitle((DescriptionUnit)object,
-							STRUCTURED_ELEMENT_TITLE_MAXLENGTH));
-				}
-				break;
-			case DescriptionUnitPackage.DESCRIPTION_BLOC:
-				text.append(DescriptionUnitHelper.getDescriptionBlocTitle((DescriptionBloc)object,
-						STRUCTURED_ELEMENT_TITLE_MAXLENGTH));
-				break;
-			default:
-				text.append(eClass.getName());
-				break;
-		}
-	}
-
-	/**
-	 * Sets the text for the given structure unit element.
-	 * 
-	 * @param object
-	 *            the structure unit element
-	 * @param text
-	 *            the string buffer to fill
-	 * @param eClass
-	 *            the element type
-	 */
-	private void getTextForStructureElement(Object object, StringBuffer text, EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case IntentDocumentPackage.INTENT_SECTION:
-
-				String title = StructuredElementHelper.getTitle((IntentStructuredElement)object,
-						STRUCTURED_ELEMENT_TITLE_MAXLENGTH);
-
-				if (title.length() > 0) {
-					text.append(title);
-				} else {
-					text.append("Untitled " + eClass.getName().replace("Intent", ""));
-				}
-				break;
-			case IntentDocumentPackage.LABEL_DECLARATION:
-				LabelDeclaration label = (LabelDeclaration)object;
-				text.append("new Label " + label.getLabelValue());
-				break;
-			case IntentDocumentPackage.LABEL_REFERENCE_INSTRUCTION:
-				LabelReferenceInstruction labelRef = (LabelReferenceInstruction)object;
-				text.append("reference to " + labelRef.getIntentHref());
-				break;
-			case IntentDocumentPackage.INTENT_REFERENCE_INSTRUCTION:
-				IntentReferenceInstruction ref = (IntentReferenceInstruction)object;
-				text.append("reference to " + ref.getIntentHref());
-				break;
-			default:
-				text.append(eClass.getName().replace("Intent", ""));
-				break;
-		}
-	}
-
-	/**
-	 * Sets the text for the given modeling unit element.
-	 * 
-	 * @param text
-	 *            the string buffer to fill
-	 * @param eObject
-	 *            the modeling unit element
-	 * @param eClass
-	 *            the element type
-	 */
-	private void getTextForModelingUnitElement(StringBuffer text, EObject eObject, EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ModelingUnitPackage.MODELING_UNIT:
-				String name = ((ModelingUnit)eObject).getName();
-				if (name != null && name.length() > 0) {
-					text.append(name);
-				} else {
-					text.append("Modeling Unit");
-				}
-				break;
-
-			case ModelingUnitPackage.MODELING_UNIT_INSTRUCTION_REFERENCE:
-				text.append(((ModelingUnitInstructionReference)eObject).getIntentHref());
-				break;
-			case ModelingUnitPackage.STRUCTURAL_FEATURE_AFFECTATION:
-				text.append(((StructuralFeatureAffectation)eObject).getName());
-				break;
-
-			case ModelingUnitPackage.NATIVE_VALUE:
-				String textValue = ((NativeValue)eObject).getValue();
-				if (textValue.startsWith("\"")) {
-					textValue = textValue.substring(1);
-				}
-
-				if (textValue.endsWith("\"")) {
-					textValue = textValue.substring(0, textValue.length() - 1);
-				}
-				text.append(textValue);
-				break;
-			case ModelingUnitPackage.REFERENCE_VALUE:
-				text.append(((ReferenceValue)eObject).getInstanciationReference().getInstanceName()
-						+ " (Reference to)");
-				break;
-
-			case ModelingUnitPackage.INSTANCIATION_INSTRUCTION:
-				InstanciationInstruction instruction = (InstanciationInstruction)eObject;
-				String instanceName = instruction.getName();
-				if (instanceName != null && instanceName.length() > 0) {
-					text.append(instanceName + " : " + instruction.getMetaType().getTypeName());
-				} else {
-					text.append("? : " + instruction.getMetaType().getTypeName());
-				}
-
-				break;
-
-			case ModelingUnitPackage.CONTRIBUTION_INSTRUCTION:
-				text.append(((ContributionInstruction)eObject).getContributionReference().getIntentHref());
-				break;
-
-			case ModelingUnitPackage.EXTERNAL_CONTENT_REFERENCE:
-				text.append(((ExternalContentReference)eObject).getUri());
-				break;
-
-			case ModelingUnitPackage.RESOURCE_DECLARATION:
-				String resourceName = ((ResourceDeclaration)eObject).getName();
-				if (resourceName != null && resourceName.length() > 0) {
-					text.append(resourceName);
-				} else {
-					text.append("Untitled");
-				}
-				break;
-
-			case ModelingUnitPackage.INTENT_REFERENCE_IN_MODELING_UNIT:
-				IntentReferenceInModelingUnit reference = (IntentReferenceInModelingUnit)eObject;
-				text.append("Reference to Section " + reference.getIntentHref());
-				if (reference.getReferencedElement() != null) {
-					text.append(getText(reference.getReferencedElement()));
-				}
-				break;
-			default:
-				text.append(eClass.getName());
-				break;
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public Collection<?> getChildren(Object object) {
-		Collection<IntentGenericElement> childrens = new LinkedHashSet<IntentGenericElement>();
-
-		// An object has children only if it's a Genericelement
-		if (object instanceof IntentGenericElement) {
-
-			// A children is a IntentGenericElement
-			for (EObject potentialChildren : ((EObject)object).eContents()) {
-				if (potentialChildren instanceof IntentGenericElement) {
-					childrens.add((IntentGenericElement)potentialChildren);
-					childrens
-							.addAll((Collection<? extends IntentGenericElement>)getChildren(potentialChildren));
-				}
-			}
-		}
-		return childrens;
-	}
 }
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/outline/IntentOutlinePageLabelProvider.java b/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/outline/IntentOutlinePageLabelProvider.java
index 8c979b3..deceae7 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/outline/IntentOutlinePageLabelProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/outline/IntentOutlinePageLabelProvider.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.swt.graphics.Image;
 
 /**
  * The label provider for the objects shown in the outline view.
@@ -30,14 +29,4 @@
 	public IntentOutlinePageLabelProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider#getImage(java.lang.Object)
-	 */
-	@Override
-	public Image getImage(Object object) {
-		return super.getImage(object);
-	}
 }
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.mylyn.docs.intent.core.edit/META-INF/MANIFEST.MF
index 2e59f6d..6c3bdd3 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/META-INF/MANIFEST.MF
@@ -8,11 +8,9 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.docs.intent.core.compiler.provider,
- org.eclipse.mylyn.docs.intent.core.document.descriptionunit.provider,
+Export-Package: org.eclipse.mylyn.docs.intent.core.document.descriptionunit.provider,
  org.eclipse.mylyn.docs.intent.core.document.provider,
  org.eclipse.mylyn.docs.intent.core.edit,
- org.eclipse.mylyn.docs.intent.core.indexer.provider,
  org.eclipse.mylyn.docs.intent.core.modelingunit.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.docs.intent.core;visibility:=reexport,
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/Chapter.gif b/plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/IntentChapter.gif
similarity index 100%
rename from plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/Chapter.gif
rename to plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/IntentChapter.gif
Binary files differ
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/LabelDefinition.gif b/plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/LabelDeclaration.gif
similarity index 100%
rename from plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/LabelDefinition.gif
rename to plugins/org.eclipse.mylyn.docs.intent.core.edit/icons/full/obj16/LabelDeclaration.gif
Binary files differ
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/plugin.xml b/plugins/org.eclipse.mylyn.docs.intent.core.edit/plugin.xml
index 384c5ba..04a3567 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/plugin.xml
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/plugin.xml
@@ -14,19 +14,7 @@
 
 <plugin>
 
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <factory
-            uri="http://www.eclipse.org/intent/compilerinfos/0.8"
-            class="org.eclipse.mylyn.docs.intent.core.compiler.provider.CompilerItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <factory
             uri="http://www.eclipse.org/intent/intentdocument/0.8"
             class="org.eclipse.mylyn.docs.intent.core.document.provider.IntentDocumentItemProviderAdapterFactory"
@@ -52,18 +40,6 @@
 
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <factory
-            uri="http://www.eclipse.org/intent/indexer/0.8"
-            class="org.eclipse.mylyn.docs.intent.core.indexer.provider.IntentIndexerItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <factory
             uri="http://www.eclipse.org/intent/modelingunit/0.8"
             class="org.eclipse.mylyn.docs.intent.core.modelingunit.provider.ModelingUnitItemProviderAdapterFactory"
             supportedTypes=
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/AttributeChangeStatusItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/AttributeChangeStatusItemProvider.java
deleted file mode 100644
index 04c79ee..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/AttributeChangeStatusItemProvider.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.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.mylyn.docs.intent.core.compiler.AttributeChangeStatus;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.AttributeChangeStatus} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AttributeChangeStatusItemProvider extends StructuralFeatureChangeStatusItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AttributeChangeStatusItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns AttributeChangeStatus.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeChangeStatus"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AttributeChangeStatus)object).getFeatureName();
-		return label == null || label.length() == 0 ? getString("_UI_AttributeChangeStatus_type")
-				: getString("_UI_AttributeChangeStatus_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 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/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationInformationHolderItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationInformationHolderItemProvider.java
deleted file mode 100644
index 74b9958..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationInformationHolderItemProvider.java
+++ /dev/null
@@ -1,561 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.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;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilationInformationHolder;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentFactory;
-
-import org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionUnitFactory;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-import org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexerFactory;
-
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitFactory;
-import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
-
-import org.eclipse.mylyn.docs.intent.markup.markup.MarkupFactory;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationInformationHolder} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompilationInformationHolderItemProvider 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 CompilationInformationHolderItemProvider(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);
-
-			addCurrentGeneratedElementListPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Current Generated Element List feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCurrentGeneratedElementListPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CompilationInformationHolder_currentGeneratedElementList_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_CompilationInformationHolder_currentGeneratedElementList_feature",
-						"_UI_CompilationInformationHolder_type"),
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__CURRENT_GENERATED_ELEMENT_LIST,
-				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(CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST);
-			childrenFeatures
-					.add(CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__ELEMENT_TO_UNRESOLVED_REFERENCE_MAP);
-			childrenFeatures
-					.add(CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__TYPE_TO_NAME_TO_ELEMENTS_MAP);
-			childrenFeatures
-					.add(CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__CREATED_ELEMENTS_TO_INSTRUCTIONS);
-			childrenFeatures
-					.add(CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__RESOURCE_TO_CONTAINED_ELEMENTS);
-			childrenFeatures
-					.add(CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__UNRESOLVED_CONTRIBUTIONS);
-		}
-		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 CompilationInformationHolder.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompilationInformationHolder"));
-	}
-
-	/**
-	 * 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_CompilationInformationHolder_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(CompilationInformationHolder.class)) {
-			case CompilerPackage.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST:
-			case CompilerPackage.COMPILATION_INFORMATION_HOLDER__ELEMENT_TO_UNRESOLVED_REFERENCE_MAP:
-			case CompilerPackage.COMPILATION_INFORMATION_HOLDER__TYPE_TO_NAME_TO_ELEMENTS_MAP:
-			case CompilerPackage.COMPILATION_INFORMATION_HOLDER__CREATED_ELEMENTS_TO_INSTRUCTIONS:
-			case CompilerPackage.COMPILATION_INFORMATION_HOLDER__RESOURCE_TO_CONTAINED_ELEMENTS:
-			case CompilerPackage.COMPILATION_INFORMATION_HOLDER__UNRESOLVED_CONTRIBUTIONS:
-				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(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.create(CompilerPackage.Literals.ESTRING_TO_EOBJECT)));
-
-		newChildDescriptors
-				.add(createChildParameter(
-						CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-						CompilerFactory.eINSTANCE
-								.create(CompilerPackage.Literals.TEXTUAL_REFERENCE_TO_CONTRIBUTIONS)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createStringToEObjectMap()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.create(CompilerPackage.Literals.ETYPE_TO_STRING_TO_EOBJECT_MAP)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE
-						.create(CompilerPackage.Literals.EOBJECT_TO_UNRESOLVED_REFERENCES_LIST)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE
-						.create(CompilerPackage.Literals.RESOURCE_TO_CONTAINED_ELEMENTS_MAP_ENTRY)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.create(CompilerPackage.Literals.MODELING_UNIT_TO_STATUS_LIST)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE
-						.create(CompilerPackage.Literals.CREATED_ELEMENT_TO_INSTRUCTION_MAP_ENTRY)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createUnresolvedReferenceHolder()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createCompilationStatus()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createCompilationStatusManager()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createCompilationInformationHolder()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createUnresolvedContributionHolder()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createTraceabilityIndex()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createTraceabilityIndexEntry()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE
-						.create(CompilerPackage.Literals.COMPILED_ELEMENT_TO_INSTRUCTION_ENTRY)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createInstructionTraceabilityEntry()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.create(CompilerPackage.Literals.FEATURE_TO_AFFECTATION_ENTRY)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createResourceChangeStatus()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createModelElementChangeStatus()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createReferenceChangeStatus()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				CompilerFactory.eINSTANCE.createAttributeChangeStatus()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				IntentDocumentFactory.eINSTANCE.createIntentGenericElement()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				IntentDocumentFactory.eINSTANCE.createIntentSection()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				IntentDocumentFactory.eINSTANCE.createIntentDocument()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				IntentDocumentFactory.eINSTANCE.createIntentReferenceInstruction()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				IntentDocumentFactory.eINSTANCE.createLabelDeclaration()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				IntentDocumentFactory.eINSTANCE.createLabelReferenceInstruction()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				DescriptionUnitFactory.eINSTANCE.createDescriptionUnit()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				DescriptionUnitFactory.eINSTANCE.createDescriptionBloc()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				IntentIndexerFactory.eINSTANCE.createIntentIndex()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				IntentIndexerFactory.eINSTANCE.createIntentIndexEntry()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createModelingUnit()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createResourceDeclaration()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createTypeReference()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createInstanciationInstruction()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createStructuralFeatureAffectation()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createNativeValue()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createNewObjectValue()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createReferenceValue()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createInstanciationInstructionReference()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createContributionInstruction()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createExternalContentReference()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createModelingUnitInstructionReference()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createIntentReferenceInModelingUnit()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createAnnotationDeclaration()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.createLabelInModelingUnit()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				ModelingUnitFactory.eINSTANCE.create(ModelingUnitPackage.Literals.KEY_VAL_FOR_ANNOTATION)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createDocument()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createSimpleContainer()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createSection()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createImage()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createText()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createEntity()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createLink()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createBlock()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createAnnotations()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createParagraph()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createTip()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createWarning()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createInformation()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createNote()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createPanel()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createDiv()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createFootNote()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createQuote()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createPreformatted()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createCode()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createList()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createListItem()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createTable()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createTableRow()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST,
-				MarkupFactory.eINSTANCE.createTableCell()));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__ELEMENT_TO_UNRESOLVED_REFERENCE_MAP,
-				CompilerFactory.eINSTANCE
-						.create(CompilerPackage.Literals.EOBJECT_TO_UNRESOLVED_REFERENCES_LIST)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__TYPE_TO_NAME_TO_ELEMENTS_MAP,
-				CompilerFactory.eINSTANCE.create(CompilerPackage.Literals.ETYPE_TO_STRING_TO_EOBJECT_MAP)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__CREATED_ELEMENTS_TO_INSTRUCTIONS,
-				CompilerFactory.eINSTANCE
-						.create(CompilerPackage.Literals.CREATED_ELEMENT_TO_INSTRUCTION_MAP_ENTRY)));
-
-		newChildDescriptors.add(createChildParameter(
-				CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__RESOURCE_TO_CONTAINED_ELEMENTS,
-				CompilerFactory.eINSTANCE
-						.create(CompilerPackage.Literals.RESOURCE_TO_CONTAINED_ELEMENTS_MAP_ENTRY)));
-
-		newChildDescriptors
-				.add(createChildParameter(
-						CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__UNRESOLVED_CONTRIBUTIONS,
-						CompilerFactory.eINSTANCE
-								.create(CompilerPackage.Literals.TEXTUAL_REFERENCE_TO_CONTRIBUTIONS)));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__GENERATED_ELEMENT_LIST
-				|| childFeature == CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__UNRESOLVED_CONTRIBUTIONS
-				|| childFeature == CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__TYPE_TO_NAME_TO_ELEMENTS_MAP
-				|| childFeature == CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__ELEMENT_TO_UNRESOLVED_REFERENCE_MAP
-				|| childFeature == CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__RESOURCE_TO_CONTAINED_ELEMENTS
-				|| childFeature == CompilerPackage.Literals.COMPILATION_INFORMATION_HOLDER__CREATED_ELEMENTS_TO_INSTRUCTIONS;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] {getTypeText(childObject),
-					getFeatureText(childFeature), getTypeText(owner)
-			});
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationStatusItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationStatusItemProvider.java
deleted file mode 100644
index 4cc8db4..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationStatusItemProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatus;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatus} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompilationStatusItemProvider 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 CompilationStatusItemProvider(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);
-
-			addMessagePropertyDescriptor(object);
-			addSeverityPropertyDescriptor(object);
-			addTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Message feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMessagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CompilationStatus_message_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_CompilationStatus_message_feature",
-						"_UI_CompilationStatus_type"), CompilerPackage.Literals.COMPILATION_STATUS__MESSAGE,
-				true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Severity feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSeverityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CompilationStatus_severity_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_CompilationStatus_severity_feature",
-						"_UI_CompilationStatus_type"), CompilerPackage.Literals.COMPILATION_STATUS__SEVERITY,
-				true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CompilationStatus_type_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_CompilationStatus_type_feature",
-						"_UI_CompilationStatus_type"), CompilerPackage.Literals.COMPILATION_STATUS__TYPE,
-				true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns CompilationStatus.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompilationStatus"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CompilationStatus)object).getMessage();
-		return label == null || label.length() == 0 ? getString("_UI_CompilationStatus_type")
-				: getString("_UI_CompilationStatus_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);
-
-		switch (notification.getFeatureID(CompilationStatus.class)) {
-			case CompilerPackage.COMPILATION_STATUS__MESSAGE:
-			case CompilerPackage.COMPILATION_STATUS__SEVERITY:
-			case CompilerPackage.COMPILATION_STATUS__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);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationStatusManagerItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationStatusManagerItemProvider.java
deleted file mode 100644
index 9dfd71a..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilationStatusManagerItemProvider.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.math.BigInteger;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatusManager;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatusManager} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompilationStatusManagerItemProvider 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 CompilationStatusManagerItemProvider(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);
-
-			addCompilationStatusListPropertyDescriptor(object);
-			addValidationTimePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Compilation Status List feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCompilationStatusListPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CompilationStatusManager_compilationStatusList_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_CompilationStatusManager_compilationStatusList_feature",
-						"_UI_CompilationStatusManager_type"),
-				CompilerPackage.Literals.COMPILATION_STATUS_MANAGER__COMPILATION_STATUS_LIST, true, false,
-				true, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Validation Time feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValidationTimePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CompilationStatusManager_validationTime_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_CompilationStatusManager_validationTime_feature",
-						"_UI_CompilationStatusManager_type"),
-				CompilerPackage.Literals.COMPILATION_STATUS_MANAGER__VALIDATION_TIME, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures
-					.add(CompilerPackage.Literals.COMPILATION_STATUS_MANAGER__MODELING_UNIT_TO_STATUS_LIST);
-		}
-		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 CompilationStatusManager.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompilationStatusManager"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		BigInteger labelValue = ((CompilationStatusManager)object).getValidationTime();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ? getString("_UI_CompilationStatusManager_type")
-				: getString("_UI_CompilationStatusManager_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);
-
-		switch (notification.getFeatureID(CompilationStatusManager.class)) {
-			case CompilerPackage.COMPILATION_STATUS_MANAGER__VALIDATION_TIME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
-						true));
-				return;
-			case CompilerPackage.COMPILATION_STATUS_MANAGER__MODELING_UNIT_TO_STATUS_LIST:
-				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(
-				CompilerPackage.Literals.COMPILATION_STATUS_MANAGER__MODELING_UNIT_TO_STATUS_LIST,
-				CompilerFactory.eINSTANCE.create(CompilerPackage.Literals.MODELING_UNIT_TO_STATUS_LIST)));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompiledElementToInstructionEntryItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompiledElementToInstructionEntryItemProvider.java
deleted file mode 100644
index e240435..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompiledElementToInstructionEntryItemProvider.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-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;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompiledElementToInstructionEntryItemProvider 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 CompiledElementToInstructionEntryItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CompiledElementToInstructionEntry_key_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_CompiledElementToInstructionEntry_key_feature",
-						"_UI_CompiledElementToInstructionEntry_type"),
-				CompilerPackage.Literals.COMPILED_ELEMENT_TO_INSTRUCTION_ENTRY__KEY, 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(CompilerPackage.Literals.COMPILED_ELEMENT_TO_INSTRUCTION_ENTRY__VALUE);
-		}
-		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 CompiledElementToInstructionEntry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object,
-				getResourceLocator().getImage("full/obj16/CompiledElementToInstructionEntry"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> compiledElementToInstructionEntry = (Map.Entry<?, ?>)object;
-		return "" + compiledElementToInstructionEntry.getKey() + " -> "
-				+ compiledElementToInstructionEntry.getValue();
-	}
-
-	/**
-	 * 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(Map.Entry.class)) {
-			case CompilerPackage.COMPILED_ELEMENT_TO_INSTRUCTION_ENTRY__VALUE:
-				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(
-				CompilerPackage.Literals.COMPILED_ELEMENT_TO_INSTRUCTION_ENTRY__VALUE,
-				CompilerFactory.eINSTANCE.createInstructionTraceabilityEntry()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilerItemProviderAdapterFactory.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilerItemProviderAdapterFactory.java
deleted file mode 100644
index 85ee02e..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CompilerItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.util.CompilerAdapterFactory;
-
-/**
- * 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 CompilerItemProviderAdapterFactory extends CompilerAdapterFactory 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 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 CompilerItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EStringToEObjectItemProvider eStringToEObjectItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createEStringToEObjectAdapter() {
-		if (eStringToEObjectItemProvider == null) {
-			eStringToEObjectItemProvider = new EStringToEObjectItemProvider(this);
-		}
-
-		return eStringToEObjectItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TextualReferenceToContributionsItemProvider textualReferenceToContributionsItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createTextualReferenceToContributionsAdapter() {
-		if (textualReferenceToContributionsItemProvider == null) {
-			textualReferenceToContributionsItemProvider = new TextualReferenceToContributionsItemProvider(
-					this);
-		}
-
-		return textualReferenceToContributionsItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.StringToEObjectMap} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StringToEObjectMapItemProvider stringToEObjectMapItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.StringToEObjectMap}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createStringToEObjectMapAdapter() {
-		if (stringToEObjectMapItemProvider == null) {
-			stringToEObjectMapItemProvider = new StringToEObjectMapItemProvider(this);
-		}
-
-		return stringToEObjectMapItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ETypeToStringToEObjectMapItemProvider eTypeToStringToEObjectMapItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createETypeToStringToEObjectMapAdapter() {
-		if (eTypeToStringToEObjectMapItemProvider == null) {
-			eTypeToStringToEObjectMapItemProvider = new ETypeToStringToEObjectMapItemProvider(this);
-		}
-
-		return eTypeToStringToEObjectMapItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EObjectToUnresolvedReferencesListItemProvider eObjectToUnresolvedReferencesListItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createEObjectToUnresolvedReferencesListAdapter() {
-		if (eObjectToUnresolvedReferencesListItemProvider == null) {
-			eObjectToUnresolvedReferencesListItemProvider = new EObjectToUnresolvedReferencesListItemProvider(
-					this);
-		}
-
-		return eObjectToUnresolvedReferencesListItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResourceToContainedElementsMapEntryItemProvider resourceToContainedElementsMapEntryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createResourceToContainedElementsMapEntryAdapter() {
-		if (resourceToContainedElementsMapEntryItemProvider == null) {
-			resourceToContainedElementsMapEntryItemProvider = new ResourceToContainedElementsMapEntryItemProvider(
-					this);
-		}
-
-		return resourceToContainedElementsMapEntryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelingUnitToStatusListItemProvider modelingUnitToStatusListItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createModelingUnitToStatusListAdapter() {
-		if (modelingUnitToStatusListItemProvider == null) {
-			modelingUnitToStatusListItemProvider = new ModelingUnitToStatusListItemProvider(this);
-		}
-
-		return modelingUnitToStatusListItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CreatedElementToInstructionMapEntryItemProvider createdElementToInstructionMapEntryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCreatedElementToInstructionMapEntryAdapter() {
-		if (createdElementToInstructionMapEntryItemProvider == null) {
-			createdElementToInstructionMapEntryItemProvider = new CreatedElementToInstructionMapEntryItemProvider(
-					this);
-		}
-
-		return createdElementToInstructionMapEntryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.UnresolvedReferenceHolder} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UnresolvedReferenceHolderItemProvider unresolvedReferenceHolderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.UnresolvedReferenceHolder}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createUnresolvedReferenceHolderAdapter() {
-		if (unresolvedReferenceHolderItemProvider == null) {
-			unresolvedReferenceHolderItemProvider = new UnresolvedReferenceHolderItemProvider(this);
-		}
-
-		return unresolvedReferenceHolderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatus} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompilationStatusItemProvider compilationStatusItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatus}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompilationStatusAdapter() {
-		if (compilationStatusItemProvider == null) {
-			compilationStatusItemProvider = new CompilationStatusItemProvider(this);
-		}
-
-		return compilationStatusItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatusManager} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompilationStatusManagerItemProvider compilationStatusManagerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationStatusManager}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompilationStatusManagerAdapter() {
-		if (compilationStatusManagerItemProvider == null) {
-			compilationStatusManagerItemProvider = new CompilationStatusManagerItemProvider(this);
-		}
-
-		return compilationStatusManagerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationInformationHolder} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompilationInformationHolderItemProvider compilationInformationHolderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.CompilationInformationHolder}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompilationInformationHolderAdapter() {
-		if (compilationInformationHolderItemProvider == null) {
-			compilationInformationHolderItemProvider = new CompilationInformationHolderItemProvider(this);
-		}
-
-		return compilationInformationHolderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.UnresolvedContributionHolder} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UnresolvedContributionHolderItemProvider unresolvedContributionHolderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.UnresolvedContributionHolder}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createUnresolvedContributionHolderAdapter() {
-		if (unresolvedContributionHolderItemProvider == null) {
-			unresolvedContributionHolderItemProvider = new UnresolvedContributionHolderItemProvider(this);
-		}
-
-		return unresolvedContributionHolderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.TraceabilityIndex} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TraceabilityIndexItemProvider traceabilityIndexItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.TraceabilityIndex}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createTraceabilityIndexAdapter() {
-		if (traceabilityIndexItemProvider == null) {
-			traceabilityIndexItemProvider = new TraceabilityIndexItemProvider(this);
-		}
-
-		return traceabilityIndexItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.TraceabilityIndexEntry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TraceabilityIndexEntryItemProvider traceabilityIndexEntryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.TraceabilityIndexEntry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createTraceabilityIndexEntryAdapter() {
-		if (traceabilityIndexEntryItemProvider == null) {
-			traceabilityIndexEntryItemProvider = new TraceabilityIndexEntryItemProvider(this);
-		}
-
-		return traceabilityIndexEntryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompiledElementToInstructionEntryItemProvider compiledElementToInstructionEntryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompiledElementToInstructionEntryAdapter() {
-		if (compiledElementToInstructionEntryItemProvider == null) {
-			compiledElementToInstructionEntryItemProvider = new CompiledElementToInstructionEntryItemProvider(
-					this);
-		}
-
-		return compiledElementToInstructionEntryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.InstructionTraceabilityEntry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InstructionTraceabilityEntryItemProvider instructionTraceabilityEntryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.InstructionTraceabilityEntry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createInstructionTraceabilityEntryAdapter() {
-		if (instructionTraceabilityEntryItemProvider == null) {
-			instructionTraceabilityEntryItemProvider = new InstructionTraceabilityEntryItemProvider(this);
-		}
-
-		return instructionTraceabilityEntryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureToAffectationEntryItemProvider featureToAffectationEntryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link java.util.Map.Entry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFeatureToAffectationEntryAdapter() {
-		if (featureToAffectationEntryItemProvider == null) {
-			featureToAffectationEntryItemProvider = new FeatureToAffectationEntryItemProvider(this);
-		}
-
-		return featureToAffectationEntryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.ResourceChangeStatus} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ResourceChangeStatusItemProvider resourceChangeStatusItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.ResourceChangeStatus}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createResourceChangeStatusAdapter() {
-		if (resourceChangeStatusItemProvider == null) {
-			resourceChangeStatusItemProvider = new ResourceChangeStatusItemProvider(this);
-		}
-
-		return resourceChangeStatusItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.ModelElementChangeStatus} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ModelElementChangeStatusItemProvider modelElementChangeStatusItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.ModelElementChangeStatus}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createModelElementChangeStatusAdapter() {
-		if (modelElementChangeStatusItemProvider == null) {
-			modelElementChangeStatusItemProvider = new ModelElementChangeStatusItemProvider(this);
-		}
-
-		return modelElementChangeStatusItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.ReferenceChangeStatus} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReferenceChangeStatusItemProvider referenceChangeStatusItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.ReferenceChangeStatus}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createReferenceChangeStatusAdapter() {
-		if (referenceChangeStatusItemProvider == null) {
-			referenceChangeStatusItemProvider = new ReferenceChangeStatusItemProvider(this);
-		}
-
-		return referenceChangeStatusItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.compiler.AttributeChangeStatus} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AttributeChangeStatusItemProvider attributeChangeStatusItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.AttributeChangeStatus}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAttributeChangeStatusAdapter() {
-		if (attributeChangeStatusItemProvider == null) {
-			attributeChangeStatusItemProvider = new AttributeChangeStatusItemProvider(this);
-		}
-
-		return attributeChangeStatusItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (eStringToEObjectItemProvider != null)
-			eStringToEObjectItemProvider.dispose();
-		if (textualReferenceToContributionsItemProvider != null)
-			textualReferenceToContributionsItemProvider.dispose();
-		if (stringToEObjectMapItemProvider != null)
-			stringToEObjectMapItemProvider.dispose();
-		if (eTypeToStringToEObjectMapItemProvider != null)
-			eTypeToStringToEObjectMapItemProvider.dispose();
-		if (eObjectToUnresolvedReferencesListItemProvider != null)
-			eObjectToUnresolvedReferencesListItemProvider.dispose();
-		if (resourceToContainedElementsMapEntryItemProvider != null)
-			resourceToContainedElementsMapEntryItemProvider.dispose();
-		if (modelingUnitToStatusListItemProvider != null)
-			modelingUnitToStatusListItemProvider.dispose();
-		if (createdElementToInstructionMapEntryItemProvider != null)
-			createdElementToInstructionMapEntryItemProvider.dispose();
-		if (unresolvedReferenceHolderItemProvider != null)
-			unresolvedReferenceHolderItemProvider.dispose();
-		if (compilationStatusItemProvider != null)
-			compilationStatusItemProvider.dispose();
-		if (compilationStatusManagerItemProvider != null)
-			compilationStatusManagerItemProvider.dispose();
-		if (compilationInformationHolderItemProvider != null)
-			compilationInformationHolderItemProvider.dispose();
-		if (unresolvedContributionHolderItemProvider != null)
-			unresolvedContributionHolderItemProvider.dispose();
-		if (traceabilityIndexItemProvider != null)
-			traceabilityIndexItemProvider.dispose();
-		if (traceabilityIndexEntryItemProvider != null)
-			traceabilityIndexEntryItemProvider.dispose();
-		if (compiledElementToInstructionEntryItemProvider != null)
-			compiledElementToInstructionEntryItemProvider.dispose();
-		if (instructionTraceabilityEntryItemProvider != null)
-			instructionTraceabilityEntryItemProvider.dispose();
-		if (featureToAffectationEntryItemProvider != null)
-			featureToAffectationEntryItemProvider.dispose();
-		if (resourceChangeStatusItemProvider != null)
-			resourceChangeStatusItemProvider.dispose();
-		if (modelElementChangeStatusItemProvider != null)
-			modelElementChangeStatusItemProvider.dispose();
-		if (referenceChangeStatusItemProvider != null)
-			referenceChangeStatusItemProvider.dispose();
-		if (attributeChangeStatusItemProvider != null)
-			attributeChangeStatusItemProvider.dispose();
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CreatedElementToInstructionMapEntryItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CreatedElementToInstructionMapEntryItemProvider.java
deleted file mode 100644
index de3b389..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/CreatedElementToInstructionMapEntryItemProvider.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-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.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CreatedElementToInstructionMapEntryItemProvider 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 CreatedElementToInstructionMapEntryItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CreatedElementToInstructionMapEntry_key_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_CreatedElementToInstructionMapEntry_key_feature",
-						"_UI_CreatedElementToInstructionMapEntry_type"),
-				CompilerPackage.Literals.CREATED_ELEMENT_TO_INSTRUCTION_MAP_ENTRY__KEY, true, false, true,
-				null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CreatedElementToInstructionMapEntry_value_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_CreatedElementToInstructionMapEntry_value_feature",
-						"_UI_CreatedElementToInstructionMapEntry_type"),
-				CompilerPackage.Literals.CREATED_ELEMENT_TO_INSTRUCTION_MAP_ENTRY__VALUE, true, false, true,
-				null, null, null));
-	}
-
-	/**
-	 * This returns CreatedElementToInstructionMapEntry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object,
-				getResourceLocator().getImage("full/obj16/CreatedElementToInstructionMapEntry"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> createdElementToInstructionMapEntry = (Map.Entry<?, ?>)object;
-		return "" + createdElementToInstructionMapEntry.getKey() + " -> "
-				+ createdElementToInstructionMapEntry.getValue();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/EObjectToUnresolvedReferencesListItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/EObjectToUnresolvedReferencesListItemProvider.java
deleted file mode 100644
index 41c4c7e..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/EObjectToUnresolvedReferencesListItemProvider.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-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;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EObjectToUnresolvedReferencesListItemProvider 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 EObjectToUnresolvedReferencesListItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_EObjectToUnresolvedReferencesList_key_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_EObjectToUnresolvedReferencesList_key_feature",
-						"_UI_EObjectToUnresolvedReferencesList_type"),
-				CompilerPackage.Literals.EOBJECT_TO_UNRESOLVED_REFERENCES_LIST__KEY, 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(CompilerPackage.Literals.EOBJECT_TO_UNRESOLVED_REFERENCES_LIST__VALUE);
-		}
-		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 EObjectToUnresolvedReferencesList.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object,
-				getResourceLocator().getImage("full/obj16/EObjectToUnresolvedReferencesList"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> eObjectToUnresolvedReferencesList = (Map.Entry<?, ?>)object;
-		return "" + eObjectToUnresolvedReferencesList.getKey() + " -> "
-				+ eObjectToUnresolvedReferencesList.getValue();
-	}
-
-	/**
-	 * 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(Map.Entry.class)) {
-			case CompilerPackage.EOBJECT_TO_UNRESOLVED_REFERENCES_LIST__VALUE:
-				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(
-				CompilerPackage.Literals.EOBJECT_TO_UNRESOLVED_REFERENCES_LIST__VALUE,
-				CompilerFactory.eINSTANCE.createUnresolvedReferenceHolder()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/EStringToEObjectItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/EStringToEObjectItemProvider.java
deleted file mode 100644
index 2618b55..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/EStringToEObjectItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EStringToEObjectItemProvider 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 EStringToEObjectItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_EStringToEObject_key_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_EStringToEObject_key_feature",
-						"_UI_EStringToEObject_type"), CompilerPackage.Literals.ESTRING_TO_EOBJECT__KEY, true,
-				false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_EStringToEObject_value_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_EStringToEObject_value_feature",
-						"_UI_EStringToEObject_type"), CompilerPackage.Literals.ESTRING_TO_EOBJECT__VALUE,
-				true, false, true, null, null, null));
-	}
-
-	/**
-	 * This returns EStringToEObject.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EStringToEObject"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> eStringToEObject = (Map.Entry<?, ?>)object;
-		return "" + eStringToEObject.getKey() + " -> " + eStringToEObject.getValue();
-	}
-
-	/**
-	 * 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(Map.Entry.class)) {
-			case CompilerPackage.ESTRING_TO_EOBJECT__KEY:
-				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);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ETypeToStringToEObjectMapItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ETypeToStringToEObjectMapItemProvider.java
deleted file mode 100644
index 8a4dbe5..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ETypeToStringToEObjectMapItemProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-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.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ETypeToStringToEObjectMapItemProvider 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 ETypeToStringToEObjectMapItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ETypeToStringToEObjectMap_key_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ETypeToStringToEObjectMap_key_feature",
-						"_UI_ETypeToStringToEObjectMap_type"),
-				CompilerPackage.Literals.ETYPE_TO_STRING_TO_EOBJECT_MAP__KEY, true, false, true, null, null,
-				null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ETypeToStringToEObjectMap_value_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ETypeToStringToEObjectMap_value_feature", "_UI_ETypeToStringToEObjectMap_type"),
-				CompilerPackage.Literals.ETYPE_TO_STRING_TO_EOBJECT_MAP__VALUE, true, false, true, null,
-				null, null));
-	}
-
-	/**
-	 * This returns ETypeToStringToEObjectMap.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ETypeToStringToEObjectMap"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> eTypeToStringToEObjectMap = (Map.Entry<?, ?>)object;
-		return "" + eTypeToStringToEObjectMap.getKey() + " -> " + eTypeToStringToEObjectMap.getValue();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/FeatureToAffectationEntryItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/FeatureToAffectationEntryItemProvider.java
deleted file mode 100644
index 95e2bad..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/FeatureToAffectationEntryItemProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FeatureToAffectationEntryItemProvider 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 FeatureToAffectationEntryItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_FeatureToAffectationEntry_key_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_FeatureToAffectationEntry_key_feature",
-						"_UI_FeatureToAffectationEntry_type"),
-				CompilerPackage.Literals.FEATURE_TO_AFFECTATION_ENTRY__KEY, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_FeatureToAffectationEntry_value_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_FeatureToAffectationEntry_value_feature", "_UI_FeatureToAffectationEntry_type"),
-				CompilerPackage.Literals.FEATURE_TO_AFFECTATION_ENTRY__VALUE, true, false, true, null, null,
-				null));
-	}
-
-	/**
-	 * This returns FeatureToAffectationEntry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureToAffectationEntry"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> featureToAffectationEntry = (Map.Entry<?, ?>)object;
-		return "" + featureToAffectationEntry.getKey() + " -> " + featureToAffectationEntry.getValue();
-	}
-
-	/**
-	 * 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(Map.Entry.class)) {
-			case CompilerPackage.FEATURE_TO_AFFECTATION_ENTRY__KEY:
-				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);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/InstructionTraceabilityEntryItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/InstructionTraceabilityEntryItemProvider.java
deleted file mode 100644
index f962bac..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/InstructionTraceabilityEntryItemProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.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;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.InstructionTraceabilityEntry;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.InstructionTraceabilityEntry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InstructionTraceabilityEntryItemProvider 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 InstructionTraceabilityEntryItemProvider(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);
-
-			addInstructionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Instruction feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addInstructionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_InstructionTraceabilityEntry_instruction_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_InstructionTraceabilityEntry_instruction_feature",
-						"_UI_InstructionTraceabilityEntry_type"),
-				CompilerPackage.Literals.INSTRUCTION_TRACEABILITY_ENTRY__INSTRUCTION, 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(CompilerPackage.Literals.INSTRUCTION_TRACEABILITY_ENTRY__FEATURES);
-		}
-		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 InstructionTraceabilityEntry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InstructionTraceabilityEntry"));
-	}
-
-	/**
-	 * 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_InstructionTraceabilityEntry_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(InstructionTraceabilityEntry.class)) {
-			case CompilerPackage.INSTRUCTION_TRACEABILITY_ENTRY__FEATURES:
-				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(
-				CompilerPackage.Literals.INSTRUCTION_TRACEABILITY_ENTRY__FEATURES,
-				CompilerFactory.eINSTANCE.create(CompilerPackage.Literals.FEATURE_TO_AFFECTATION_ENTRY)));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ModelElementChangeStatusItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ModelElementChangeStatusItemProvider.java
deleted file mode 100644
index 56e02ed..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ModelElementChangeStatusItemProvider.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.ModelElementChangeStatus;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.ModelElementChangeStatus} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelElementChangeStatusItemProvider extends SynchronizerCompilationStatusItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelElementChangeStatusItemProvider(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);
-
-			addChangeStatePropertyDescriptor(object);
-			addCompiledParentPropertyDescriptor(object);
-			addCompiledElementPropertyDescriptor(object);
-			addWorkingCopyParentURIFragmentPropertyDescriptor(object);
-			addWorkingCopyElementURIFragmentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Change State feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChangeStatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelElementChangeStatus_changeState_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ModelElementChangeStatus_changeState_feature",
-						"_UI_ModelElementChangeStatus_type"),
-				CompilerPackage.Literals.MODEL_ELEMENT_CHANGE_STATUS__CHANGE_STATE, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Compiled Parent feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCompiledParentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelElementChangeStatus_compiledParent_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ModelElementChangeStatus_compiledParent_feature",
-						"_UI_ModelElementChangeStatus_type"),
-				CompilerPackage.Literals.MODEL_ELEMENT_CHANGE_STATUS__COMPILED_PARENT, true, false, true,
-				null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Compiled Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCompiledElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelElementChangeStatus_compiledElement_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ModelElementChangeStatus_compiledElement_feature",
-						"_UI_ModelElementChangeStatus_type"),
-				CompilerPackage.Literals.MODEL_ELEMENT_CHANGE_STATUS__COMPILED_ELEMENT, true, false, true,
-				null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Working Copy Parent URI Fragment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkingCopyParentURIFragmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelElementChangeStatus_workingCopyParentURIFragment_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ModelElementChangeStatus_workingCopyParentURIFragment_feature",
-						"_UI_ModelElementChangeStatus_type"),
-				CompilerPackage.Literals.MODEL_ELEMENT_CHANGE_STATUS__WORKING_COPY_PARENT_URI_FRAGMENT, true,
-				false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Working Copy Element URI Fragment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkingCopyElementURIFragmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelElementChangeStatus_workingCopyElementURIFragment_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ModelElementChangeStatus_workingCopyElementURIFragment_feature",
-						"_UI_ModelElementChangeStatus_type"),
-				CompilerPackage.Literals.MODEL_ELEMENT_CHANGE_STATUS__WORKING_COPY_ELEMENT_URI_FRAGMENT,
-				true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns ModelElementChangeStatus.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ModelElementChangeStatus"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ModelElementChangeStatus)object).getMessage();
-		return label == null || label.length() == 0 ? getString("_UI_ModelElementChangeStatus_type")
-				: getString("_UI_ModelElementChangeStatus_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);
-
-		switch (notification.getFeatureID(ModelElementChangeStatus.class)) {
-			case CompilerPackage.MODEL_ELEMENT_CHANGE_STATUS__CHANGE_STATE:
-			case CompilerPackage.MODEL_ELEMENT_CHANGE_STATUS__WORKING_COPY_PARENT_URI_FRAGMENT:
-			case CompilerPackage.MODEL_ELEMENT_CHANGE_STATUS__WORKING_COPY_ELEMENT_URI_FRAGMENT:
-				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);
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ModelingUnitToStatusListItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ModelingUnitToStatusListItemProvider.java
deleted file mode 100644
index 44fef86..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ModelingUnitToStatusListItemProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-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.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelingUnitToStatusListItemProvider 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 ModelingUnitToStatusListItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelingUnitToStatusList_key_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ModelingUnitToStatusList_key_feature",
-						"_UI_ModelingUnitToStatusList_type"),
-				CompilerPackage.Literals.MODELING_UNIT_TO_STATUS_LIST__KEY, true, false, true, null, null,
-				null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelingUnitToStatusList_value_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ModelingUnitToStatusList_value_feature",
-						"_UI_ModelingUnitToStatusList_type"),
-				CompilerPackage.Literals.MODELING_UNIT_TO_STATUS_LIST__VALUE, true, false, true, null, null,
-				null));
-	}
-
-	/**
-	 * This returns ModelingUnitToStatusList.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ModelingUnitToStatusList"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> modelingUnitToStatusList = (Map.Entry<?, ?>)object;
-		return "" + modelingUnitToStatusList.getKey() + " -> " + modelingUnitToStatusList.getValue();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ReferenceChangeStatusItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ReferenceChangeStatusItemProvider.java
deleted file mode 100644
index 2ed03f2..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ReferenceChangeStatusItemProvider.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.ReferenceChangeStatus;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.ReferenceChangeStatus} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReferenceChangeStatusItemProvider extends StructuralFeatureChangeStatusItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReferenceChangeStatusItemProvider(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);
-
-			addCompiledTargetPropertyDescriptor(object);
-			addWorkingCopyTargetURIFragmentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Compiled Target feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCompiledTargetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(
-						((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ReferenceChangeStatus_compiledTarget_feature"),
-						getString("_UI_PropertyDescriptor_description",
-								"_UI_ReferenceChangeStatus_compiledTarget_feature",
-								"_UI_ReferenceChangeStatus_type"),
-						CompilerPackage.Literals.REFERENCE_CHANGE_STATUS__COMPILED_TARGET, true, false, true,
-						null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Working Copy Target URI Fragment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkingCopyTargetURIFragmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ReferenceChangeStatus_workingCopyTargetURIFragment_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ReferenceChangeStatus_workingCopyTargetURIFragment_feature",
-						"_UI_ReferenceChangeStatus_type"),
-				CompilerPackage.Literals.REFERENCE_CHANGE_STATUS__WORKING_COPY_TARGET_URI_FRAGMENT, true,
-				false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns ReferenceChangeStatus.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceChangeStatus"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ReferenceChangeStatus)object).getFeatureName();
-		return label == null || label.length() == 0 ? getString("_UI_ReferenceChangeStatus_type")
-				: getString("_UI_ReferenceChangeStatus_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);
-
-		switch (notification.getFeatureID(ReferenceChangeStatus.class)) {
-			case CompilerPackage.REFERENCE_CHANGE_STATUS__WORKING_COPY_TARGET_URI_FRAGMENT:
-				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);
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ResourceChangeStatusItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ResourceChangeStatusItemProvider.java
deleted file mode 100644
index 0d093c1..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ResourceChangeStatusItemProvider.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.ResourceChangeStatus;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.ResourceChangeStatus} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ResourceChangeStatusItemProvider extends SynchronizerCompilationStatusItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceChangeStatusItemProvider(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);
-
-			addWorkingCopyResourceStatePropertyDescriptor(object);
-			addCompiledResourceStatePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Working Copy Resource State feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkingCopyResourceStatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ResourceChangeStatus_workingCopyResourceState_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ResourceChangeStatus_workingCopyResourceState_feature",
-						"_UI_ResourceChangeStatus_type"),
-				CompilerPackage.Literals.RESOURCE_CHANGE_STATUS__WORKING_COPY_RESOURCE_STATE, true, false,
-				false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Compiled Resource State feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCompiledResourceStatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ResourceChangeStatus_compiledResourceState_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ResourceChangeStatus_compiledResourceState_feature",
-						"_UI_ResourceChangeStatus_type"),
-				CompilerPackage.Literals.RESOURCE_CHANGE_STATUS__COMPILED_RESOURCE_STATE, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns ResourceChangeStatus.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ResourceChangeStatus"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ResourceChangeStatus)object).getMessage();
-		return label == null || label.length() == 0 ? getString("_UI_ResourceChangeStatus_type")
-				: getString("_UI_ResourceChangeStatus_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);
-
-		switch (notification.getFeatureID(ResourceChangeStatus.class)) {
-			case CompilerPackage.RESOURCE_CHANGE_STATUS__WORKING_COPY_RESOURCE_STATE:
-			case CompilerPackage.RESOURCE_CHANGE_STATUS__COMPILED_RESOURCE_STATE:
-				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);
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ResourceToContainedElementsMapEntryItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ResourceToContainedElementsMapEntryItemProvider.java
deleted file mode 100644
index f954c8a..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/ResourceToContainedElementsMapEntryItemProvider.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-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.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ResourceToContainedElementsMapEntryItemProvider 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 ResourceToContainedElementsMapEntryItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ResourceToContainedElementsMapEntry_key_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ResourceToContainedElementsMapEntry_key_feature",
-						"_UI_ResourceToContainedElementsMapEntry_type"),
-				CompilerPackage.Literals.RESOURCE_TO_CONTAINED_ELEMENTS_MAP_ENTRY__KEY, true, false, true,
-				null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ResourceToContainedElementsMapEntry_value_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_ResourceToContainedElementsMapEntry_value_feature",
-						"_UI_ResourceToContainedElementsMapEntry_type"),
-				CompilerPackage.Literals.RESOURCE_TO_CONTAINED_ELEMENTS_MAP_ENTRY__VALUE, true, false, true,
-				null, null, null));
-	}
-
-	/**
-	 * This returns ResourceToContainedElementsMapEntry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object,
-				getResourceLocator().getImage("full/obj16/ResourceToContainedElementsMapEntry"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> resourceToContainedElementsMapEntry = (Map.Entry<?, ?>)object;
-		return "" + resourceToContainedElementsMapEntry.getKey() + " -> "
-				+ resourceToContainedElementsMapEntry.getValue();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/StringToEObjectMapItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/StringToEObjectMapItemProvider.java
deleted file mode 100644
index 06fb613..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/StringToEObjectMapItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-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;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.StringToEObjectMap;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.StringToEObjectMap} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class StringToEObjectMapItemProvider 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 StringToEObjectMapItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This 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(CompilerPackage.Literals.STRING_TO_EOBJECT_MAP__NAME_TO_ELEMENT);
-		}
-		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 StringToEObjectMap.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringToEObjectMap"));
-	}
-
-	/**
-	 * 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_StringToEObjectMap_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(StringToEObjectMap.class)) {
-			case CompilerPackage.STRING_TO_EOBJECT_MAP__NAME_TO_ELEMENT:
-				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(
-				CompilerPackage.Literals.STRING_TO_EOBJECT_MAP__NAME_TO_ELEMENT,
-				CompilerFactory.eINSTANCE.create(CompilerPackage.Literals.ESTRING_TO_EOBJECT)));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/StructuralFeatureChangeStatusItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/StructuralFeatureChangeStatusItemProvider.java
deleted file mode 100644
index 2ea39e4..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/StructuralFeatureChangeStatusItemProvider.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.StructuralFeatureChangeStatus;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.StructuralFeatureChangeStatus} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class StructuralFeatureChangeStatusItemProvider extends SynchronizerCompilationStatusItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StructuralFeatureChangeStatusItemProvider(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);
-
-			addChangeStatePropertyDescriptor(object);
-			addFeatureNamePropertyDescriptor(object);
-			addCompiledElementPropertyDescriptor(object);
-			addWorkingCopyElementURIFragmentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Change State feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChangeStatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_StructuralFeatureChangeStatus_changeState_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_StructuralFeatureChangeStatus_changeState_feature",
-						"_UI_StructuralFeatureChangeStatus_type"),
-				CompilerPackage.Literals.STRUCTURAL_FEATURE_CHANGE_STATUS__CHANGE_STATE, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Feature Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFeatureNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_StructuralFeatureChangeStatus_featureName_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_StructuralFeatureChangeStatus_featureName_feature",
-						"_UI_StructuralFeatureChangeStatus_type"),
-				CompilerPackage.Literals.STRUCTURAL_FEATURE_CHANGE_STATUS__FEATURE_NAME, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Compiled Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCompiledElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_StructuralFeatureChangeStatus_compiledElement_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_StructuralFeatureChangeStatus_compiledElement_feature",
-						"_UI_StructuralFeatureChangeStatus_type"),
-				CompilerPackage.Literals.STRUCTURAL_FEATURE_CHANGE_STATUS__COMPILED_ELEMENT, true, false,
-				true, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Working Copy Element URI Fragment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkingCopyElementURIFragmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_StructuralFeatureChangeStatus_workingCopyElementURIFragment_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_StructuralFeatureChangeStatus_workingCopyElementURIFragment_feature",
-						"_UI_StructuralFeatureChangeStatus_type"),
-				CompilerPackage.Literals.STRUCTURAL_FEATURE_CHANGE_STATUS__WORKING_COPY_ELEMENT_URI_FRAGMENT,
-				true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((StructuralFeatureChangeStatus)object).getFeatureName();
-		return label == null || label.length() == 0 ? getString("_UI_StructuralFeatureChangeStatus_type")
-				: getString("_UI_StructuralFeatureChangeStatus_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);
-
-		switch (notification.getFeatureID(StructuralFeatureChangeStatus.class)) {
-			case CompilerPackage.STRUCTURAL_FEATURE_CHANGE_STATUS__CHANGE_STATE:
-			case CompilerPackage.STRUCTURAL_FEATURE_CHANGE_STATUS__FEATURE_NAME:
-			case CompilerPackage.STRUCTURAL_FEATURE_CHANGE_STATUS__WORKING_COPY_ELEMENT_URI_FRAGMENT:
-				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);
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/SynchronizerCompilationStatusItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/SynchronizerCompilationStatusItemProvider.java
deleted file mode 100644
index 803b04b..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/SynchronizerCompilationStatusItemProvider.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.SynchronizerCompilationStatus;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.SynchronizerCompilationStatus} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SynchronizerCompilationStatusItemProvider extends CompilationStatusItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SynchronizerCompilationStatusItemProvider(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);
-
-			addCompiledResourceURIPropertyDescriptor(object);
-			addWorkingCopyResourceURIPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Compiled Resource URI feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCompiledResourceURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_SynchronizerCompilationStatus_compiledResourceURI_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_SynchronizerCompilationStatus_compiledResourceURI_feature",
-						"_UI_SynchronizerCompilationStatus_type"),
-				CompilerPackage.Literals.SYNCHRONIZER_COMPILATION_STATUS__COMPILED_RESOURCE_URI, true, false,
-				false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Working Copy Resource URI feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWorkingCopyResourceURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_SynchronizerCompilationStatus_workingCopyResourceURI_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_SynchronizerCompilationStatus_workingCopyResourceURI_feature",
-						"_UI_SynchronizerCompilationStatus_type"),
-				CompilerPackage.Literals.SYNCHRONIZER_COMPILATION_STATUS__WORKING_COPY_RESOURCE_URI, true,
-				false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((SynchronizerCompilationStatus)object).getMessage();
-		return label == null || label.length() == 0 ? getString("_UI_SynchronizerCompilationStatus_type")
-				: getString("_UI_SynchronizerCompilationStatus_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);
-
-		switch (notification.getFeatureID(SynchronizerCompilationStatus.class)) {
-			case CompilerPackage.SYNCHRONIZER_COMPILATION_STATUS__COMPILED_RESOURCE_URI:
-			case CompilerPackage.SYNCHRONIZER_COMPILATION_STATUS__WORKING_COPY_RESOURCE_URI:
-				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);
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TextualReferenceToContributionsItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TextualReferenceToContributionsItemProvider.java
deleted file mode 100644
index 25c54ea..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TextualReferenceToContributionsItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link java.util.Map.Entry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TextualReferenceToContributionsItemProvider 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 TextualReferenceToContributionsItemProvider(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);
-
-			addKeyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_TextualReferenceToContributions_key_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_TextualReferenceToContributions_key_feature",
-						"_UI_TextualReferenceToContributions_type"),
-				CompilerPackage.Literals.TEXTUAL_REFERENCE_TO_CONTRIBUTIONS__KEY, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(CompilerPackage.Literals.TEXTUAL_REFERENCE_TO_CONTRIBUTIONS__VALUE);
-		}
-		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 TextualReferenceToContributions.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object,
-				getResourceLocator().getImage("full/obj16/TextualReferenceToContributions"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Map.Entry<?, ?> textualReferenceToContributions = (Map.Entry<?, ?>)object;
-		return "" + textualReferenceToContributions.getKey() + " -> "
-				+ textualReferenceToContributions.getValue();
-	}
-
-	/**
-	 * 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(Map.Entry.class)) {
-			case CompilerPackage.TEXTUAL_REFERENCE_TO_CONTRIBUTIONS__KEY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
-						true));
-				return;
-			case CompilerPackage.TEXTUAL_REFERENCE_TO_CONTRIBUTIONS__VALUE:
-				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(
-				CompilerPackage.Literals.TEXTUAL_REFERENCE_TO_CONTRIBUTIONS__VALUE,
-				CompilerFactory.eINSTANCE.createUnresolvedContributionHolder()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TraceabilityIndexEntryItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TraceabilityIndexEntryItemProvider.java
deleted file mode 100644
index 4d56232..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TraceabilityIndexEntryItemProvider.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.TraceabilityIndexEntry;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.TraceabilityIndexEntry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TraceabilityIndexEntryItemProvider 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 TraceabilityIndexEntryItemProvider(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);
-
-			addGeneratedResourcePathPropertyDescriptor(object);
-			addCompilationTimePropertyDescriptor(object);
-			addResourceDeclarationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Generated Resource Path feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGeneratedResourcePathPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_TraceabilityIndexEntry_generatedResourcePath_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_TraceabilityIndexEntry_generatedResourcePath_feature",
-						"_UI_TraceabilityIndexEntry_type"),
-				CompilerPackage.Literals.TRACEABILITY_INDEX_ENTRY__GENERATED_RESOURCE_PATH, true, false,
-				false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Compilation Time feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCompilationTimePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_TraceabilityIndexEntry_compilationTime_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_TraceabilityIndexEntry_compilationTime_feature",
-						"_UI_TraceabilityIndexEntry_type"),
-				CompilerPackage.Literals.TRACEABILITY_INDEX_ENTRY__COMPILATION_TIME, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Resource Declaration feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addResourceDeclarationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_TraceabilityIndexEntry_resourceDeclaration_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_TraceabilityIndexEntry_resourceDeclaration_feature",
-						"_UI_TraceabilityIndexEntry_type"),
-				CompilerPackage.Literals.TRACEABILITY_INDEX_ENTRY__RESOURCE_DECLARATION, 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(CompilerPackage.Literals.TRACEABILITY_INDEX_ENTRY__CONTAINED_ELEMENT_TO_INSTRUCTIONS);
-		}
-		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 TraceabilityIndexEntry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TraceabilityIndexEntry"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((TraceabilityIndexEntry)object).getGeneratedResourcePath();
-		return label == null || label.length() == 0 ? getString("_UI_TraceabilityIndexEntry_type")
-				: getString("_UI_TraceabilityIndexEntry_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);
-
-		switch (notification.getFeatureID(TraceabilityIndexEntry.class)) {
-			case CompilerPackage.TRACEABILITY_INDEX_ENTRY__GENERATED_RESOURCE_PATH:
-			case CompilerPackage.TRACEABILITY_INDEX_ENTRY__COMPILATION_TIME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
-						true));
-				return;
-			case CompilerPackage.TRACEABILITY_INDEX_ENTRY__CONTAINED_ELEMENT_TO_INSTRUCTIONS:
-				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(
-				CompilerPackage.Literals.TRACEABILITY_INDEX_ENTRY__CONTAINED_ELEMENT_TO_INSTRUCTIONS,
-				CompilerFactory.eINSTANCE
-						.create(CompilerPackage.Literals.COMPILED_ELEMENT_TO_INSTRUCTION_ENTRY)));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TraceabilityIndexItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TraceabilityIndexItemProvider.java
deleted file mode 100644
index 7111af3..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/TraceabilityIndexItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-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;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.TraceabilityIndex;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.TraceabilityIndex} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TraceabilityIndexItemProvider 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 TraceabilityIndexItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This 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(CompilerPackage.Literals.TRACEABILITY_INDEX__ENTRIES);
-		}
-		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 TraceabilityIndex.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TraceabilityIndex"));
-	}
-
-	/**
-	 * 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_TraceabilityIndex_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(TraceabilityIndex.class)) {
-			case CompilerPackage.TRACEABILITY_INDEX__ENTRIES:
-				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(CompilerPackage.Literals.TRACEABILITY_INDEX__ENTRIES,
-				CompilerFactory.eINSTANCE.createTraceabilityIndexEntry()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/UnresolvedContributionHolderItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/UnresolvedContributionHolderItemProvider.java
deleted file mode 100644
index b62929d..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/UnresolvedContributionHolderItemProvider.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.UnresolvedContributionHolder;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.UnresolvedContributionHolder} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class UnresolvedContributionHolderItemProvider 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 UnresolvedContributionHolderItemProvider(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);
-
-			addResolvedPropertyDescriptor(object);
-			addReferencedContributionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Resolved feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addResolvedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_UnresolvedContributionHolder_resolved_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_UnresolvedContributionHolder_resolved_feature",
-						"_UI_UnresolvedContributionHolder_type"),
-				CompilerPackage.Literals.UNRESOLVED_CONTRIBUTION_HOLDER__RESOLVED, true, false, false,
-				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Referenced Contribution feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReferencedContributionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_UnresolvedContributionHolder_referencedContribution_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_UnresolvedContributionHolder_referencedContribution_feature",
-						"_UI_UnresolvedContributionHolder_type"),
-				CompilerPackage.Literals.UNRESOLVED_CONTRIBUTION_HOLDER__REFERENCED_CONTRIBUTION, true,
-				false, true, null, null, null));
-	}
-
-	/**
-	 * This returns UnresolvedContributionHolder.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/UnresolvedContributionHolder"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		UnresolvedContributionHolder unresolvedContributionHolder = (UnresolvedContributionHolder)object;
-		return getString("_UI_UnresolvedContributionHolder_type") + " "
-				+ unresolvedContributionHolder.isResolved();
-	}
-
-	/**
-	 * 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(UnresolvedContributionHolder.class)) {
-			case CompilerPackage.UNRESOLVED_CONTRIBUTION_HOLDER__RESOLVED:
-				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);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/UnresolvedReferenceHolderItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/UnresolvedReferenceHolderItemProvider.java
deleted file mode 100644
index e59f555..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/compiler/provider/UnresolvedReferenceHolderItemProvider.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.compiler.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
-import org.eclipse.mylyn.docs.intent.core.compiler.UnresolvedReferenceHolder;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.compiler.UnresolvedReferenceHolder} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class UnresolvedReferenceHolderItemProvider 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 UnresolvedReferenceHolderItemProvider(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);
-
-			addTextualReferencePropertyDescriptor(object);
-			addContainmentReferencePropertyDescriptor(object);
-			addInstructionContainerPropertyDescriptor(object);
-			addConcernedFeaturePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Textual Reference feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTextualReferencePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_UnresolvedReferenceHolder_textualReference_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_UnresolvedReferenceHolder_textualReference_feature",
-						"_UI_UnresolvedReferenceHolder_type"),
-				CompilerPackage.Literals.UNRESOLVED_REFERENCE_HOLDER__TEXTUAL_REFERENCE, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Containment Reference feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addContainmentReferencePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_UnresolvedReferenceHolder_containmentReference_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_UnresolvedReferenceHolder_containmentReference_feature",
-						"_UI_UnresolvedReferenceHolder_type"),
-				CompilerPackage.Literals.UNRESOLVED_REFERENCE_HOLDER__CONTAINMENT_REFERENCE, true, false,
-				false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Instruction Container feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addInstructionContainerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_UnresolvedReferenceHolder_instructionContainer_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_UnresolvedReferenceHolder_instructionContainer_feature",
-						"_UI_UnresolvedReferenceHolder_type"),
-				CompilerPackage.Literals.UNRESOLVED_REFERENCE_HOLDER__INSTRUCTION_CONTAINER, true, false,
-				true, null, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Concerned Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addConcernedFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_UnresolvedReferenceHolder_concernedFeature_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_UnresolvedReferenceHolder_concernedFeature_feature",
-						"_UI_UnresolvedReferenceHolder_type"),
-				CompilerPackage.Literals.UNRESOLVED_REFERENCE_HOLDER__CONCERNED_FEATURE, true, false, true,
-				null, null, null));
-	}
-
-	/**
-	 * This returns UnresolvedReferenceHolder.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/UnresolvedReferenceHolder"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((UnresolvedReferenceHolder)object).getTextualReference();
-		return label == null || label.length() == 0 ? getString("_UI_UnresolvedReferenceHolder_type")
-				: getString("_UI_UnresolvedReferenceHolder_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);
-
-		switch (notification.getFeatureID(UnresolvedReferenceHolder.class)) {
-			case CompilerPackage.UNRESOLVED_REFERENCE_HOLDER__TEXTUAL_REFERENCE:
-			case CompilerPackage.UNRESOLVED_REFERENCE_HOLDER__CONTAINMENT_REFERENCE:
-				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);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionBlocItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionBlocItemProvider.java
index b62907d..e8ae04e 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionBlocItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionBlocItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -25,12 +23,10 @@
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentFactory;
-
 import org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionBloc;
 import org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionUnitPackage;
-
+import org.eclipse.mylyn.docs.intent.core.query.DescriptionUnitHelper;
 import org.eclipse.mylyn.docs.intent.markup.markup.MarkupFactory;
 
 /**
@@ -110,12 +106,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		DescriptionBloc descriptionBloc = (DescriptionBloc)object;
-		return getString("_UI_DescriptionBloc_type") + " " + descriptionBloc.isLineBreak();
+		return  DescriptionUnitHelper.getDescriptionBlocTitle((DescriptionBloc)object, -1);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionUnitInstructionItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionUnitInstructionItemProvider.java
index 6f9dce2..e55740b 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionUnitInstructionItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionUnitInstructionItemProvider.java
@@ -15,20 +15,14 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionUnitInstruction;
-
 import org.eclipse.mylyn.docs.intent.core.document.provider.UnitInstructionItemProvider;
-
 import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
 
 /**
@@ -67,13 +61,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		DescriptionUnitInstruction descriptionUnitInstruction = (DescriptionUnitInstruction)object;
-		return getString("_UI_DescriptionUnitInstruction_type") + " "
-				+ descriptionUnitInstruction.isLineBreak();
+		return "";
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionUnitItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionUnitItemProvider.java
index a33475b..506bc95 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionUnitItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/descriptionunit/provider/DescriptionUnitItemProvider.java
@@ -15,21 +15,17 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionUnit;
-
 import org.eclipse.mylyn.docs.intent.core.document.provider.GenericUnitItemProvider;
-
 import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
+import org.eclipse.mylyn.docs.intent.core.query.DescriptionUnitHelper;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.document.descriptionunit.DescriptionUnit} object.
@@ -78,13 +74,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((DescriptionUnit)object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_DescriptionUnit_type")
-				: getString("_UI_DescriptionUnit_type") + " " + label;
+		return  DescriptionUnitHelper.getDescriptionUnitTitle((DescriptionUnit)object, -1);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentDocumentItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentDocumentItemProvider.java
index 4ef592d..16da470 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentDocumentItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentDocumentItemProvider.java
@@ -15,17 +15,15 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 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.mylyn.docs.intent.core.document.IntentDocument;
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentPackage;
-
+import org.eclipse.mylyn.docs.intent.core.query.StructuredElementHelper;
 import org.eclipse.mylyn.docs.intent.markup.markup.MarkupPackage;
 
 /**
@@ -75,12 +73,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		IntentDocument intentDocument = (IntentDocument)object;
-		return getString("_UI_IntentDocument_type") + " " + intentDocument.getLevel();
+		IntentDocument document = (IntentDocument) object;
+		return StructuredElementHelper.getTitle(document, -1);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentReferenceInstructionItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentReferenceInstructionItemProvider.java
index bdfc272..a723ff7 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentReferenceInstructionItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentReferenceInstructionItemProvider.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,7 +24,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentPackage;
 import org.eclipse.mylyn.docs.intent.core.document.IntentReferenceInstruction;
 
@@ -131,13 +129,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
 		IntentReferenceInstruction intentReferenceInstruction = (IntentReferenceInstruction)object;
-		return getString("_UI_IntentReferenceInstruction_type") + " "
-				+ intentReferenceInstruction.isLineBreak();
+		return "reference to " + intentReferenceInstruction.getIntentHref();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentSectionItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentSectionItemProvider.java
index 6ce4874..8456a61 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentSectionItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentSectionItemProvider.java
@@ -26,6 +26,7 @@
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.mylyn.docs.intent.core.compiler.CompilerFactory;
 import org.eclipse.mylyn.docs.intent.core.compiler.CompilerPackage;
+import org.eclipse.mylyn.docs.intent.core.document.IntentDocument;
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentFactory;
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentPackage;
 import org.eclipse.mylyn.docs.intent.core.document.IntentSection;
@@ -179,8 +180,22 @@
 	@Override
 	public String getText(Object object) {
 		IntentSection intentSection = (IntentSection)object;
-		return StructuredElementHelper.getTitle(intentSection, STRUCTURED_ELEMENT_TITLE_MAXLENGTH);
+		return StructuredElementHelper.getTitle(intentSection, -1);
 	}
+	
+	/**
+	 * 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getImage(java.lang.Object)
+	 */
+	public Object getImage(Object object) {
+		IntentSection intentSection = (IntentSection)object;
+		if( intentSection.eContainer() instanceof IntentDocument ) {
+			return getResourceLocator().getImage("full/obj16/IntentChapter");
+		} else {
+			return getResourceLocator().getImage("full/obj16/IntentSection");
+		}		
+	};
 
 	/**
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentStructuredElementItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentStructuredElementItemProvider.java
index c4b126e..98694f6 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentStructuredElementItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/IntentStructuredElementItemProvider.java
@@ -43,7 +43,6 @@
  */
 public class IntentStructuredElementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	
-	protected static final int STRUCTURED_ELEMENT_TITLE_MAXLENGTH = 50;
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/LabelDeclarationItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/LabelDeclarationItemProvider.java
index 27bac28..a539ed6 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/LabelDeclarationItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/LabelDeclarationItemProvider.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,7 +24,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentPackage;
 import org.eclipse.mylyn.docs.intent.core.document.LabelDeclaration;
 
@@ -129,12 +127,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		LabelDeclaration labelDeclaration = (LabelDeclaration)object;
-		return getString("_UI_LabelDeclaration_type") + " " + labelDeclaration.isLineBreak();
+		return "new Label " + ((LabelDeclaration)object).getLabelValue();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/LabelReferenceInstructionItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/LabelReferenceInstructionItemProvider.java
index acb5908..45f4327 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/LabelReferenceInstructionItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/document/provider/LabelReferenceInstructionItemProvider.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,7 +24,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentPackage;
 import org.eclipse.mylyn.docs.intent.core.document.LabelReferenceInstruction;
 
@@ -130,13 +128,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		LabelReferenceInstruction labelReferenceInstruction = (LabelReferenceInstruction)object;
-		return getString("_UI_LabelReferenceInstruction_type") + " "
-				+ labelReferenceInstruction.isLineBreak();
+		return "reference to " + ((LabelReferenceInstruction)object).getIntentHref();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexEntryItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexEntryItemProvider.java
deleted file mode 100644
index 8c7a052..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexEntryItemProvider.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.indexer.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.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.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-import org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexEntry;
-import org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexerFactory;
-import org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexerPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexEntry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IntentIndexEntryItemProvider 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 IntentIndexEntryItemProvider(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);
-
-			addNamePropertyDescriptor(object);
-			addTypePropertyDescriptor(object);
-			addReferencedElementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_IntentIndexEntry_name_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_IntentIndexEntry_name_feature",
-						"_UI_IntentIndexEntry_type"), IntentIndexerPackage.Literals.INTENT_INDEX_ENTRY__NAME,
-				true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_IntentIndexEntry_type_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_IntentIndexEntry_type_feature",
-						"_UI_IntentIndexEntry_type"), IntentIndexerPackage.Literals.INTENT_INDEX_ENTRY__TYPE,
-				true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Referenced Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReferencedElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_IntentIndexEntry_referencedElement_feature"),
-				getString("_UI_PropertyDescriptor_description",
-						"_UI_IntentIndexEntry_referencedElement_feature", "_UI_IntentIndexEntry_type"),
-				IntentIndexerPackage.Literals.INTENT_INDEX_ENTRY__REFERENCED_ELEMENT, 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(IntentIndexerPackage.Literals.INTENT_INDEX_ENTRY__SUB_ENTRIES);
-		}
-		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 IntentIndexEntry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntentIndexEntry"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((IntentIndexEntry)object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_IntentIndexEntry_type")
-				: getString("_UI_IntentIndexEntry_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);
-
-		switch (notification.getFeatureID(IntentIndexEntry.class)) {
-			case IntentIndexerPackage.INTENT_INDEX_ENTRY__NAME:
-			case IntentIndexerPackage.INTENT_INDEX_ENTRY__TYPE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
-						true));
-				return;
-			case IntentIndexerPackage.INTENT_INDEX_ENTRY__SUB_ENTRIES:
-				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(
-				IntentIndexerPackage.Literals.INTENT_INDEX_ENTRY__SUB_ENTRIES,
-				IntentIndexerFactory.eINSTANCE.createIntentIndexEntry()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexItemProvider.java
deleted file mode 100644
index badb08a..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.indexer.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-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;
-
-import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
-import org.eclipse.mylyn.docs.intent.core.indexer.IntentIndex;
-import org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexerFactory;
-import org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexerPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.docs.intent.core.indexer.IntentIndex} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IntentIndexItemProvider 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 IntentIndexItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This 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(IntentIndexerPackage.Literals.INTENT_INDEX__ENTRIES);
-		}
-		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 IntentIndex.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IntentIndex"));
-	}
-
-	/**
-	 * 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_IntentIndex_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(IntentIndex.class)) {
-			case IntentIndexerPackage.INTENT_INDEX__ENTRIES:
-				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(IntentIndexerPackage.Literals.INTENT_INDEX__ENTRIES,
-				IntentIndexerFactory.eINSTANCE.createIntentIndexEntry()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return IntentEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexerItemProviderAdapterFactory.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexerItemProviderAdapterFactory.java
deleted file mode 100644
index 391d650..0000000
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/indexer/provider/IntentIndexerItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * Copyright (c) 2010, 2012 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- */
-package org.eclipse.mylyn.docs.intent.core.indexer.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.mylyn.docs.intent.core.indexer.util.IntentIndexerAdapterFactory;
-
-/**
- * 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 IntentIndexerItemProviderAdapterFactory extends IntentIndexerAdapterFactory 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 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 IntentIndexerItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.indexer.IntentIndex} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IntentIndexItemProvider intentIndexItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.indexer.IntentIndex}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createIntentIndexAdapter() {
-		if (intentIndexItemProvider == null) {
-			intentIndexItemProvider = new IntentIndexItemProvider(this);
-		}
-
-		return intentIndexItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexEntry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IntentIndexEntryItemProvider intentIndexEntryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.docs.intent.core.indexer.IntentIndexEntry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createIntentIndexEntryAdapter() {
-		if (intentIndexEntryItemProvider == null) {
-			intentIndexEntryItemProvider = new IntentIndexEntryItemProvider(this);
-		}
-
-		return intentIndexEntryItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (intentIndexItemProvider != null)
-			intentIndexItemProvider.dispose();
-		if (intentIndexEntryItemProvider != null)
-			intentIndexEntryItemProvider.dispose();
-	}
-
-}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/AnnotationDeclarationItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/AnnotationDeclarationItemProvider.java
index cbbf7ed..85a7bad 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/AnnotationDeclarationItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/AnnotationDeclarationItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 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;
@@ -27,9 +25,7 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentPackage;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.AnnotationDeclaration;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitFactory;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
@@ -165,12 +161,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		AnnotationDeclaration annotationDeclaration = (AnnotationDeclaration)object;
-		return getString("_UI_AnnotationDeclaration_type") + " " + annotationDeclaration.isLineBreak();
+		return "Annotation '" + ((AnnotationDeclaration)object).getAnnotationID() + "' on " + ((AnnotationDeclaration)object).getIntentHref();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ContributionInstructionItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ContributionInstructionItemProvider.java
index ec0c2db..d442523 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ContributionInstructionItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ContributionInstructionItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -25,9 +23,9 @@
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ContributionInstruction;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitFactory;
+import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitInstructionReference;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 
 /**
@@ -98,23 +96,27 @@
 	 * This returns ContributionInstruction.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ContributionInstruction"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ContributionInstruction.png"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		ContributionInstruction contributionInstruction = (ContributionInstruction)object;
-		return getString("_UI_ContributionInstruction_type") + " " + contributionInstruction.isLineBreak();
+		ModelingUnitInstructionReference contributionReference = ((ContributionInstruction)object).getContributionReference();
+		if (contributionReference != null) {
+			return contributionReference.getIntentHref() + " (Contribution)";
+		} else {
+			return "Contribution to unkown element";
+		}
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ExternalContentReferenceItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ExternalContentReferenceItemProvider.java
index 04aeeea..f2e35f1 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ExternalContentReferenceItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ExternalContentReferenceItemProvider.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,7 +24,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ExternalContentReference;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 
@@ -114,13 +112,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ExternalContentReference)object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ExternalContentReference_type")
-				: getString("_UI_ExternalContentReference_type") + " " + label;
+		return ((ExternalContentReference)object).getUri().toString();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/InstanciationInstructionItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/InstanciationInstructionItemProvider.java
index 8770d28..a30bf5c 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/InstanciationInstructionItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/InstanciationInstructionItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 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;
@@ -27,7 +25,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.InstanciationInstruction;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitFactory;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
@@ -116,24 +113,30 @@
 	 * This returns InstanciationInstruction.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanciationInstruction"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/InstanciationInstruction.png"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((InstanciationInstruction)object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_InstanciationInstruction_type")
-				: getString("_UI_InstanciationInstruction_type") + " " + label;
+		InstanciationInstruction instruction = (InstanciationInstruction)object;
+		String instanceName = instruction.getName();
+		if (instanceName != null && instanceName.length() > 0) {
+			instanceName = instanceName + " : " + instruction.getMetaType().getTypeName();
+		} else {
+			instanceName = "? : " + instruction.getMetaType().getTypeName();
+		}
+		return instanceName;
+
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/InstanciationInstructionReferenceItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/InstanciationInstructionReferenceItemProvider.java
index 7b5fa41..43bcaf6 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/InstanciationInstructionReferenceItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/InstanciationInstructionReferenceItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,9 +26,7 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.InstanciationInstructionReference;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 
@@ -120,13 +116,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((InstanciationInstructionReference)object).getInstanceName();
-		return label == null || label.length() == 0 ? getString("_UI_InstanciationInstructionReference_type")
-				: getString("_UI_InstanciationInstructionReference_type") + " " + label;
+		return ((InstanciationInstructionReference)object).getInstanceName() + " (Reference to)";
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/IntentReferenceInModelingUnitItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/IntentReferenceInModelingUnitItemProvider.java
index 6921364..55d03e6 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/IntentReferenceInModelingUnitItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/IntentReferenceInModelingUnitItemProvider.java
@@ -15,20 +15,15 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.mylyn.docs.intent.core.document.provider.IntentReferenceInstructionItemProvider;
-
 import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.IntentReferenceInModelingUnit;
 
 /**
@@ -78,13 +73,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		IntentReferenceInModelingUnit intentReferenceInModelingUnit = (IntentReferenceInModelingUnit)object;
-		return getString("_UI_IntentReferenceInModelingUnit_type") + " "
-				+ intentReferenceInModelingUnit.isLineBreak();
+		return  "Reference to Section " + ((IntentReferenceInModelingUnit)object).getIntentHref();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/LabelInModelingUnitItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/LabelInModelingUnitItemProvider.java
index d45ba42..407ac80 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/LabelInModelingUnitItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/LabelInModelingUnitItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,13 +25,9 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.document.IntentDocumentPackage;
-
 import org.eclipse.mylyn.docs.intent.core.document.provider.LabelDeclarationItemProvider;
-
 import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.LabelInModelingUnit;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 
@@ -120,12 +114,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		LabelInModelingUnit labelInModelingUnit = (LabelInModelingUnit)object;
-		return getString("_UI_LabelInModelingUnit_type") + " " + labelInModelingUnit.isLineBreak();
+		return ("Label " + ((LabelInModelingUnit)object).getLabelValue());
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ModelingUnitInstructionReferenceItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ModelingUnitInstructionReferenceItemProvider.java
index 0121d00..abc0c97 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ModelingUnitInstructionReferenceItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ModelingUnitInstructionReferenceItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,9 +26,7 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitInstructionReference;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 
@@ -108,25 +104,23 @@
 	 * This returns ModelingUnitInstructionReference.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Object getImage(Object object) {
 		return overlayImage(object,
-				getResourceLocator().getImage("full/obj16/ModelingUnitInstructionReference"));
+				getResourceLocator().getImage("full/obj16/ModelingUnitInstructionReference.png"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ModelingUnitInstructionReference)object).getIntentHref();
-		return label == null || label.length() == 0 ? getString("_UI_ModelingUnitInstructionReference_type")
-				: getString("_UI_ModelingUnitInstructionReference_type") + " " + label;
+		return ((ModelingUnitInstructionReference)object).getIntentHref();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ModelingUnitItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ModelingUnitItemProvider.java
index 4143ab5..cd0cfb7 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ModelingUnitItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ModelingUnitItemProvider.java
@@ -15,20 +15,15 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.mylyn.docs.intent.core.document.provider.GenericUnitItemProvider;
-
 import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnit;
 
 /**
@@ -67,24 +62,26 @@
 	 * This returns ModelingUnit.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ModelingUnit"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ModelingUnit.png"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ModelingUnit)object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ModelingUnit_type")
-				: getString("_UI_ModelingUnit_type") + " " + label;
+		String modelingUnitName = ((ModelingUnit)object).getName();
+		if (modelingUnitName == null || modelingUnitName.length() < 2) {
+			modelingUnitName = "Modeling Unit";
+		}
+		return modelingUnitName;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/NativeValueItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/NativeValueItemProvider.java
index 448d19e..86fc339 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/NativeValueItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/NativeValueItemProvider.java
@@ -15,7 +15,6 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,7 +24,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.NativeValue;
 
@@ -93,12 +91,18 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		NativeValue nativeValue = (NativeValue)object;
-		return getString("_UI_NativeValue_type") + " " + nativeValue.isLineBreak();
+		String textValue = ((NativeValue)object).getValue();
+		if (textValue.startsWith("\"")) {
+			textValue = textValue.substring(1);
+		}
+		if (textValue.endsWith("\"")) {
+			textValue = textValue.substring(0, textValue.length() - 1);
+		}
+		return textValue;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/NewObjectValueItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/NewObjectValueItemProvider.java
index e0c9059..29a2d5c 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/NewObjectValueItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/NewObjectValueItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -25,7 +23,6 @@
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitFactory;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.NewObjectValue;
@@ -96,23 +93,22 @@
 	 * This returns NewObjectValue.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NewObjectValue"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/NewObjectValue.png"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		NewObjectValue newObjectValue = (NewObjectValue)object;
-		return getString("_UI_NewObjectValue_type") + " " + newObjectValue.isLineBreak();
+		return "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ReferenceValueItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ReferenceValueItemProvider.java
index 2c4c69b..896f281 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ReferenceValueItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ReferenceValueItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 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;
@@ -26,7 +24,7 @@
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
+import org.eclipse.mylyn.docs.intent.core.modelingunit.InstanciationInstructionReference;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitFactory;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ReferenceValue;
@@ -115,23 +113,27 @@
 	 * This returns ReferenceValue.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceValue"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceValue.png"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		ReferenceValue referenceValue = (ReferenceValue)object;
-		return getString("_UI_ReferenceValue_type") + " " + referenceValue.isLineBreak();
+		InstanciationInstructionReference instanciationReference = ((ReferenceValue)object).getInstanciationReference();
+		if (instanciationReference != null) {
+			return instanciationReference.getInstanceName() + " (Reference to)";
+		} else {
+			return 	"Reference to unknown element";
+		}	
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ResourceDeclarationItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ResourceDeclarationItemProvider.java
index 2a3af56..85aa27e 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ResourceDeclarationItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/ResourceDeclarationItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 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;
@@ -27,7 +25,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitFactory;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ResourceDeclaration;
@@ -163,13 +160,17 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((ResourceDeclaration)object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ResourceDeclaration_type")
-				: getString("_UI_ResourceDeclaration_type") + " " + label;
+		String resourceName = ((ResourceDeclaration)object).getName();
+		if (resourceName != null && resourceName.length() > 0) {
+			resourceName = "Resource " + resourceName;
+		} else {
+			resourceName = "Untitled Resource";
+		}
+		return resourceName;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/StructuralFeatureAffectationItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/StructuralFeatureAffectationItemProvider.java
index 91a2e33..8b58a5e 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/StructuralFeatureAffectationItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/StructuralFeatureAffectationItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 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;
@@ -27,7 +25,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitFactory;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.StructuralFeatureAffectation;
@@ -136,24 +133,22 @@
 	 * This returns StructuralFeatureAffectation.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StructuralFeatureAffectation"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StructuralFeatureAffectation.png"));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((StructuralFeatureAffectation)object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_StructuralFeatureAffectation_type")
-				: getString("_UI_StructuralFeatureAffectation_type") + " " + label;
+		return ((StructuralFeatureAffectation)object).getName();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/TypeReferenceItemProvider.java b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/TypeReferenceItemProvider.java
index 64eb223..8c0d7cd 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/TypeReferenceItemProvider.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core.edit/src-gen/org/eclipse/mylyn/docs/intent/core/modelingunit/provider/TypeReferenceItemProvider.java
@@ -15,9 +15,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,9 +26,7 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.mylyn.docs.intent.core.edit.IntentEditPlugin;
-
 import org.eclipse.mylyn.docs.intent.core.modelingunit.ModelingUnitPackage;
 import org.eclipse.mylyn.docs.intent.core.modelingunit.TypeReference;
 
@@ -116,13 +112,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((TypeReference)object).getTypeName();
-		return label == null || label.length() == 0 ? getString("_UI_TypeReference_type")
-				: getString("_UI_TypeReference_type") + " " + label;
+		return ((TypeReference)object).getTypeName();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core/src/org/eclipse/mylyn/docs/intent/core/query/DescriptionUnitHelper.java b/plugins/org.eclipse.mylyn.docs.intent.core/src/org/eclipse/mylyn/docs/intent/core/query/DescriptionUnitHelper.java
index 2b1bfce..4ed3047 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core/src/org/eclipse/mylyn/docs/intent/core/query/DescriptionUnitHelper.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core/src/org/eclipse/mylyn/docs/intent/core/query/DescriptionUnitHelper.java
@@ -29,6 +29,8 @@
  */
 public final class DescriptionUnitHelper {
 
+	private static final int MARKUP_ELEMENT_MAXLENGTH = 50;
+
 	/**
 	 * DescriptionUnitHelper constructor.
 	 */
@@ -88,12 +90,16 @@
 	 */
 	public static String getLabelForMarkupElement(StructureElement element, int maxSize) {
 		String label = "";
+		int actualMaxSize = maxSize;
+		if (actualMaxSize == -1) {
+			actualMaxSize = MARKUP_ELEMENT_MAXLENGTH;
+		}
 		if (element instanceof Section) {
-			label = getLabelForSection((Section)element, maxSize);
+			label = getLabelForSection((Section)element, actualMaxSize);
 		}
 
 		if (element instanceof Block) {
-			label = getLabelForBlock((Block)element, maxSize);
+			label = getLabelForBlock((Block)element, actualMaxSize);
 		}
 		return label;
 	}
diff --git a/plugins/org.eclipse.mylyn.docs.intent.core/src/org/eclipse/mylyn/docs/intent/core/query/StructuredElementHelper.java b/plugins/org.eclipse.mylyn.docs.intent.core/src/org/eclipse/mylyn/docs/intent/core/query/StructuredElementHelper.java
index f1bb479..72b7dfd 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.core/src/org/eclipse/mylyn/docs/intent/core/query/StructuredElementHelper.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.core/src/org/eclipse/mylyn/docs/intent/core/query/StructuredElementHelper.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.mylyn.docs.intent.core.query;
 
+import org.eclipse.mylyn.docs.intent.core.document.IntentDocument;
 import org.eclipse.mylyn.docs.intent.core.document.IntentStructuredElement;
 import org.eclipse.mylyn.docs.intent.markup.markup.Block;
 
@@ -48,8 +49,17 @@
 	 * @return the title of a modeling Unit (empty String if no title).
 	 */
 	public static String getTitle(IntentStructuredElement element, int maxSize) {
-
 		Block block = ((IntentStructuredElement)element).getTitle();
-		return DescriptionUnitHelper.getLabelForMarkupElement(block, maxSize);
+		String title = DescriptionUnitHelper.getLabelForMarkupElement(block, maxSize);
+		if (title == null || title.length() < 2) {
+			if (element instanceof IntentDocument) {
+				title = "Document";
+			} else if (element.eContainer() instanceof IntentDocument) {
+				title = "Untitled Chapter";
+			} else {
+				title = "Untitled Section";
+			}
+		}
+		return title;
 	}
 }