diff options
| author | Miles Parker | 2013-06-17 19:50:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-06-19 18:09:05 +0000 |
| commit | 0cf8b19b33b7db74f94182a950304b5fbe01730f (patch) | |
| tree | 23de62cf39863ec331ca73f34feb4180f533ab9c /org.eclipse.mylyn.reviews.core/src/org | |
| parent | ba5d8f080a5cb7485f21cac2ad7a70c08068156a (diff) | |
| download | org.eclipse.mylyn.reviews-0cf8b19b33b7db74f94182a950304b5fbe01730f.tar.gz org.eclipse.mylyn.reviews-0cf8b19b33b7db74f94182a950304b5fbe01730f.tar.xz org.eclipse.mylyn.reviews-0cf8b19b33b7db74f94182a950304b5fbe01730f.zip | |
410934: [regression] Draft review cannot be opened, synchronization
failed (force build)
Change-Id: I2a827c1b74e33f6f823211bc4deed171fc4748ed
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=410934
Diffstat (limited to 'org.eclipse.mylyn.reviews.core/src/org')
3 files changed, 29 insertions, 4 deletions
diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ReviewStatus.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ReviewStatus.java index e125cc005..4695728fa 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ReviewStatus.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ReviewStatus.java @@ -56,7 +56,15 @@ public enum ReviewStatus implements InternalReviewStatus { * @generated * @ordered */ - ABANDONED(3, "Abandoned", "ABANDONED"); //$NON-NLS-1$ //$NON-NLS-2$ + ABANDONED(3, "Abandoned", "ABANDONED"), /** + * The '<em><b>Draft</b></em>' literal object. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #DRAFT_VALUE + * @generated + * @ordered + */ + DRAFT(4, "Draft", "DRAFT"); //$NON-NLS-1$ //$NON-NLS-2$ /** * The '<em><b>New</b></em>' literal value. <!-- begin-user-doc --> @@ -115,11 +123,25 @@ public enum ReviewStatus implements InternalReviewStatus { public static final int ABANDONED_VALUE = 3; /** + * The '<em><b>Draft</b></em>' literal value. <!-- begin-user-doc --> + * <p> + * If the meaning of '<em><b>Draft</b></em>' literal object isn't clear, there really should be more of a + * description here... + * </p> + * <!-- end-user-doc --> + * + * @see #DRAFT + * @generated + * @ordered + */ + public static final int DRAFT_VALUE = 4; + + /** * An array of all the '<em><b>Review Status</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - private static final ReviewStatus[] VALUES_ARRAY = new ReviewStatus[] { NEW, SUBMITTED, MERGED, ABANDONED, }; + private static final ReviewStatus[] VALUES_ARRAY = new ReviewStatus[] { NEW, SUBMITTED, MERGED, ABANDONED, DRAFT, }; /** * A public read-only list of all the '<em><b>Review Status</b></em>' enumerators. <!-- begin-user-doc --> <!-- @@ -177,6 +199,8 @@ public enum ReviewStatus implements InternalReviewStatus { return MERGED; case ABANDONED_VALUE: return ABANDONED; + case DRAFT_VALUE: + return DRAFT; } return null; } diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/spi/remote/emf/AbstractRemoteEmfFactory.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/spi/remote/emf/AbstractRemoteEmfFactory.java index 14c186588..62aabc1e2 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/spi/remote/emf/AbstractRemoteEmfFactory.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/spi/remote/emf/AbstractRemoteEmfFactory.java @@ -193,7 +193,7 @@ public abstract class AbstractRemoteEmfFactory<EParentObjectType extends EObject } return consumer; } - + class ObjectFinder implements Runnable { EObjectType foundObject; @@ -224,7 +224,7 @@ public abstract class AbstractRemoteEmfFactory<EParentObjectType extends EObject } } } - + protected EObjectType open(EParentObjectType parentObject, LocalKeyType localKey) { ObjectFinder finder = new ObjectFinder(parentObject, localKey); getService().modelExec(finder, true); diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsPackage.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsPackage.java index 55544e6e2..73a41f262 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsPackage.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsPackage.java @@ -3647,6 +3647,7 @@ public class ReviewsPackage extends EPackageImpl { addEEnumLiteral(reviewStatusEEnum, ReviewStatus.SUBMITTED); addEEnumLiteral(reviewStatusEEnum, ReviewStatus.MERGED); addEEnumLiteral(reviewStatusEEnum, ReviewStatus.ABANDONED); + addEEnumLiteral(reviewStatusEEnum, ReviewStatus.DRAFT); // Initialize data types initEDataType(iFileRevisionEDataType, IFileRevision.class, |