394020: Simplify Review State handling

Change-Id: Ifa2f1344acaabe1bcb6fc1fdc67dabcf1895048b

14 files changed, 10 insertions, 469 deletions

diff --git a/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateChange_state_RequirementReviewState.gif b/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateChange_state_RequirementReviewState.gif
deleted file mode 100644
index 7d5f08b73..000000000
--- a/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateChange_state_RequirementReviewState.gif
+++ /dev/null
diff --git a/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateChange_state_SimpleReviewState.gif b/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateChange_state_SimpleReviewState.gif
deleted file mode 100644
index 95a3e4a4a..000000000
--- a/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateChange_state_SimpleReviewState.gif
+++ /dev/null
diff --git a/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateRepository_reviewStates_RequirementReviewState.gif b/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateRepository_reviewStates_RequirementReviewState.gif
deleted file mode 100644
index af6664b5d..000000000
--- a/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateRepository_reviewStates_RequirementReviewState.gif
+++ /dev/null
diff --git a/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateRepository_reviewStates_SimpleReviewState.gif b/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateRepository_reviewStates_SimpleReviewState.gif
deleted file mode 100644
index 3d5c10a26..000000000
--- a/org.eclipse.mylyn.reviews.edit/icons/full/ctool16/CreateRepository_reviewStates_SimpleReviewState.gif
+++ /dev/null
diff --git a/org.eclipse.mylyn.reviews.edit/icons/full/obj16/RequirementReviewState.gif b/org.eclipse.mylyn.reviews.edit/icons/full/obj16/RequirementReviewState.gif
deleted file mode 100644
index ef56c1408..000000000
--- a/org.eclipse.mylyn.reviews.edit/icons/full/obj16/RequirementReviewState.gif
+++ /dev/null
diff --git a/org.eclipse.mylyn.reviews.edit/icons/full/obj16/SimpleReviewState.gif b/org.eclipse.mylyn.reviews.edit/icons/full/obj16/SimpleReviewState.gif
deleted file mode 100644
index 4365960a0..000000000
--- a/org.eclipse.mylyn.reviews.edit/icons/full/obj16/SimpleReviewState.gif
+++ /dev/null
diff --git a/org.eclipse.mylyn.reviews.edit/plugin.properties b/org.eclipse.mylyn.reviews.edit/plugin.properties
index e9c674727..471b8b2f2 100644
--- a/org.eclipse.mylyn.reviews.edit/plugin.properties
+++ b/org.eclipse.mylyn.reviews.edit/plugin.properties
@@ -131,3 +131,9 @@ _UI_RequirementStatus_Closed_literal = CLOSED
 _UI_RequirementStatus_NotSatisfied_literal = NOT_SATISFIED
 _UI_RequirementStatus_Rejected_literal = REJECTED
 _UI_RequirementStatus_Error_literal = ERROR
+_UI_CommonReviewState_type = Common Review State
+_UI_CommonReviewState_status_feature = Status
+_UI_ReviewStatus_New_literal = NEW
+_UI_ReviewStatus_Submitted_literal = SUBMITTED
+_UI_ReviewStatus_Merged_literal = MERGED
+_UI_ReviewStatus_Abandoned_literal = ABANDONED
diff --git a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ChangeItemProvider.java b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ChangeItemProvider.java
index 9f3bfe2d0..19218c944 100644
--- a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ChangeItemProvider.java
+++ b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ChangeItemProvider.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.mylyn.reviews.core.model.IChange;
 import org.eclipse.mylyn.reviews.core.model.IReviewsFactory;
 
+import org.eclipse.mylyn.reviews.core.model.ReviewStatus;
 import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 
 /**
@@ -266,11 +267,7 @@ public class ChangeItemProvider extends ItemProviderAdapter implements IEditingD
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.CHANGE__STATE,
-				IReviewsFactory.INSTANCE.createRequirementReviewState()));
-
-		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.CHANGE__STATE,
-				IReviewsFactory.INSTANCE.createSimpleReviewState()));
+		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.CHANGE__STATE, ReviewStatus.NEW));
 	}
 
 	/**
diff --git a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/RepositoryItemProvider.java b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/RepositoryItemProvider.java
index 1014b9803..b0497feb6 100644
--- a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/RepositoryItemProvider.java
+++ b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/RepositoryItemProvider.java
@@ -149,7 +149,6 @@ public class RepositoryItemProvider extends ItemProviderAdapter implements IEdit
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(ReviewsPackage.Literals.REPOSITORY__APPROVAL_TYPES);
-			childrenFeatures.add(ReviewsPackage.Literals.REPOSITORY__REVIEW_STATES);
 			childrenFeatures.add(ReviewsPackage.Literals.REPOSITORY__REVIEWS);
 			childrenFeatures.add(ReviewsPackage.Literals.REPOSITORY__USERS);
 		}
@@ -210,7 +209,6 @@ public class RepositoryItemProvider extends ItemProviderAdapter implements IEdit
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		case ReviewsPackage.REPOSITORY__APPROVAL_TYPES:
-		case ReviewsPackage.REPOSITORY__REVIEW_STATES:
 		case ReviewsPackage.REPOSITORY__REVIEWS:
 		case ReviewsPackage.REPOSITORY__USERS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -232,12 +230,6 @@ public class RepositoryItemProvider extends ItemProviderAdapter implements IEdit
 		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.REPOSITORY__APPROVAL_TYPES,
 				IReviewsFactory.INSTANCE.createApprovalType()));
 
-		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.REPOSITORY__REVIEW_STATES,
-				IReviewsFactory.INSTANCE.createRequirementReviewState()));
-
-		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.REPOSITORY__REVIEW_STATES,
-				IReviewsFactory.INSTANCE.createSimpleReviewState()));
-
 		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.REPOSITORY__REVIEWS,
 				IReviewsFactory.INSTANCE.createReview()));
 
diff --git a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/RequirementReviewStateItemProvider.java b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/RequirementReviewStateItemProvider.java
deleted file mode 100644
index 20d1c107c..000000000
--- a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/RequirementReviewStateItemProvider.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Copyright (c) 2013 Tasktop Technologies and others.
- * 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:
- *     Tasktop Technologies - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.edit.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.reviews.core.model.IRequirementReviewState;
-
-import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.reviews.core.model.IRequirementReviewState} object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class RequirementReviewStateItemProvider extends ReviewStateItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public RequirementReviewStateItemProvider(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);
-
-			addStatusPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Status feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addStatusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_RequirementReviewState_status_feature"), //$NON-NLS-1$
-				getString(
-						"_UI_PropertyDescriptor_description", "_UI_RequirementReviewState_status_feature", "_UI_RequirementReviewState_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ReviewsPackage.Literals.REQUIREMENT_REVIEW_STATE__STATUS, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns RequirementReviewState.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RequirementReviewState")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((IRequirementReviewState) object).getDescriptor();
-		return label == null || label.length() == 0 ? getString("_UI_RequirementReviewState_type") : //$NON-NLS-1$
-				getString("_UI_RequirementReviewState_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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(IRequirementReviewState.class)) {
-		case ReviewsPackage.REQUIREMENT_REVIEW_STATE__STATUS:
-			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/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewItemProvider.java b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewItemProvider.java
index edd0b5ee3..71072686e 100644
--- a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewItemProvider.java
+++ b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.mylyn.reviews.core.model.IReview;
 import org.eclipse.mylyn.reviews.core.model.IReviewsFactory;
+import org.eclipse.mylyn.reviews.core.model.ReviewStatus;
 import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
 
 /**
@@ -270,11 +271,7 @@ public class ReviewItemProvider extends CommentContainerItemProvider implements
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.CHANGE__STATE,
-				IReviewsFactory.INSTANCE.createRequirementReviewState()));
-
-		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.CHANGE__STATE,
-				IReviewsFactory.INSTANCE.createSimpleReviewState()));
+		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.CHANGE__STATE, ReviewStatus.NEW));
 
 		newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.REVIEW__SETS,
 				IReviewsFactory.INSTANCE.createReviewItemSet()));
diff --git a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewStateItemProvider.java b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewStateItemProvider.java
deleted file mode 100644
index 8214fe275..000000000
--- a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewStateItemProvider.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Copyright (c) 2013 Tasktop Technologies and others.
- * 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:
- *     Tasktop Technologies - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.edit.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.reviews.core.model.IReviewState;
-import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.reviews.core.model.IReviewState} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ReviewStateItemProvider 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 ReviewStateItemProvider(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);
-
-			addDescriptorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Descriptor feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDescriptorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ReviewState_descriptor_feature"), //$NON-NLS-1$
-				getString(
-						"_UI_PropertyDescriptor_description", "_UI_ReviewState_descriptor_feature", "_UI_ReviewState_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ReviewsPackage.Literals.REVIEW_STATE__DESCRIPTOR, false, 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 = ((IReviewState) object).getDescriptor();
-		return label == null || label.length() == 0 ? getString("_UI_ReviewState_type") : //$NON-NLS-1$
-				getString("_UI_ReviewState_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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(IReviewState.class)) {
-		case ReviewsPackage.REVIEW_STATE__DESCRIPTOR:
-			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 ReviewsEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewsItemProviderAdapterFactory.java b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewsItemProviderAdapterFactory.java
index 54a137ff5..bbb551c0a 100644
--- a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewsItemProviderAdapterFactory.java
+++ b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/ReviewsItemProviderAdapterFactory.java
@@ -442,53 +442,6 @@ public class ReviewsItemProviderAdapterFactory extends ReviewsAdapterFactory imp
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.mylyn.reviews.core.model.IRequirementReviewState} instances. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected RequirementReviewStateItemProvider requirementReviewStateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.reviews.core.model.IRequirementReviewState}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createRequirementReviewStateAdapter() {
-		if (requirementReviewStateItemProvider == null) {
-			requirementReviewStateItemProvider = new RequirementReviewStateItemProvider(this);
-		}
-
-		return requirementReviewStateItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.mylyn.reviews.core.model.ISimpleReviewState}
-	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected SimpleReviewStateItemProvider simpleReviewStateItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.mylyn.reviews.core.model.ISimpleReviewState}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createSimpleReviewStateAdapter() {
-		if (simpleReviewStateItemProvider == null) {
-			simpleReviewStateItemProvider = new SimpleReviewStateItemProvider(this);
-		}
-
-		return simpleReviewStateItemProvider;
-	}
-
-	/**
 	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -614,10 +567,6 @@ public class ReviewsItemProviderAdapterFactory extends ReviewsAdapterFactory imp
 			requirementEntryItemProvider.dispose();
 		if (reviewRequirementsMapItemProvider != null)
 			reviewRequirementsMapItemProvider.dispose();
-		if (requirementReviewStateItemProvider != null)
-			requirementReviewStateItemProvider.dispose();
-		if (simpleReviewStateItemProvider != null)
-			simpleReviewStateItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/SimpleReviewStateItemProvider.java b/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/SimpleReviewStateItemProvider.java
deleted file mode 100644
index cc2568448..000000000
--- a/org.eclipse.mylyn.reviews.edit/src/org/eclipse/mylyn/reviews/edit/provider/SimpleReviewStateItemProvider.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Copyright (c) 2013 Tasktop Technologies and others.
- * 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:
- *     Tasktop Technologies - initial API and implementation
- */
-package org.eclipse.mylyn.reviews.edit.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.reviews.core.model.ISimpleReviewState;
-
-import org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.mylyn.reviews.core.model.ISimpleReviewState} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class SimpleReviewStateItemProvider extends ReviewStateItemProvider implements IEditingDomainItemProvider,
-		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public SimpleReviewStateItemProvider(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);
-		}
-		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_SimpleReviewState_name_feature"), //$NON-NLS-1$
-				getString(
-						"_UI_PropertyDescriptor_description", "_UI_SimpleReviewState_name_feature", "_UI_SimpleReviewState_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ReviewsPackage.Literals.SIMPLE_REVIEW_STATE__NAME, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns SimpleReviewState.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SimpleReviewState")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ISimpleReviewState) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_SimpleReviewState_type") : //$NON-NLS-1$
-				getString("_UI_SimpleReviewState_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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(ISimpleReviewState.class)) {
-		case ReviewsPackage.SIMPLE_REVIEW_STATE__NAME:
-			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);
-	}
-
-}