diff options
author | Miles Parker | 2015-01-21 19:22:02 +0000 |
---|---|---|
committer | Sam Davis | 2015-01-22 21:38:59 +0000 |
commit | a77d15f6db542c7c4d1cf9599e5f630a408199b6 (patch) | |
tree | 91ba68cb9ba8a302b4a7c288b3eddc045f430584 /org.eclipse.mylyn.reviews.core | |
parent | 715e2076cdf282244f1363d51476ff95be9e4909 (diff) | |
download | org.eclipse.mylyn.reviews-a77d15f6db542c7c4d1cf9599e5f630a408199b6.tar.gz org.eclipse.mylyn.reviews-a77d15f6db542c7c4d1cf9599e5f630a408199b6.tar.xz org.eclipse.mylyn.reviews-a77d15f6db542c7c4d1cf9599e5f630a408199b6.zip |
393788: add parent commits to the ecore model
Change-Id: I7602045f73a12e84ae53747d25798a9b92c35612
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=393788
Signed-off-by: Sam Davis <sam.davis@tasktop.com>
Diffstat (limited to 'org.eclipse.mylyn.reviews.core')
16 files changed, 618 insertions, 25 deletions
diff --git a/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.ui.prefs index e2834b278..ae6680aaf 100644 --- a/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.ui.prefs +++ b/org.eclipse.mylyn.reviews.core/.settings/org.eclipse.jdt.ui.prefs @@ -17,7 +17,7 @@ sp_cleanup.add_missing_annotations=true sp_cleanup.add_missing_deprecated_annotations=true sp_cleanup.add_missing_methods=false sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations=false sp_cleanup.add_serial_version_id=false sp_cleanup.always_use_blocks=true sp_cleanup.always_use_parentheses_in_expressions=false diff --git a/org.eclipse.mylyn.reviews.core/model/reviews.ecore b/org.eclipse.mylyn.reviews.core/model/reviews.ecore index f5bec44f5..8ed421add 100644 --- a/org.eclipse.mylyn.reviews.core/model/reviews.ecore +++ b/org.eclipse.mylyn.reviews.core/model/reviews.ecore @@ -104,6 +104,8 @@ defaultValueLiteral=""/> <eStructuralFeatures xsi:type="ecore:EReference" name="parentReview" lowerBound="1" eType="#//Review" transient="true" eOpposite="#//Review/sets"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="parentCommits" upperBound="-1" + eType="#//Commit" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="LineLocation" eSuperTypes="#//Location"> <eStructuralFeatures xsi:type="ecore:EReference" name="ranges" upperBound="-1" @@ -185,4 +187,8 @@ serializable="false"/> <eClassifiers xsi:type="ecore:EDataType" name="TaskRepository" instanceClassName="org.eclipse.mylyn.tasks.core.TaskRepository" serializable="false"/> + <eClassifiers xsi:type="ecore:EClass" name="Commit"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="subject" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> </ecore:EPackage> diff --git a/org.eclipse.mylyn.reviews.core/plugin.xml b/org.eclipse.mylyn.reviews.core/plugin.xml index ae0190ec7..d292fd17c 100644 --- a/org.eclipse.mylyn.reviews.core/plugin.xml +++ b/org.eclipse.mylyn.reviews.core/plugin.xml @@ -21,4 +21,11 @@ genModel="model/reviews.genmodel"/> </extension> + <extension point="org.eclipse.emf.ecore.extension_parser"> + <!-- @generated reviews --> + <parser + type="reviews" + class="org.eclipse.mylyn.reviews.internal.core.model.ReviewsResourceFactory"/> + </extension> + </plugin> diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ICommit.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ICommit.java new file mode 100644 index 000000000..f7b54fc30 --- /dev/null +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/ICommit.java @@ -0,0 +1,77 @@ +/** + * 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.core.model; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> A representation of the model object '<em><b>Commit</b></em>'. <!-- end-user-doc --> + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.mylyn.reviews.core.model.ICommit#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.mylyn.reviews.core.model.ICommit#getSubject <em>Subject</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public interface ICommit extends EObject { + /** + * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Id</em>' attribute. + * @see #setId(String) + * @generated + */ + String getId(); + + /** + * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.ICommit#getId <em>Id</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Id</em>' attribute. + * @see #getId() + * @generated + */ + void setId(String value); + + /** + * Returns the value of the '<em><b>Subject</b></em>' attribute. <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Subject</em>' attribute isn't clear, there really should be more of a description + * here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Subject</em>' attribute. + * @see #setSubject(String) + * @generated + */ + String getSubject(); + + /** + * Sets the value of the '{@link org.eclipse.mylyn.reviews.core.model.ICommit#getSubject <em>Subject</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Subject</em>' attribute. + * @see #getSubject() + * @generated + */ + void setSubject(String value); + +} // ICommit diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItemSet.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItemSet.java index 5e2dff6a9..a8f8fb8d4 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItemSet.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewItemSet.java @@ -20,6 +20,7 @@ import java.util.List; * <li>{@link org.eclipse.mylyn.reviews.core.model.IReviewItemSet#getItems <em>Items</em>}</li> * <li>{@link org.eclipse.mylyn.reviews.core.model.IReviewItemSet#getRevision <em>Revision</em>}</li> * <li>{@link org.eclipse.mylyn.reviews.core.model.IReviewItemSet#getParentReview <em>Parent Review</em>}</li> + * <li>{@link org.eclipse.mylyn.reviews.core.model.IReviewItemSet#getParentCommits <em>Parent Commits</em>}</li> * </ul> * </p> * @@ -95,4 +96,18 @@ public interface IReviewItemSet extends IReviewItem, IDated { */ void setParentReview(IReview value); + /** + * Returns the value of the '<em><b>Parent Commits</b></em>' containment reference list. The list contents are of + * type {@link org.eclipse.mylyn.reviews.core.model.ICommit}. <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Parent Commits</em>' containment reference list isn't clear, there really should be + * more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Parent Commits</em>' containment reference list. + * @generated + */ + List<ICommit> getParentCommits(); + } // IReviewItemSet diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewerEntry.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewerEntry.java index 41dea7a6c..44029409a 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewerEntry.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewerEntry.java @@ -10,8 +10,6 @@ */ package org.eclipse.mylyn.reviews.core.model; -import java.util.List; - import java.util.Map; import org.eclipse.emf.ecore.EObject; diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewsFactory.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewsFactory.java index 51650876e..af943a9f5 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewsFactory.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/model/IReviewsFactory.java @@ -113,6 +113,14 @@ public interface IReviewsFactory { IRequirementEntry createRequirementEntry(); /** + * Returns a new object of class '<em>Commit</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return a new object of class '<em>Commit</em>'. + * @generated0 + */ + ICommit createCommit(); + + /** * Returns a new object of class '<em>Approval Type</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Approval Type</em>'. diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/spi/remote/JobRemoteService.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/spi/remote/JobRemoteService.java index 976b27e48..298c01405 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/spi/remote/JobRemoteService.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/core/spi/remote/JobRemoteService.java @@ -71,6 +71,7 @@ public class JobRemoteService extends AbstractRemoteService { @Override public void done(final IJobChangeEvent event) { modelExec(new Runnable() { + @Override public void run() { final IStatus result = event.getResult(); if (result.isOK()) { @@ -91,6 +92,7 @@ public class JobRemoteService extends AbstractRemoteService { return; } modelExec(new Runnable() { + @Override public void run() { process.applyModel(force); process.notifyDone(Status.OK_STATUS); diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Commit.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Commit.java new file mode 100644 index 000000000..cc9823ca4 --- /dev/null +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/Commit.java @@ -0,0 +1,222 @@ +/** + * 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.internal.core.model; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.eclipse.mylyn.reviews.core.model.ICommit; + +/** + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Commit</b></em>'. <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.mylyn.reviews.internal.core.model.Commit#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.mylyn.reviews.internal.core.model.Commit#getSubject <em>Subject</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class Commit extends EObjectImpl implements ICommit { + /** + * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #getId() + * @generated + * @ordered + */ + protected static final String ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see #getId() + * @generated + * @ordered + */ + protected String id = ID_EDEFAULT; + + /** + * The default value of the '{@link #getSubject() <em>Subject</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getSubject() + * @generated + * @ordered + */ + protected static final String SUBJECT_EDEFAULT = null; + + /** + * The cached value of the '{@link #getSubject() <em>Subject</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getSubject() + * @generated + * @ordered + */ + protected String subject = SUBJECT_EDEFAULT; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected Commit() { + super(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return ReviewsPackage.Literals.COMMIT; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public String getId() { + return id; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void setId(String newId) { + String oldId = id; + id = newId; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, ReviewsPackage.COMMIT__ID, oldId, id)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public String getSubject() { + return subject; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public void setSubject(String newSubject) { + String oldSubject = subject; + subject = newSubject; + if (eNotificationRequired()) { + eNotify(new ENotificationImpl(this, Notification.SET, ReviewsPackage.COMMIT__SUBJECT, oldSubject, subject)); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case ReviewsPackage.COMMIT__ID: + return getId(); + case ReviewsPackage.COMMIT__SUBJECT: + return getSubject(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case ReviewsPackage.COMMIT__ID: + setId((String) newValue); + return; + case ReviewsPackage.COMMIT__SUBJECT: + setSubject((String) newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case ReviewsPackage.COMMIT__ID: + setId(ID_EDEFAULT); + return; + case ReviewsPackage.COMMIT__SUBJECT: + setSubject(SUBJECT_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case ReviewsPackage.COMMIT__ID: + return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); + case ReviewsPackage.COMMIT__SUBJECT: + return SUBJECT_EDEFAULT == null ? subject != null : !SUBJECT_EDEFAULT.equals(subject); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) { + return super.toString(); + } + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (id: "); //$NON-NLS-1$ + result.append(id); + result.append(", subject: "); //$NON-NLS-1$ + result.append(subject); + result.append(')'); + return result.toString(); + } + +} //Commit diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItemSet.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItemSet.java index c4236aaf8..1f71725b6 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItemSet.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewItemSet.java @@ -21,11 +21,13 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EObjectEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.mylyn.reviews.core.model.IComment; +import org.eclipse.mylyn.reviews.core.model.ICommit; import org.eclipse.mylyn.reviews.core.model.IDated; import org.eclipse.mylyn.reviews.core.model.IFileItem; import org.eclipse.mylyn.reviews.core.model.IReview; @@ -120,6 +122,16 @@ public class ReviewItemSet extends ReviewItem implements IReviewItemSet { protected String revision = REVISION_EDEFAULT; /** + * The cached value of the '{@link #getParentCommits() <em>Parent Commits</em>}' containment reference list. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see #getParentCommits() + * @generated + * @ordered + */ + protected EList<ICommit> parentCommits; + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -216,7 +228,6 @@ public class ReviewItemSet extends ReviewItem implements IReviewItemSet { * * @generated NOT */ - @Override public List<IComment> getAllComments() { List<IComment> all = new ArrayList<IComment>(getComments()); for (IReviewItem item : getItems()) { @@ -318,6 +329,19 @@ public class ReviewItemSet extends ReviewItem implements IReviewItemSet { * * @generated */ + public List<ICommit> getParentCommits() { + if (parentCommits == null) { + parentCommits = new EObjectContainmentEList.Resolving<ICommit>(ICommit.class, this, + ReviewsPackage.REVIEW_ITEM_SET__PARENT_COMMITS); + } + return parentCommits; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ @SuppressWarnings("unchecked") @Override public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { @@ -345,6 +369,8 @@ public class ReviewItemSet extends ReviewItem implements IReviewItemSet { return ((InternalEList<?>) getItems()).basicRemove(otherEnd, msgs); case ReviewsPackage.REVIEW_ITEM_SET__PARENT_REVIEW: return basicSetParentReview(null, msgs); + case ReviewsPackage.REVIEW_ITEM_SET__PARENT_COMMITS: + return ((InternalEList<?>) getParentCommits()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -384,6 +410,8 @@ public class ReviewItemSet extends ReviewItem implements IReviewItemSet { return getParentReview(); } return basicGetParentReview(); + case ReviewsPackage.REVIEW_ITEM_SET__PARENT_COMMITS: + return getParentCommits(); } return super.eGet(featureID, resolve, coreType); } @@ -413,6 +441,10 @@ public class ReviewItemSet extends ReviewItem implements IReviewItemSet { case ReviewsPackage.REVIEW_ITEM_SET__PARENT_REVIEW: setParentReview((IReview) newValue); return; + case ReviewsPackage.REVIEW_ITEM_SET__PARENT_COMMITS: + getParentCommits().clear(); + getParentCommits().addAll((Collection<? extends ICommit>) newValue); + return; } super.eSet(featureID, newValue); } @@ -440,6 +472,9 @@ public class ReviewItemSet extends ReviewItem implements IReviewItemSet { case ReviewsPackage.REVIEW_ITEM_SET__PARENT_REVIEW: setParentReview((IReview) null); return; + case ReviewsPackage.REVIEW_ITEM_SET__PARENT_COMMITS: + getParentCommits().clear(); + return; } super.eUnset(featureID); } @@ -456,14 +491,16 @@ public class ReviewItemSet extends ReviewItem implements IReviewItemSet { return CREATION_DATE_EDEFAULT == null ? creationDate != null : !CREATION_DATE_EDEFAULT.equals(creationDate); case ReviewsPackage.REVIEW_ITEM_SET__MODIFICATION_DATE: return MODIFICATION_DATE_EDEFAULT == null - ? modificationDate != null - : !MODIFICATION_DATE_EDEFAULT.equals(modificationDate); + ? modificationDate != null + : !MODIFICATION_DATE_EDEFAULT.equals(modificationDate); case ReviewsPackage.REVIEW_ITEM_SET__ITEMS: return items != null && !items.isEmpty(); case ReviewsPackage.REVIEW_ITEM_SET__REVISION: return REVISION_EDEFAULT == null ? revision != null : !REVISION_EDEFAULT.equals(revision); case ReviewsPackage.REVIEW_ITEM_SET__PARENT_REVIEW: return basicGetParentReview() != null; + case ReviewsPackage.REVIEW_ITEM_SET__PARENT_COMMITS: + return parentCommits != null && !parentCommits.isEmpty(); } return super.eIsSet(featureID); } diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewRequirementsMap.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewRequirementsMap.java index 8697e7a0c..631127883 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewRequirementsMap.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewRequirementsMap.java @@ -370,7 +370,7 @@ public class ReviewRequirementsMap extends EObjectImpl implements BasicEMap.Entr EObject container = eContainer(); return container == null ? null - : (EMap<IApprovalType, IRequirementEntry>) container.eGet(eContainmentFeature()); + : (EMap<IApprovalType, IRequirementEntry>) container.eGet(eContainmentFeature()); } } //ReviewRequirementsMap diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsAdapterFactory.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsAdapterFactory.java index 102edf65e..4260ebf21 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsAdapterFactory.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsAdapterFactory.java @@ -10,16 +10,31 @@ */ package org.eclipse.mylyn.reviews.internal.core.model; -import java.util.List; import java.util.Map; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - -import org.eclipse.mylyn.reviews.core.model.*; +import org.eclipse.mylyn.reviews.core.model.IApprovalType; +import org.eclipse.mylyn.reviews.core.model.IChange; +import org.eclipse.mylyn.reviews.core.model.IComment; +import org.eclipse.mylyn.reviews.core.model.ICommentContainer; +import org.eclipse.mylyn.reviews.core.model.ICommit; +import org.eclipse.mylyn.reviews.core.model.IDated; +import org.eclipse.mylyn.reviews.core.model.IFileItem; +import org.eclipse.mylyn.reviews.core.model.IFileVersion; +import org.eclipse.mylyn.reviews.core.model.IIndexed; +import org.eclipse.mylyn.reviews.core.model.ILineLocation; +import org.eclipse.mylyn.reviews.core.model.ILineRange; +import org.eclipse.mylyn.reviews.core.model.ILocation; +import org.eclipse.mylyn.reviews.core.model.IRepository; +import org.eclipse.mylyn.reviews.core.model.IRequirementEntry; +import org.eclipse.mylyn.reviews.core.model.IReview; +import org.eclipse.mylyn.reviews.core.model.IReviewItem; +import org.eclipse.mylyn.reviews.core.model.IReviewItemSet; +import org.eclipse.mylyn.reviews.core.model.IReviewerEntry; +import org.eclipse.mylyn.reviews.core.model.IUser; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> @@ -178,6 +193,11 @@ public class ReviewsAdapterFactory extends AdapterFactoryImpl { } @Override + public Adapter caseCommit(ICommit object) { + return createCommitAdapter(); + } + + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); } @@ -456,6 +476,19 @@ public class ReviewsAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.mylyn.reviews.core.model.ICommit + * <em>Commit</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore + * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * + * @return the new adapter. + * @see org.eclipse.mylyn.reviews.core.model.ICommit + * @generated + */ + public Adapter createCommitAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>User Approvals Map</em>}'. <!-- * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsFactory.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsFactory.java index 0ac1e49e0..e09145a14 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsFactory.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsFactory.java @@ -10,7 +10,6 @@ */ package org.eclipse.mylyn.reviews.internal.core.model; -import java.util.List; import java.util.Map; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -43,7 +42,7 @@ public class ReviewsFactory extends EFactoryImpl implements IReviewsFactory { */ public static ReviewsFactory init() { try { - ReviewsFactory theReviewsFactory = (ReviewsFactory) EPackage.Registry.INSTANCE.getEFactory("http://eclipse.org/mylyn/reviews/core/1.0"); //$NON-NLS-1$ + ReviewsFactory theReviewsFactory = (ReviewsFactory) EPackage.Registry.INSTANCE.getEFactory(ReviewsPackage.eNS_URI); if (theReviewsFactory != null) { return theReviewsFactory; } @@ -102,6 +101,8 @@ public class ReviewsFactory extends EFactoryImpl implements IReviewsFactory { return createRequirementEntry(); case ReviewsPackage.REVIEW_REQUIREMENTS_MAP: return (EObject) createReviewRequirementsMap(); + case ReviewsPackage.COMMIT: + return createCommit(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -286,10 +287,19 @@ public class ReviewsFactory extends EFactoryImpl implements IReviewsFactory { * * @generated */ + public ICommit createCommit() { + Commit commit = new Commit(); + return commit; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public RequirementStatus createRequirementStatusFromString(EDataType eDataType, String initialValue) { RequirementStatus result = RequirementStatus.get(initialValue); - if (result == null) - { + if (result == null) { throw new IllegalArgumentException( "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } @@ -312,8 +322,7 @@ public class ReviewsFactory extends EFactoryImpl implements IReviewsFactory { */ public ReviewStatus createReviewStatusFromString(EDataType eDataType, String initialValue) { ReviewStatus result = ReviewStatus.get(initialValue); - if (result == null) - { + if (result == null) { throw new IllegalArgumentException( "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } 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 bbc344248..818803af9 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 @@ -25,6 +25,7 @@ import org.eclipse.mylyn.reviews.core.model.IApprovalType; import org.eclipse.mylyn.reviews.core.model.IChange; import org.eclipse.mylyn.reviews.core.model.IComment; import org.eclipse.mylyn.reviews.core.model.ICommentContainer; +import org.eclipse.mylyn.reviews.core.model.ICommit; import org.eclipse.mylyn.reviews.core.model.IDated; import org.eclipse.mylyn.reviews.core.model.IFileItem; import org.eclipse.mylyn.reviews.core.model.IFileVersion; @@ -1104,13 +1105,22 @@ public class ReviewsPackage extends EPackageImpl { public static final int REVIEW_ITEM_SET__PARENT_REVIEW = REVIEW_ITEM_FEATURE_COUNT + 4; /** + * The feature id for the '<em><b>Parent Commits</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + * @ordered + */ + public static final int REVIEW_ITEM_SET__PARENT_COMMITS = REVIEW_ITEM_FEATURE_COUNT + 5; + + /** * The number of structural features of the '<em>Review Item Set</em>' class. <!-- begin-user-doc --> <!-- * end-user-doc --> * * @generated * @ordered */ - public static final int REVIEW_ITEM_SET_FEATURE_COUNT = REVIEW_ITEM_FEATURE_COUNT + 5; + public static final int REVIEW_ITEM_SET_FEATURE_COUNT = REVIEW_ITEM_FEATURE_COUNT + 6; /** * The meta object id for the '{@link org.eclipse.mylyn.reviews.internal.core.model.LineLocation @@ -1554,6 +1564,40 @@ public class ReviewsPackage extends EPackageImpl { public static final int REVIEW_REQUIREMENTS_MAP_FEATURE_COUNT = 2; /** + * The meta object id for the '{@link org.eclipse.mylyn.reviews.internal.core.model.Commit <em>Commit</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.mylyn.reviews.internal.core.model.Commit + * @see org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage#getCommit() + * @generated + */ + public static final int COMMIT = 21; + + /** + * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + public static final int COMMIT__ID = 0; + + /** + * The feature id for the '<em><b>Subject</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + public static final int COMMIT__SUBJECT = 1; + + /** + * The number of structural features of the '<em>Commit</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + public static final int COMMIT_FEATURE_COUNT = 2; + + /** * The meta object id for the '{@link org.eclipse.mylyn.reviews.core.model.RequirementStatus * <em>Requirement Status</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -1561,7 +1605,7 @@ public class ReviewsPackage extends EPackageImpl { * @see org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage#getRequirementStatus() * @generated */ - public static final int REQUIREMENT_STATUS = 21; + public static final int REQUIREMENT_STATUS = 22; /** * The meta object id for the '{@link org.eclipse.mylyn.reviews.core.model.ReviewStatus <em>Review Status</em>}' @@ -1571,7 +1615,7 @@ public class ReviewsPackage extends EPackageImpl { * @see org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage#getReviewStatus() * @generated */ - public static final int REVIEW_STATUS = 22; + public static final int REVIEW_STATUS = 23; /** * The meta object id for the '<em>IFile Revision</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -1580,7 +1624,7 @@ public class ReviewsPackage extends EPackageImpl { * @see org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage#getIFileRevision() * @generated */ - public static final int IFILE_REVISION = 23; + public static final int IFILE_REVISION = 24; /** * The meta object id for the '<em>Task Repository</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -1589,7 +1633,7 @@ public class ReviewsPackage extends EPackageImpl { * @see org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage#getTaskRepository() * @generated */ - public static final int TASK_REPOSITORY = 24; + public static final int TASK_REPOSITORY = 25; /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -1743,6 +1787,13 @@ public class ReviewsPackage extends EPackageImpl { * * @generated */ + private EClass commitEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ private EEnum requirementStatusEEnum = null; /** @@ -1810,7 +1861,7 @@ public class ReviewsPackage extends EPackageImpl { // Obtain or create and register package ReviewsPackage theReviewsPackage = (ReviewsPackage) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReviewsPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) - : new ReviewsPackage()); + : new ReviewsPackage()); isInited = true; @@ -2610,6 +2661,20 @@ public class ReviewsPackage extends EPackageImpl { } /** + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.mylyn.reviews.core.model.IReviewItemSet#getParentCommits <em>Parent Commits</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the containment reference list '<em>Parent Commits</em>'. + * @see org.eclipse.mylyn.reviews.core.model.IReviewItemSet#getParentCommits() + * @see #getReviewItemSet() + * @generated + */ + public EReference getReviewItemSet_ParentCommits() { + return (EReference) reviewItemSetEClass.getEStructuralFeatures().get(3); + } + + /** * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.core.model.ILineLocation * <em>Line Location</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -3073,6 +3138,44 @@ public class ReviewsPackage extends EPackageImpl { } /** + * Returns the meta object for class '{@link org.eclipse.mylyn.reviews.core.model.ICommit <em>Commit</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for class '<em>Commit</em>'. + * @see org.eclipse.mylyn.reviews.core.model.ICommit + * @generated + */ + public EClass getCommit() { + return commitEClass; + } + + /** + * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.ICommit#getId <em>Id</em>} + * '. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Id</em>'. + * @see org.eclipse.mylyn.reviews.core.model.ICommit#getId() + * @see #getCommit() + * @generated + */ + public EAttribute getCommit_Id() { + return (EAttribute) commitEClass.getEStructuralFeatures().get(0); + } + + /** + * Returns the meta object for the attribute '{@link org.eclipse.mylyn.reviews.core.model.ICommit#getSubject + * <em>Subject</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Subject</em>'. + * @see org.eclipse.mylyn.reviews.core.model.ICommit#getSubject() + * @see #getCommit() + * @generated + */ + public EAttribute getCommit_Subject() { + return (EAttribute) commitEClass.getEStructuralFeatures().get(1); + } + + /** * Returns the meta object for enum '{@link org.eclipse.mylyn.reviews.core.model.RequirementStatus * <em>Requirement Status</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -3218,6 +3321,7 @@ public class ReviewsPackage extends EPackageImpl { createEReference(reviewItemSetEClass, REVIEW_ITEM_SET__ITEMS); createEAttribute(reviewItemSetEClass, REVIEW_ITEM_SET__REVISION); createEReference(reviewItemSetEClass, REVIEW_ITEM_SET__PARENT_REVIEW); + createEReference(reviewItemSetEClass, REVIEW_ITEM_SET__PARENT_COMMITS); lineLocationEClass = createEClass(LINE_LOCATION); createEReference(lineLocationEClass, LINE_LOCATION__RANGES); @@ -3266,6 +3370,10 @@ public class ReviewsPackage extends EPackageImpl { createEReference(reviewRequirementsMapEClass, REVIEW_REQUIREMENTS_MAP__KEY); createEReference(reviewRequirementsMapEClass, REVIEW_REQUIREMENTS_MAP__VALUE); + commitEClass = createEClass(COMMIT); + createEAttribute(commitEClass, COMMIT__ID); + createEAttribute(commitEClass, COMMIT__SUBJECT); + // Create enums requirementStatusEEnum = createEEnum(REQUIREMENT_STATUS); reviewStatusEEnum = createEEnum(REVIEW_STATUS); @@ -3574,6 +3682,11 @@ public class ReviewsPackage extends EPackageImpl { this.getReview(), this.getReview_Sets(), "parentReview", null, 1, 1, IReviewItemSet.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEReference( + getReviewItemSet_ParentCommits(), + this.getCommit(), + null, + "parentCommits", null, 0, -1, IReviewItemSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(lineLocationEClass, ILineLocation.class, "LineLocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -3715,6 +3828,16 @@ public class ReviewsPackage extends EPackageImpl { null, "value", null, 1, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(commitEClass, ICommit.class, "Commit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute( + getCommit_Id(), + ecorePackage.getEString(), + "id", null, 1, 1, ICommit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute( + getCommit_Subject(), + ecorePackage.getEString(), + "subject", null, 0, 1, ICommit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + // Initialize enums and add enum literals initEEnum(requirementStatusEEnum, RequirementStatus.class, "RequirementStatus"); //$NON-NLS-1$ addEEnumLiteral(requirementStatusEEnum, RequirementStatus.UNKNOWN); @@ -4248,6 +4371,14 @@ public class ReviewsPackage extends EPackageImpl { public static final EReference REVIEW_ITEM_SET__PARENT_REVIEW = eINSTANCE.getReviewItemSet_ParentReview(); /** + * The meta object literal for the '<em><b>Parent Commits</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public static final EReference REVIEW_ITEM_SET__PARENT_COMMITS = eINSTANCE.getReviewItemSet_ParentCommits(); + + /** * The meta object literal for the '{@link org.eclipse.mylyn.reviews.internal.core.model.LineLocation * <em>Line Location</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -4558,6 +4689,32 @@ public class ReviewsPackage extends EPackageImpl { public static final EReference REVIEW_REQUIREMENTS_MAP__VALUE = eINSTANCE.getReviewRequirementsMap_Value(); /** + * The meta object literal for the '{@link org.eclipse.mylyn.reviews.internal.core.model.Commit <em>Commit</em>} + * ' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.mylyn.reviews.internal.core.model.Commit + * @see org.eclipse.mylyn.reviews.internal.core.model.ReviewsPackage#getCommit() + * @generated + */ + public static final EClass COMMIT = eINSTANCE.getCommit(); + + /** + * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + public static final EAttribute COMMIT__ID = eINSTANCE.getCommit_Id(); + + /** + * The meta object literal for the '<em><b>Subject</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + public static final EAttribute COMMIT__SUBJECT = eINSTANCE.getCommit_Subject(); + + /** * The meta object literal for the '{@link org.eclipse.mylyn.reviews.core.model.RequirementStatus * <em>Requirement Status</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> * diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsResource.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsResource.java index 304990a9a..514fea299 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsResource.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsResource.java @@ -4,7 +4,7 @@ * 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 */ diff --git a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsSwitch.java b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsSwitch.java index c0f49b316..18487bc2a 100644 --- a/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsSwitch.java +++ b/org.eclipse.mylyn.reviews.core/src/org/eclipse/mylyn/reviews/internal/core/model/ReviewsSwitch.java @@ -304,6 +304,14 @@ public class ReviewsSwitch<T> { } return result; } + case ReviewsPackage.COMMIT: { + ICommit commit = (ICommit) theEObject; + T result = caseCommit(commit); + if (result == null) { + result = defaultCase(theEObject); + } + return result; + } default: return defaultCase(theEObject); } @@ -582,6 +590,20 @@ public class ReviewsSwitch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Commit</em>'. <!-- begin-user-doc --> This + * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Commit</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCommit(ICommit object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>User Approvals Map</em>'. <!-- * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!-- * end-user-doc --> |