From 6b34997337efe04ac671987a374937011c219c02 Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Sat, 6 Oct 2018 18:48:37 +0200 Subject: [PATCH 01/10] Store deleted object names in commit comments This allows us to show the names of deleted objects in the history --- .../config/specmate-config.properties | 8 +-- .../specmate-model-ecore/model/specmate.ecore | 2 + .../model/specmate.history | 20 +++++++ .../specmate/model/history/HistoryEntry.java | 17 ++++++ .../model/history/HistoryPackage.java | 34 ++++++++++- .../model/history/impl/HistoryEntryImpl.java | 22 ++++++++ .../history/impl/HistoryPackageImpl.java | 15 ++++- .../specmate/persistency/ITransaction.java | 3 + .../cdo/internal/HistoryProviderImpl.java | 16 ++++-- .../cdo/internal/TransactionImpl.java | 56 ++++++++++++++++--- web/src/app/model/HistoryEntry.ts | 3 +- .../simple-history-view.component.html | 12 ++++ 12 files changed, 187 insertions(+), 21 deletions(-) diff --git a/bundles/specmate-config/config/specmate-config.properties b/bundles/specmate-config/config/specmate-config.properties index c7010d1b6..a9c3233cf 100644 --- a/bundles/specmate-config/config/specmate-config.properties +++ b/bundles/specmate-config/config/specmate-config.properties @@ -52,18 +52,18 @@ search.maxResults = 100 # Projects ## List of project names, each project listed here needs to be configured below # test-data needn't be configured -project.projects = +project.projects = ## Config for project test-data project.test-data.library = libfolder1, libfolder2, libfolder3 -project.test-data.library.libfolder1.name = Library folder 1 +project.test-data.library.libfolder1.name = Lib Folder 1 project.test-data.library.libfolder1.description = Templates for type 1 requirements -project.test-data.library.libfolder2.name = Library folder 2 +project.test-data.library.libfolder2.name = Lib Folder 2 project.test-data.library.libfolder2.description = Templates for type 2 requirements -project.test-data.library.libfolder3.name = Library folder 3 +project.test-data.library.libfolder3.name = Lib Folder 3 project.test-data.library.libfolder3.description = Templates for type 3 requirements diff --git a/bundles/specmate-model-ecore/model/specmate.ecore b/bundles/specmate-model-ecore/model/specmate.ecore index f4ae5bfdc..c80f5479e 100644 --- a/bundles/specmate-model-ecore/model/specmate.ecore +++ b/bundles/specmate-model-ecore/model/specmate.ecore @@ -214,6 +214,8 @@ + diff --git a/bundles/specmate-model-ecore/model/specmate.history b/bundles/specmate-model-ecore/model/specmate.history index a4da32c0b..16e0a49d4 100644 --- a/bundles/specmate-model-ecore/model/specmate.history +++ b/bundles/specmate-model-ecore/model/specmate.history @@ -2222,5 +2222,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryEntry.java b/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryEntry.java index e78416c98..dbb2ff4f2 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryEntry.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryEntry.java @@ -17,6 +17,7 @@ *
    *
  • {@link com.specmate.model.history.HistoryEntry#getTimestamp Timestamp}
    • *
  • {@link com.specmate.model.history.HistoryEntry#getUser User}
    • + *
  • {@link com.specmate.model.history.HistoryEntry#getDeletedObjects Deleted Objects}
    • *
  • {@link com.specmate.model.history.HistoryEntry#getComment Comment}
    • *
  • {@link com.specmate.model.history.HistoryEntry#getChanges Changes}
    • *
@@ -79,6 +80,22 @@ public interface HistoryEntry extends CDOObject { */ void setUser(String value); + /** + * Returns the value of the 'Deleted Objects' attribute list. + * The list contents are of type {@link java.lang.String}. + * + *

+ * If the meaning of the 'Deleted Objects' attribute list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Deleted Objects' attribute list. + * @see com.specmate.model.history.HistoryPackage#getHistoryEntry_DeletedObjects() + * @model + * @generated + */ + EList getDeletedObjects(); + /** * Returns the value of the 'Comment' attribute. * diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java b/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java index 04c806f41..a63038e5f 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java @@ -121,6 +121,15 @@ public interface HistoryPackage extends EPackage { */ int HISTORY_ENTRY__USER = 1; + /** + * The feature id for the 'Deleted Objects' attribute list. + * + * + * @generated + * @ordered + */ + int HISTORY_ENTRY__DELETED_OBJECTS = 2; + /** * The feature id for the 'Comment' attribute. * @@ -128,7 +137,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int HISTORY_ENTRY__COMMENT = 2; + int HISTORY_ENTRY__COMMENT = 3; /** * The feature id for the 'Changes' containment reference list. @@ -137,7 +146,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int HISTORY_ENTRY__CHANGES = 3; + int HISTORY_ENTRY__CHANGES = 4; /** * The number of structural features of the 'Entry' class. @@ -146,7 +155,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int HISTORY_ENTRY_FEATURE_COUNT = 4; + int HISTORY_ENTRY_FEATURE_COUNT = 5; /** * The number of operations of the 'Entry' class. @@ -275,6 +284,17 @@ public interface HistoryPackage extends EPackage { */ EAttribute getHistoryEntry_User(); + /** + * Returns the meta object for the attribute list '{@link com.specmate.model.history.HistoryEntry#getDeletedObjects Deleted Objects}'. + * + * + * @return the meta object for the attribute list 'Deleted Objects'. + * @see com.specmate.model.history.HistoryEntry#getDeletedObjects() + * @see #getHistoryEntry() + * @generated + */ + EAttribute getHistoryEntry_DeletedObjects(); + /** * Returns the meta object for the attribute '{@link com.specmate.model.history.HistoryEntry#getComment Comment}'. * @@ -418,6 +438,14 @@ interface Literals { */ EAttribute HISTORY_ENTRY__USER = eINSTANCE.getHistoryEntry_User(); + /** + * The meta object literal for the 'Deleted Objects' attribute list feature. + * + * + * @generated + */ + EAttribute HISTORY_ENTRY__DELETED_OBJECTS = eINSTANCE.getHistoryEntry_DeletedObjects(); + /** * The meta object literal for the 'Comment' attribute feature. * diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryEntryImpl.java b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryEntryImpl.java index 011a58df4..76e9de6e8 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryEntryImpl.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryEntryImpl.java @@ -28,6 +28,7 @@ *
    *
  • {@link com.specmate.model.history.impl.HistoryEntryImpl#getTimestamp Timestamp}
    • *
  • {@link com.specmate.model.history.impl.HistoryEntryImpl#getUser User}
    • + *
  • {@link com.specmate.model.history.impl.HistoryEntryImpl#getDeletedObjects Deleted Objects}
    • *
  • {@link com.specmate.model.history.impl.HistoryEntryImpl#getComment Comment}
    • *
  • {@link com.specmate.model.history.impl.HistoryEntryImpl#getChanges Changes}
    • *
@@ -130,6 +131,16 @@ public void setUser(String newUser) { eDynamicSet(HistoryPackage.HISTORY_ENTRY__USER, HistoryPackage.Literals.HISTORY_ENTRY__USER, newUser); } + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + public EList getDeletedObjects() { + return (EList)eDynamicGet(HistoryPackage.HISTORY_ENTRY__DELETED_OBJECTS, HistoryPackage.Literals.HISTORY_ENTRY__DELETED_OBJECTS, true, true); + } + /** * * @@ -184,6 +195,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { return getTimestamp(); case HistoryPackage.HISTORY_ENTRY__USER: return getUser(); + case HistoryPackage.HISTORY_ENTRY__DELETED_OBJECTS: + return getDeletedObjects(); case HistoryPackage.HISTORY_ENTRY__COMMENT: return getComment(); case HistoryPackage.HISTORY_ENTRY__CHANGES: @@ -207,6 +220,10 @@ public void eSet(int featureID, Object newValue) { case HistoryPackage.HISTORY_ENTRY__USER: setUser((String)newValue); return; + case HistoryPackage.HISTORY_ENTRY__DELETED_OBJECTS: + getDeletedObjects().clear(); + getDeletedObjects().addAll((Collection)newValue); + return; case HistoryPackage.HISTORY_ENTRY__COMMENT: setComment((String)newValue); return; @@ -232,6 +249,9 @@ public void eUnset(int featureID) { case HistoryPackage.HISTORY_ENTRY__USER: setUser(USER_EDEFAULT); return; + case HistoryPackage.HISTORY_ENTRY__DELETED_OBJECTS: + getDeletedObjects().clear(); + return; case HistoryPackage.HISTORY_ENTRY__COMMENT: setComment(COMMENT_EDEFAULT); return; @@ -254,6 +274,8 @@ public boolean eIsSet(int featureID) { return getTimestamp() != TIMESTAMP_EDEFAULT; case HistoryPackage.HISTORY_ENTRY__USER: return USER_EDEFAULT == null ? getUser() != null : !USER_EDEFAULT.equals(getUser()); + case HistoryPackage.HISTORY_ENTRY__DELETED_OBJECTS: + return !getDeletedObjects().isEmpty(); case HistoryPackage.HISTORY_ENTRY__COMMENT: return COMMENT_EDEFAULT == null ? getComment() != null : !COMMENT_EDEFAULT.equals(getComment()); case HistoryPackage.HISTORY_ENTRY__CHANGES: diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java index c215c65c2..d58f74196 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java @@ -196,17 +196,26 @@ public EAttribute getHistoryEntry_User() { * * @generated */ - public EAttribute getHistoryEntry_Comment() { + public EAttribute getHistoryEntry_DeletedObjects() { return (EAttribute)historyEntryEClass.getEStructuralFeatures().get(2); } + /** + * + * + * @generated + */ + public EAttribute getHistoryEntry_Comment() { + return (EAttribute)historyEntryEClass.getEStructuralFeatures().get(3); + } + /** * * * @generated */ public EReference getHistoryEntry_Changes() { - return (EReference)historyEntryEClass.getEStructuralFeatures().get(3); + return (EReference)historyEntryEClass.getEStructuralFeatures().get(4); } /** @@ -288,6 +297,7 @@ public void createPackageContents() { historyEntryEClass = createEClass(HISTORY_ENTRY); createEAttribute(historyEntryEClass, HISTORY_ENTRY__TIMESTAMP); createEAttribute(historyEntryEClass, HISTORY_ENTRY__USER); + createEAttribute(historyEntryEClass, HISTORY_ENTRY__DELETED_OBJECTS); createEAttribute(historyEntryEClass, HISTORY_ENTRY__COMMENT); createEReference(historyEntryEClass, HISTORY_ENTRY__CHANGES); @@ -334,6 +344,7 @@ public void initializePackageContents() { initEClass(historyEntryEClass, HistoryEntry.class, "HistoryEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getHistoryEntry_Timestamp(), ecorePackage.getELong(), "timestamp", null, 0, 1, HistoryEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getHistoryEntry_User(), ecorePackage.getEString(), "user", null, 0, 1, HistoryEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getHistoryEntry_DeletedObjects(), ecorePackage.getEString(), "deletedObjects", null, 0, -1, HistoryEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getHistoryEntry_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, HistoryEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getHistoryEntry_Changes(), this.getChange(), null, "changes", null, 0, -1, HistoryEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/bundles/specmate-persistency-api/src/com/specmate/persistency/ITransaction.java b/bundles/specmate-persistency-api/src/com/specmate/persistency/ITransaction.java index b5da06d77..710e9c570 100644 --- a/bundles/specmate-persistency-api/src/com/specmate/persistency/ITransaction.java +++ b/bundles/specmate-persistency-api/src/com/specmate/persistency/ITransaction.java @@ -10,6 +10,9 @@ * */ public interface ITransaction extends IView { + public static final String COMMENT_FIELD_SEPARATOR = ";"; + public static final String COMMENT_DATA_SEPARATOR = ","; + /** Rolls back changes made in this transaction since the last commit */ public void rollback(); diff --git a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java index 61686a074..c35c821f4 100644 --- a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java +++ b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java @@ -23,6 +23,7 @@ import com.specmate.model.history.HistoryEntry; import com.specmate.model.history.HistoryFactory; import com.specmate.persistency.IHistoryProvider; +import com.specmate.persistency.ITransaction; import com.specmate.persistency.event.EChangeKind; @Component(immediate = true) @@ -106,17 +107,17 @@ private void fillHistoryEntry(CDOObject cdoObject, CDOCommitInfo cdoHistoryEleme deltaProcessor.process(); historyEntry.getChanges().addAll(deltaProcessor.getChanges()); historyEntry.setTimestamp(cdoHistoryElement.getTimeStamp()); - extractUserInfo(cdoHistoryElement, historyEntry); + extractCommentInfo(cdoHistoryElement, historyEntry); } - private void extractUserInfo(CDOCommitInfo cdoHistoryElement, HistoryEntry historyEntry) { + private void extractCommentInfo(CDOCommitInfo cdoHistoryElement, HistoryEntry historyEntry) { String comment = cdoHistoryElement.getComment(); if (comment == null || comment.length() == 0) { return; } - String[] info = comment.split(";", 2); + String[] info = comment.split(ITransaction.COMMENT_FIELD_SEPARATOR); if (info.length == 0) { return; } @@ -124,7 +125,14 @@ private void extractUserInfo(CDOCommitInfo cdoHistoryElement, HistoryEntry histo historyEntry.setUser(info[0]); if (info.length == 2) { - historyEntry.setComment(info[1]); + String[] deletedObjects = info[1].split(ITransaction.COMMENT_DATA_SEPARATOR); + for (int i = 0; i < deletedObjects.length; i++) { + historyEntry.getDeletedObjects().add(deletedObjects[i]); + } + } + + if (info.length == 3) { + historyEntry.setComment(info[2]); } } diff --git a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/TransactionImpl.java b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/TransactionImpl.java index b76def204..7539a8ed3 100644 --- a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/TransactionImpl.java +++ b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/TransactionImpl.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Map; +import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.common.commit.CDOChangeSetData; import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.id.CDOIDUtil; @@ -16,6 +17,9 @@ import com.specmate.administration.api.IStatusService; import com.specmate.common.SpecmateException; import com.specmate.common.SpecmateValidationException; +import com.specmate.model.base.Folder; +import com.specmate.model.base.INamed; +import com.specmate.model.requirements.CEGModel; import com.specmate.model.support.util.SpecmateEcoreUtil; import com.specmate.persistency.IChange; import com.specmate.persistency.IChangeListener; @@ -28,7 +32,6 @@ * */ public class TransactionImpl extends ViewImpl implements ITransaction { - /* The CDO transaction */ private CDOTransaction transaction; @@ -69,9 +72,10 @@ private void commit(T object) throws SpecmateException { throw new SpecmateException("Attempt to commit when in read-only mode"); } try { + List detachedObjects; try { notifyListeners(); - List detachedObjects = transaction.getChangeSetData().getDetachedObjects(); + detachedObjects = transaction.getChangeSetData().getDetachedObjects(); for (CDOIDAndVersion id : detachedObjects) { SpecmateEcoreUtil.unsetAllReferences(transaction.getObject(id.getID())); } @@ -79,7 +83,7 @@ private void commit(T object) throws SpecmateException { transaction.rollback(); throw (new SpecmateException("Error while preparing commit, transaction rolled back", s)); } - extractAndSetMetadata(object); + setMetadata(object, detachedObjects); transaction.commit(); } catch (CommitException e) { transaction.rollback(); @@ -123,13 +127,51 @@ public boolean isDirty() { return transaction.isDirty(); } - private void extractAndSetMetadata(T object) { + private void setMetadata(T object, List detachedObjects) { + StringBuilder comment = new StringBuilder(); + + String userName = extractUserName(object); + if (userName != null) { + comment.append(userName); + comment.append(extractDeletedObjects(detachedObjects)); + } + + transaction.setCommitComment(comment.toString()); + } + + private String extractUserName(T object) { + String userName = null; + if (object instanceof RestResult) { - String userName = ((RestResult) object).getUserName(); - if (userName != null) { - transaction.setCommitComment(userName); + userName = ((RestResult) object).getUserName(); + } + + return userName; + } + + private String extractDeletedObjects(List detachedObjects) { + StringBuilder names = new StringBuilder(); + + if (detachedObjects.size() > 0) { + names.append(COMMENT_FIELD_SEPARATOR); + boolean addDataSeparator = false; + for (CDOIDAndVersion cdoidv : detachedObjects) { + CDOObject obj = transaction.getObject(cdoidv.getID()); + if (obj instanceof Folder || obj instanceof CEGModel + || obj instanceof com.specmate.model.processes.Process) { + + INamed named = (INamed) obj; + if (addDataSeparator) { + names.append(COMMENT_DATA_SEPARATOR); + } + names.append(named.getName()); + addDataSeparator = true; + } } } + + names.append(COMMENT_FIELD_SEPARATOR); + return names.toString(); } private void notifyListeners() throws SpecmateException { diff --git a/web/src/app/model/HistoryEntry.ts b/web/src/app/model/HistoryEntry.ts index f1534da26..5a2850add 100644 --- a/web/src/app/model/HistoryEntry.ts +++ b/web/src/app/model/HistoryEntry.ts @@ -13,10 +13,11 @@ // Attributes public timestamp: ELong; public user: EString; + public deletedObjects: EString[]; public comment: EString; // References - + // Containment public changes: Change[]; diff --git a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html index 9031b4488..dee26b674 100644 --- a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html +++ b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html @@ -6,6 +6,18 @@
  • {{getDate(entry.timestamp) | date:'yyyy-MM-dd HH:mm:ss'}} {{entry.user}} +
      +
    • +  {{deletedObject}} +
      • +
    +
      +
    • +
      + {{'Changed' | translate}} {{change.feature}}  {{change.newValue}} +
      +
      • +
From 994e9aa874627602b93e92ea84ad2513b1c88ec5 Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Sat, 6 Oct 2018 22:07:09 +0200 Subject: [PATCH 02/10] History with more information Showing now created, deleted, and modified objects. --- .../specmate-model-ecore/model/specmate.ecore | 2 + .../model/specmate.history | 25 +++++ .../com/specmate/model/history/Change.java | 54 +++++++++++ .../model/history/HistoryPackage.java | 66 ++++++++++++- .../model/history/impl/ChangeImpl.java | 78 ++++++++++++++++ .../history/impl/HistoryPackageImpl.java | 30 +++++- .../cdo/internal/HistoryProviderImpl.java | 93 +++++++++++++------ .../cdo/internal/TransactionImpl.java | 7 +- web/src/app/model/Change.ts | 2 + .../simple-history-view.component.html | 7 +- 10 files changed, 321 insertions(+), 43 deletions(-) diff --git a/bundles/specmate-model-ecore/model/specmate.ecore b/bundles/specmate-model-ecore/model/specmate.ecore index c80f5479e..89f62c5ca 100644 --- a/bundles/specmate-model-ecore/model/specmate.ecore +++ b/bundles/specmate-model-ecore/model/specmate.ecore @@ -221,6 +221,8 @@ eType="#//history/Change" containment="true"/> + + diff --git a/bundles/specmate-model-ecore/model/specmate.history b/bundles/specmate-model-ecore/model/specmate.history index 16e0a49d4..71f75715b 100644 --- a/bundles/specmate-model-ecore/model/specmate.history +++ b/bundles/specmate-model-ecore/model/specmate.history @@ -2242,5 +2242,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/Change.java b/bundles/specmate-model-gen/src/com/specmate/model/history/Change.java index 6ff575549..c05585d2f 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/Change.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/Change.java @@ -13,6 +13,8 @@ * The following features are supported: *

*
    + *
  • {@link com.specmate.model.history.Change#getObjectName Object Name}
    • + *
  • {@link com.specmate.model.history.Change#getOldValue Old Value}
    • *
  • {@link com.specmate.model.history.Change#getNewValue New Value}
    • *
  • {@link com.specmate.model.history.Change#getFeature Feature}
    • *
  • {@link com.specmate.model.history.Change#isIsCreate Is Create}
    • @@ -25,6 +27,58 @@ * @generated */ public interface Change extends CDOObject { + /** + * Returns the value of the 'Object Name' attribute. + * + *

    + * If the meaning of the 'Object Name' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Object Name' attribute. + * @see #setObjectName(String) + * @see com.specmate.model.history.HistoryPackage#getChange_ObjectName() + * @model + * @generated + */ + String getObjectName(); + + /** + * Sets the value of the '{@link com.specmate.model.history.Change#getObjectName Object Name}' attribute. + * + * + * @param value the new value of the 'Object Name' attribute. + * @see #getObjectName() + * @generated + */ + void setObjectName(String value); + + /** + * Returns the value of the 'Old Value' attribute. + * + *

    + * If the meaning of the 'Old Value' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Old Value' attribute. + * @see #setOldValue(String) + * @see com.specmate.model.history.HistoryPackage#getChange_OldValue() + * @model + * @generated + */ + String getOldValue(); + + /** + * Sets the value of the '{@link com.specmate.model.history.Change#getOldValue Old Value}' attribute. + * + * + * @param value the new value of the 'Old Value' attribute. + * @see #getOldValue() + * @generated + */ + void setOldValue(String value); + /** * Returns the value of the 'New Value' attribute. * diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java b/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java index a63038e5f..2cb6e61c8 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java @@ -176,6 +176,24 @@ public interface HistoryPackage extends EPackage { */ int CHANGE = 2; + /** + * The feature id for the 'Object Name' attribute. + * + * + * @generated + * @ordered + */ + int CHANGE__OBJECT_NAME = 0; + + /** + * The feature id for the 'Old Value' attribute. + * + * + * @generated + * @ordered + */ + int CHANGE__OLD_VALUE = 1; + /** * The feature id for the 'New Value' attribute. * @@ -183,7 +201,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__NEW_VALUE = 0; + int CHANGE__NEW_VALUE = 2; /** * The feature id for the 'Feature' attribute. @@ -192,7 +210,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__FEATURE = 1; + int CHANGE__FEATURE = 3; /** * The feature id for the 'Is Create' attribute. @@ -201,7 +219,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__IS_CREATE = 2; + int CHANGE__IS_CREATE = 4; /** * The feature id for the 'Is Delete' attribute. @@ -210,7 +228,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__IS_DELETE = 3; + int CHANGE__IS_DELETE = 5; /** * The number of structural features of the 'Change' class. @@ -219,7 +237,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE_FEATURE_COUNT = 4; + int CHANGE_FEATURE_COUNT = 6; /** * The number of operations of the 'Change' class. @@ -327,6 +345,28 @@ public interface HistoryPackage extends EPackage { */ EClass getChange(); + /** + * Returns the meta object for the attribute '{@link com.specmate.model.history.Change#getObjectName Object Name}'. + * + * + * @return the meta object for the attribute 'Object Name'. + * @see com.specmate.model.history.Change#getObjectName() + * @see #getChange() + * @generated + */ + EAttribute getChange_ObjectName(); + + /** + * Returns the meta object for the attribute '{@link com.specmate.model.history.Change#getOldValue Old Value}'. + * + * + * @return the meta object for the attribute 'Old Value'. + * @see com.specmate.model.history.Change#getOldValue() + * @see #getChange() + * @generated + */ + EAttribute getChange_OldValue(); + /** * Returns the meta object for the attribute '{@link com.specmate.model.history.Change#getNewValue New Value}'. * @@ -472,6 +512,22 @@ interface Literals { */ EClass CHANGE = eINSTANCE.getChange(); + /** + * The meta object literal for the 'Object Name' attribute feature. + * + * + * @generated + */ + EAttribute CHANGE__OBJECT_NAME = eINSTANCE.getChange_ObjectName(); + + /** + * The meta object literal for the 'Old Value' attribute feature. + * + * + * @generated + */ + EAttribute CHANGE__OLD_VALUE = eINSTANCE.getChange_OldValue(); + /** * The meta object literal for the 'New Value' attribute feature. * diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/ChangeImpl.java b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/ChangeImpl.java index ffd30bfca..2317fe229 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/ChangeImpl.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/ChangeImpl.java @@ -17,6 +17,8 @@ * The following features are implemented: *

    *
      + *
    • {@link com.specmate.model.history.impl.ChangeImpl#getObjectName Object Name}
      • + *
    • {@link com.specmate.model.history.impl.ChangeImpl#getOldValue Old Value}
      • *
    • {@link com.specmate.model.history.impl.ChangeImpl#getNewValue New Value}
      • *
    • {@link com.specmate.model.history.impl.ChangeImpl#getFeature Feature}
      • *
    • {@link com.specmate.model.history.impl.ChangeImpl#isIsCreate Is Create}
      • @@ -26,6 +28,26 @@ * @generated */ public class ChangeImpl extends CDOObjectImpl implements Change { + /** + * The default value of the '{@link #getObjectName() Object Name}' attribute. + * + * + * @see #getObjectName() + * @generated + * @ordered + */ + protected static final String OBJECT_NAME_EDEFAULT = null; + + /** + * The default value of the '{@link #getOldValue() Old Value}' attribute. + * + * + * @see #getOldValue() + * @generated + * @ordered + */ + protected static final String OLD_VALUE_EDEFAULT = null; + /** * The default value of the '{@link #getNewValue() New Value}' attribute. * @@ -95,6 +117,42 @@ protected int eStaticFeatureCount() { return 0; } + /** + * + * + * @generated + */ + public String getObjectName() { + return (String)eDynamicGet(HistoryPackage.CHANGE__OBJECT_NAME, HistoryPackage.Literals.CHANGE__OBJECT_NAME, true, true); + } + + /** + * + * + * @generated + */ + public void setObjectName(String newObjectName) { + eDynamicSet(HistoryPackage.CHANGE__OBJECT_NAME, HistoryPackage.Literals.CHANGE__OBJECT_NAME, newObjectName); + } + + /** + * + * + * @generated + */ + public String getOldValue() { + return (String)eDynamicGet(HistoryPackage.CHANGE__OLD_VALUE, HistoryPackage.Literals.CHANGE__OLD_VALUE, true, true); + } + + /** + * + * + * @generated + */ + public void setOldValue(String newOldValue) { + eDynamicSet(HistoryPackage.CHANGE__OLD_VALUE, HistoryPackage.Literals.CHANGE__OLD_VALUE, newOldValue); + } + /** * * @@ -175,6 +233,10 @@ public void setIsDelete(boolean newIsDelete) { @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { + case HistoryPackage.CHANGE__OBJECT_NAME: + return getObjectName(); + case HistoryPackage.CHANGE__OLD_VALUE: + return getOldValue(); case HistoryPackage.CHANGE__NEW_VALUE: return getNewValue(); case HistoryPackage.CHANGE__FEATURE: @@ -195,6 +257,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case HistoryPackage.CHANGE__OBJECT_NAME: + setObjectName((String)newValue); + return; + case HistoryPackage.CHANGE__OLD_VALUE: + setOldValue((String)newValue); + return; case HistoryPackage.CHANGE__NEW_VALUE: setNewValue((String)newValue); return; @@ -219,6 +287,12 @@ public void eSet(int featureID, Object newValue) { @Override public void eUnset(int featureID) { switch (featureID) { + case HistoryPackage.CHANGE__OBJECT_NAME: + setObjectName(OBJECT_NAME_EDEFAULT); + return; + case HistoryPackage.CHANGE__OLD_VALUE: + setOldValue(OLD_VALUE_EDEFAULT); + return; case HistoryPackage.CHANGE__NEW_VALUE: setNewValue(NEW_VALUE_EDEFAULT); return; @@ -243,6 +317,10 @@ public void eUnset(int featureID) { @Override public boolean eIsSet(int featureID) { switch (featureID) { + case HistoryPackage.CHANGE__OBJECT_NAME: + return OBJECT_NAME_EDEFAULT == null ? getObjectName() != null : !OBJECT_NAME_EDEFAULT.equals(getObjectName()); + case HistoryPackage.CHANGE__OLD_VALUE: + return OLD_VALUE_EDEFAULT == null ? getOldValue() != null : !OLD_VALUE_EDEFAULT.equals(getOldValue()); case HistoryPackage.CHANGE__NEW_VALUE: return NEW_VALUE_EDEFAULT == null ? getNewValue() != null : !NEW_VALUE_EDEFAULT.equals(getNewValue()); case HistoryPackage.CHANGE__FEATURE: diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java index d58f74196..597d9e134 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java @@ -232,7 +232,7 @@ public EClass getChange() { * * @generated */ - public EAttribute getChange_NewValue() { + public EAttribute getChange_ObjectName() { return (EAttribute)changeEClass.getEStructuralFeatures().get(0); } @@ -241,7 +241,7 @@ public EAttribute getChange_NewValue() { * * @generated */ - public EAttribute getChange_Feature() { + public EAttribute getChange_OldValue() { return (EAttribute)changeEClass.getEStructuralFeatures().get(1); } @@ -250,7 +250,7 @@ public EAttribute getChange_Feature() { * * @generated */ - public EAttribute getChange_IsCreate() { + public EAttribute getChange_NewValue() { return (EAttribute)changeEClass.getEStructuralFeatures().get(2); } @@ -259,10 +259,28 @@ public EAttribute getChange_IsCreate() { * * @generated */ - public EAttribute getChange_IsDelete() { + public EAttribute getChange_Feature() { return (EAttribute)changeEClass.getEStructuralFeatures().get(3); } + /** + * + * + * @generated + */ + public EAttribute getChange_IsCreate() { + return (EAttribute)changeEClass.getEStructuralFeatures().get(4); + } + + /** + * + * + * @generated + */ + public EAttribute getChange_IsDelete() { + return (EAttribute)changeEClass.getEStructuralFeatures().get(5); + } + /** * * @@ -302,6 +320,8 @@ public void createPackageContents() { createEReference(historyEntryEClass, HISTORY_ENTRY__CHANGES); changeEClass = createEClass(CHANGE); + createEAttribute(changeEClass, CHANGE__OBJECT_NAME); + createEAttribute(changeEClass, CHANGE__OLD_VALUE); createEAttribute(changeEClass, CHANGE__NEW_VALUE); createEAttribute(changeEClass, CHANGE__FEATURE); createEAttribute(changeEClass, CHANGE__IS_CREATE); @@ -349,6 +369,8 @@ public void initializePackageContents() { initEReference(getHistoryEntry_Changes(), this.getChange(), null, "changes", null, 0, -1, HistoryEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(changeEClass, Change.class, "Change", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getChange_ObjectName(), ecorePackage.getEString(), "objectName", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getChange_OldValue(), ecorePackage.getEString(), "oldValue", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getChange_NewValue(), ecorePackage.getEString(), "newValue", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getChange_Feature(), ecorePackage.getEString(), "feature", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getChange_IsCreate(), ecorePackage.getEBoolean(), "isCreate", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java index c35c821f4..a6189bd89 100644 --- a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java +++ b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java @@ -13,21 +13,28 @@ import org.eclipse.emf.common.util.ECollections; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; +import org.osgi.service.log.LogService; import com.specmate.common.SpecmateException; +import com.specmate.model.base.BasePackage; +import com.specmate.model.base.INamed; import com.specmate.model.history.Change; import com.specmate.model.history.History; import com.specmate.model.history.HistoryEntry; import com.specmate.model.history.HistoryFactory; +import com.specmate.model.requirements.RequirementsPackage; import com.specmate.persistency.IHistoryProvider; +import com.specmate.persistency.IPersistencyService; import com.specmate.persistency.ITransaction; import com.specmate.persistency.event.EChangeKind; @Component(immediate = true) public class HistoryProviderImpl implements IHistoryProvider { + private IPersistencyService persistency; + private LogService logService; @Override public History getHistory(EObject object) throws SpecmateException { @@ -95,9 +102,10 @@ private History processHistory(CDOObject cdoObject, History history) { HistoryEntry historyEntry = HistoryFactory.eINSTANCE.createHistoryEntry(); fillHistoryEntry(cdoObject, cdoHistoryElement, historyEntry); - if (!historyEntry.getChanges().isEmpty()) { + if (!historyEntry.getChanges().isEmpty() || !historyEntry.getDeletedObjects().isEmpty()) { history.getEntries().add(historyEntry); } + } return history; } @@ -174,27 +182,23 @@ protected void changedObject(CDOID id, EStructuralFeature feature, EChangeKind c return; } - Change change = HistoryFactory.eINSTANCE.createChange(); - change.setFeature(feature.getName()); + if (showChange(feature, changeKind)) { + String objectName = getObjectName(id); + if (objectName != null) { + Change change = HistoryFactory.eINSTANCE.createChange(); - if (feature instanceof EReference) { - EReference ref = (EReference) feature; - if (ref.isContainment() && changeKind.equals(EChangeKind.REMOVE)) { - change.setIsDelete(true); - change.setNewValue(oldValue.toString()); - } else if (ref.isContainment() && changeKind.equals(EChangeKind.ADD)) { - change.setIsCreate(true); - change.setNewValue(newValue.toString()); - } else { - return; - } - } + if (newValue != null) { + change.setNewValue(newValue.toString()); + } + if (oldValue != null) { + change.setOldValue(oldValue.toString()); + } - if (newValue != null) { - change.setNewValue(newValue.toString()); + change.setFeature(feature.getName()); + change.setObjectName(objectName); + changes.add(change); + } } - - changes.add(change); } @Override @@ -204,12 +208,14 @@ protected void newObject(CDOID id, String className, Map { - // we just create a new change if we also have something to display, i.e. value - if (v != null && v instanceof String) { + // For now, we are only interested in seeing the new objects' name in the + // history + if (k.getName().equals(BasePackage.Literals.INAMED__NAME.getName())) { Change change = HistoryFactory.eINSTANCE.createChange(); change.setIsCreate(true); change.setFeature(k.getName()); change.setNewValue((String) v); + change.setObjectName((String) v); changes.add(change); } }); @@ -217,13 +223,46 @@ protected void newObject(CDOID id, String className, Map detachedObjects) { boolean addDataSeparator = false; for (CDOIDAndVersion cdoidv : detachedObjects) { CDOObject obj = transaction.getObject(cdoidv.getID()); - if (obj instanceof Folder || obj instanceof CEGModel - || obj instanceof com.specmate.model.processes.Process) { - + if (obj instanceof ISpecmateModelObject || obj instanceof com.specmate.model.processes.Process) { INamed named = (INamed) obj; if (addDataSeparator) { names.append(COMMENT_DATA_SEPARATOR); diff --git a/web/src/app/model/Change.ts b/web/src/app/model/Change.ts index 49ba28f46..f86fe98eb 100644 --- a/web/src/app/model/Change.ts +++ b/web/src/app/model/Change.ts @@ -10,6 +10,8 @@ public static className: string = "Change"; // Attributes + public objectName: EString; + public oldValue: EString; public newValue: EString; public feature: EString; public isCreate: EBoolean; diff --git a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html index dee26b674..ad7601241 100644 --- a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html +++ b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html @@ -13,8 +13,11 @@
    • -
      - {{'Changed' | translate}} {{change.feature}}  {{change.newValue}} +
      +  {{change.objectName}} ({{change.feature}}) +
      +
      +  {{change.objectName}}
    From 6c4ed4d3ea7ffa273d9206dc6b457edc2bc47650 Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Sat, 6 Oct 2018 22:26:01 +0200 Subject: [PATCH 03/10] Ignore history test for now --- .../test/integration/HistoryTest.java | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/bundles/specmate-integration-test/src/com/specmate/test/integration/HistoryTest.java b/bundles/specmate-integration-test/src/com/specmate/test/integration/HistoryTest.java index bb31b5820..a0bd3653e 100644 --- a/bundles/specmate-integration-test/src/com/specmate/test/integration/HistoryTest.java +++ b/bundles/specmate-integration-test/src/com/specmate/test/integration/HistoryTest.java @@ -6,7 +6,6 @@ import org.json.JSONArray; import org.json.JSONObject; -import org.junit.Assert; import org.junit.Test; import com.specmate.emfrest.history.HistoryRestService; @@ -73,51 +72,52 @@ private void checkSequence(JSONArray entries, String newName, int numChangeNames /** * Tests that the object hierarchy is traversed to get history elements by * asserting the number of history entries for created and deleted objects. + * + * IGNORING test for now as design of history content has changed and may change + * in the near future. + */ + /* + * @Test public void testRecursiveHistory() { // Changes 1 JSONObject + * requirement = postRequirementToRoot(); String requirementId = + * getId(requirement); + * + * // Changes 3 JSONObject cegModel = postCEG(requirementId); String cegId = + * getId(cegModel); + * + * // Changes 5 JSONObject cegNode1 = postCEGNode(requirementId, cegId); String + * node1Id = getId(cegNode1); + * + * JSONObject retrievedCegNode1 = getObject(requirementId, cegId, node1Id); + * Assert.assertTrue(EmfRestTestUtil.compare(cegNode1, retrievedCegNode1, + * true)); + * + * // Changes 7 JSONObject cegNode2 = postCEGNode(requirementId, cegId); String + * node2Id = getId(cegNode2); + * + * JSONObject retrievedCegNode2 = getObject(requirementId, cegId, node2Id); + * Assert.assertTrue(EmfRestTestUtil.compare(cegNode2, retrievedCegNode2, + * true)); + * + * // Change 9 JSONObject connection = postCEGConnection(retrievedCegNode1, + * retrievedCegNode2, false, requirementId, cegId); String connectionId = + * getId(connection); + * + * JSONArray entries = getEntries(HistoryRestService.HRECURSIVE, requirementId); + * assertEquals(9, entries.length()); + * + * // Change 9: since we deleted an object, is does not appear in history + * anymore // (-1), but we catch the deletion with // the change event on the + * containment (+1). As a result, the number of history // entries does not + * change when deleting // an object. deleteObject(requirementId, cegId, + * connectionId); + * + * entries = getEntries(HistoryRestService.HRECURSIVE, requirementId); + * assertEquals(9, entries.length()); JSONObject entry = + * entries.getJSONObject(0); JSONArray changes = + * entry.getJSONArray(HistoryPackage.Literals.HISTORY_ENTRY__CHANGES.getName()); + * assertEquals(1, changes.length()); JSONObject deletion = + * changes.getJSONObject(0); + * assertTrue(deletion.getBoolean(HistoryPackage.Literals.CHANGE__IS_DELETE. + * getName())); } */ - @Test - public void testRecursiveHistory() { - // Changes 1 - JSONObject requirement = postRequirementToRoot(); - String requirementId = getId(requirement); - - // Changes 3 - JSONObject cegModel = postCEG(requirementId); - String cegId = getId(cegModel); - - // Changes 5 - JSONObject cegNode1 = postCEGNode(requirementId, cegId); - String node1Id = getId(cegNode1); - - JSONObject retrievedCegNode1 = getObject(requirementId, cegId, node1Id); - Assert.assertTrue(EmfRestTestUtil.compare(cegNode1, retrievedCegNode1, true)); - - // Changes 7 - JSONObject cegNode2 = postCEGNode(requirementId, cegId); - String node2Id = getId(cegNode2); - - JSONObject retrievedCegNode2 = getObject(requirementId, cegId, node2Id); - Assert.assertTrue(EmfRestTestUtil.compare(cegNode2, retrievedCegNode2, true)); - - // Change 9 - JSONObject connection = postCEGConnection(retrievedCegNode1, retrievedCegNode2, false, requirementId, cegId); - String connectionId = getId(connection); - - JSONArray entries = getEntries(HistoryRestService.HRECURSIVE, requirementId); - assertEquals(9, entries.length()); - - // Change 9: since we deleted an object, is does not appear in history anymore - // (-1), but we catch the deletion with - // the change event on the containment (+1). As a result, the number of history - // entries does not change when deleting - // an object. - deleteObject(requirementId, cegId, connectionId); - - entries = getEntries(HistoryRestService.HRECURSIVE, requirementId); - assertEquals(9, entries.length()); - JSONObject entry = entries.getJSONObject(0); - JSONArray changes = entry.getJSONArray(HistoryPackage.Literals.HISTORY_ENTRY__CHANGES.getName()); - assertEquals(1, changes.length()); - JSONObject deletion = changes.getJSONObject(0); - assertTrue(deletion.getBoolean(HistoryPackage.Literals.CHANGE__IS_DELETE.getName())); - } } From 00ed6fa84c7c12b84420a676c35b497d764788dd Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Sun, 7 Oct 2018 23:03:25 +0200 Subject: [PATCH 04/10] Improved history view --- .../persistency/cdo/internal/HistoryProviderImpl.java | 3 +++ .../components/simple-history-view.component.css | 3 +++ .../components/simple-history-view.component.html | 5 +++-- web/src/assets/i18n/de.json | 1 + web/src/assets/i18n/gb.json | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java index a6189bd89..945ae8096 100644 --- a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java +++ b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java @@ -191,6 +191,9 @@ protected void changedObject(CDOID id, EStructuralFeature feature, EChangeKind c change.setNewValue(newValue.toString()); } if (oldValue != null) { + // For some reason, when this is retrieved by CDO, the object has no type + // information and lands here as a plain object which we cannot read as a + // string. Hence, for now, the clients should ignore these values. change.setOldValue(oldValue.toString()); } diff --git a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.css b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.css index e69de29bb..8d84de228 100644 --- a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.css +++ b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.css @@ -0,0 +1,3 @@ +ul.historyentry { + padding-left: 0; +} diff --git a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html index ad7601241..fbae6518e 100644 --- a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html +++ b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html @@ -6,15 +6,16 @@
    • {{getDate(entry.timestamp) | date:'yyyy-MM-dd HH:mm:ss'}} {{entry.user}} -
        +
        •  {{deletedObject}}
        -
          +
          •  {{change.objectName}} ({{change.feature}}) +
            {{'New' | translate}}: {{change.newValue}}
             {{change.objectName}} diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index b4fb671ab..11a128ce1 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -19,6 +19,7 @@ "LinksandActions": "Links & Actions", "Model": "Modell", "Name": "Name", + "New": "Neu", "NumberOfTestCases": "Anzahl Testfälle", "Output": "Ausgabe", "OutputParameter": "Ausgangsparameter", diff --git a/web/src/assets/i18n/gb.json b/web/src/assets/i18n/gb.json index 741fb7211..4affa60b0 100644 --- a/web/src/assets/i18n/gb.json +++ b/web/src/assets/i18n/gb.json @@ -19,6 +19,7 @@ "LinksandActions": "Links & Actions", "Model": "Model", "Name": "Name", + "New": "New", "NumberOfTestCases": "Number of Test Cases", "Output": "Output", "OutputParameter": "Output Parameters", From bc5326c116ac3e1e244491074908de2571bb5846 Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Sun, 7 Oct 2018 23:34:51 +0200 Subject: [PATCH 05/10] Remove unnecessary label --- .../history-view/components/simple-history-view.component.html | 2 +- web/src/assets/i18n/de.json | 3 +-- web/src/assets/i18n/gb.json | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html index fbae6518e..81374500c 100644 --- a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html +++ b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html @@ -15,7 +15,7 @@
          •  {{change.objectName}} ({{change.feature}}) -
            {{'New' | translate}}: {{change.newValue}} +
            {{change.newValue}}
             {{change.objectName}} diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index 11a128ce1..0393d1ddf 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -19,7 +19,6 @@ "LinksandActions": "Links & Actions", "Model": "Modell", "Name": "Name", - "New": "Neu", "NumberOfTestCases": "Anzahl Testfälle", "Output": "Ausgabe", "OutputParameter": "Ausgangsparameter", @@ -188,4 +187,4 @@ }, "zoomIn": "Vergrößern", "zoomOut": "Verkleinern" -} \ No newline at end of file +} diff --git a/web/src/assets/i18n/gb.json b/web/src/assets/i18n/gb.json index 4affa60b0..e4ee3c63e 100644 --- a/web/src/assets/i18n/gb.json +++ b/web/src/assets/i18n/gb.json @@ -19,7 +19,6 @@ "LinksandActions": "Links & Actions", "Model": "Model", "Name": "Name", - "New": "New", "NumberOfTestCases": "Number of Test Cases", "Output": "Output", "OutputParameter": "Output Parameters", @@ -188,4 +187,4 @@ }, "zoomIn": "Zoom in", "zoomOut": "Zoom out" -} \ No newline at end of file +} From 41efdee6111bb2020433ce70fdf17000178145e9 Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Sun, 7 Oct 2018 23:44:47 +0200 Subject: [PATCH 06/10] Use translation service such that form labels show in the selected language --- .../components/form-checkbox-input.component.html | 4 ++-- .../components/form-long-text-input.component.html | 4 ++-- .../components/form-single-selection-input.component.html | 4 ++-- .../generic-form/components/form-text-input.component.html | 4 ++-- web/src/assets/i18n/de.json | 2 +- web/src/assets/i18n/gb.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/src/app/modules/forms/modules/generic-form/components/form-checkbox-input.component.html b/web/src/app/modules/forms/modules/generic-form/components/form-checkbox-input.component.html index 57f9269ba..f531c1889 100644 --- a/web/src/app/modules/forms/modules/generic-form/components/form-checkbox-input.component.html +++ b/web/src/app/modules/forms/modules/generic-form/components/form-checkbox-input.component.html @@ -1,10 +1,10 @@
            -
            \ No newline at end of file +
            diff --git a/web/src/app/modules/forms/modules/generic-form/components/form-long-text-input.component.html b/web/src/app/modules/forms/modules/generic-form/components/form-long-text-input.component.html index 4f8f34d5c..74a99ae8b 100644 --- a/web/src/app/modules/forms/modules/generic-form/components/form-long-text-input.component.html +++ b/web/src/app/modules/forms/modules/generic-form/components/form-long-text-input.component.html @@ -1,8 +1,8 @@
            - + -
            \ No newline at end of file +
            • diff --git a/web/src/app/modules/forms/modules/generic-form/components/form-single-selection-input.component.html b/web/src/app/modules/forms/modules/generic-form/components/form-single-selection-input.component.html index c9dea9cfc..fcdaa2b98 100644 --- a/web/src/app/modules/forms/modules/generic-form/components/form-single-selection-input.component.html +++ b/web/src/app/modules/forms/modules/generic-form/components/form-single-selection-input.component.html @@ -1,5 +1,5 @@
            - + @@ -7,4 +7,4 @@ {{errorMessage}} {{meta.longDesc}}
            - \ No newline at end of file + diff --git a/web/src/app/modules/forms/modules/generic-form/components/form-text-input.component.html b/web/src/app/modules/forms/modules/generic-form/components/form-text-input.component.html index 261985d44..b29f2c648 100644 --- a/web/src/app/modules/forms/modules/generic-form/components/form-text-input.component.html +++ b/web/src/app/modules/forms/modules/generic-form/components/form-text-input.component.html @@ -1,5 +1,5 @@
            - + @@ -7,4 +7,4 @@ {{errorMessage}} {{meta.longDesc}}
            - \ No newline at end of file + diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index 0393d1ddf..b4fb671ab 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -187,4 +187,4 @@ }, "zoomIn": "Vergrößern", "zoomOut": "Verkleinern" -} +} \ No newline at end of file diff --git a/web/src/assets/i18n/gb.json b/web/src/assets/i18n/gb.json index e4ee3c63e..741fb7211 100644 --- a/web/src/assets/i18n/gb.json +++ b/web/src/assets/i18n/gb.json @@ -187,4 +187,4 @@ }, "zoomIn": "Zoom in", "zoomOut": "Zoom out" -} +} \ No newline at end of file From f76281e192daaddf0a2536af0c184a8009757291 Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Wed, 10 Oct 2018 22:10:06 +0200 Subject: [PATCH 07/10] History display improvement --- .../specmate-model-ecore/model/specmate.ecore | 2 + .../model/specmate.history | 14 +++++++ bundles/specmate-model-gen/build.properties | 10 +++++ bundles/specmate-model-gen/plugin.properties | 4 ++ .../com/specmate/model/history/Change.java | 28 +++++++++++++ .../model/history/HistoryPackage.java | 40 ++++++++++++++++--- .../model/history/impl/ChangeImpl.java | 39 ++++++++++++++++++ .../history/impl/HistoryPackageImpl.java | 21 +++++++--- .../specmate/persistency/IChangeListener.java | 2 +- .../specmate/persistency/ITransaction.java | 13 +++++- .../cdo/internal/CDOPersistencyService.java | 4 +- .../cdo/internal/DeltaProcessor.java | 22 +++++----- .../cdo/internal/HistoryProviderImpl.java | 14 +++++-- .../cdo/internal/TransactionImpl.java | 14 ++++--- web/src/app/model/Change.ts | 1 + .../components/history-view.component.ts | 13 ++++++ .../simple-history-view.component.html | 8 ++-- web/src/assets/i18n/de.json | 2 + web/src/assets/i18n/gb.json | 1 + 19 files changed, 213 insertions(+), 39 deletions(-) create mode 100644 bundles/specmate-model-gen/build.properties create mode 100644 bundles/specmate-model-gen/plugin.properties diff --git a/bundles/specmate-model-ecore/model/specmate.ecore b/bundles/specmate-model-ecore/model/specmate.ecore index 89f62c5ca..2e79b1daa 100644 --- a/bundles/specmate-model-ecore/model/specmate.ecore +++ b/bundles/specmate-model-ecore/model/specmate.ecore @@ -222,6 +222,8 @@ + diff --git a/bundles/specmate-model-ecore/model/specmate.history b/bundles/specmate-model-ecore/model/specmate.history index 71f75715b..4d9cd39c1 100644 --- a/bundles/specmate-model-ecore/model/specmate.history +++ b/bundles/specmate-model-ecore/model/specmate.history @@ -2267,5 +2267,19 @@ + + + + + + + + + + + + + + diff --git a/bundles/specmate-model-gen/build.properties b/bundles/specmate-model-gen/build.properties new file mode 100644 index 000000000..fb7b5b415 --- /dev/null +++ b/bundles/specmate-model-gen/build.properties @@ -0,0 +1,10 @@ +# + +bin.includes = specmate-model-gen.jar,\ + model/,\ + icons/,\ + plugin.xml,\ + plugin.properties +jars.compile.order = specmate-model-gen.jar +source.specmate-model-gen.jar = src/ +output.specmate-model-gen.jar = bin/ diff --git a/bundles/specmate-model-gen/plugin.properties b/bundles/specmate-model-gen/plugin.properties new file mode 100644 index 000000000..f9e6efcaa --- /dev/null +++ b/bundles/specmate-model-gen/plugin.properties @@ -0,0 +1,4 @@ +# + +pluginName = Specmate Model +providerName = www.example.org diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/Change.java b/bundles/specmate-model-gen/src/com/specmate/model/history/Change.java index c05585d2f..484dd67fb 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/Change.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/Change.java @@ -14,6 +14,7 @@ *

            *
              *
            • {@link com.specmate.model.history.Change#getObjectName Object Name}
              • + *
            • {@link com.specmate.model.history.Change#getObjectType Object Type}
              • *
            • {@link com.specmate.model.history.Change#getOldValue Old Value}
              • *
            • {@link com.specmate.model.history.Change#getNewValue New Value}
              • *
            • {@link com.specmate.model.history.Change#getFeature Feature}
              • @@ -53,6 +54,33 @@ public interface Change extends CDOObject { */ void setObjectName(String value); + /** + * Returns the value of the 'Object Type' attribute. + * The default value is "". + * + *

              + * If the meaning of the 'Object Type' attribute isn't clear, + * there really should be more of a description here... + *

              + * + * @return the value of the 'Object Type' attribute. + * @see #setObjectType(String) + * @see com.specmate.model.history.HistoryPackage#getChange_ObjectType() + * @model default="" + * @generated + */ + String getObjectType(); + + /** + * Sets the value of the '{@link com.specmate.model.history.Change#getObjectType Object Type}' attribute. + * + * + * @param value the new value of the 'Object Type' attribute. + * @see #getObjectType() + * @generated + */ + void setObjectType(String value); + /** * Returns the value of the 'Old Value' attribute. * diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java b/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java index 2cb6e61c8..933c80912 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/HistoryPackage.java @@ -185,6 +185,15 @@ public interface HistoryPackage extends EPackage { */ int CHANGE__OBJECT_NAME = 0; + /** + * The feature id for the 'Object Type' attribute. + * + * + * @generated + * @ordered + */ + int CHANGE__OBJECT_TYPE = 1; + /** * The feature id for the 'Old Value' attribute. * @@ -192,7 +201,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__OLD_VALUE = 1; + int CHANGE__OLD_VALUE = 2; /** * The feature id for the 'New Value' attribute. @@ -201,7 +210,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__NEW_VALUE = 2; + int CHANGE__NEW_VALUE = 3; /** * The feature id for the 'Feature' attribute. @@ -210,7 +219,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__FEATURE = 3; + int CHANGE__FEATURE = 4; /** * The feature id for the 'Is Create' attribute. @@ -219,7 +228,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__IS_CREATE = 4; + int CHANGE__IS_CREATE = 5; /** * The feature id for the 'Is Delete' attribute. @@ -228,7 +237,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE__IS_DELETE = 5; + int CHANGE__IS_DELETE = 6; /** * The number of structural features of the 'Change' class. @@ -237,7 +246,7 @@ public interface HistoryPackage extends EPackage { * @generated * @ordered */ - int CHANGE_FEATURE_COUNT = 6; + int CHANGE_FEATURE_COUNT = 7; /** * The number of operations of the 'Change' class. @@ -356,6 +365,17 @@ public interface HistoryPackage extends EPackage { */ EAttribute getChange_ObjectName(); + /** + * Returns the meta object for the attribute '{@link com.specmate.model.history.Change#getObjectType Object Type}'. + * + * + * @return the meta object for the attribute 'Object Type'. + * @see com.specmate.model.history.Change#getObjectType() + * @see #getChange() + * @generated + */ + EAttribute getChange_ObjectType(); + /** * Returns the meta object for the attribute '{@link com.specmate.model.history.Change#getOldValue Old Value}'. * @@ -520,6 +540,14 @@ interface Literals { */ EAttribute CHANGE__OBJECT_NAME = eINSTANCE.getChange_ObjectName(); + /** + * The meta object literal for the 'Object Type' attribute feature. + * + * + * @generated + */ + EAttribute CHANGE__OBJECT_TYPE = eINSTANCE.getChange_ObjectType(); + /** * The meta object literal for the 'Old Value' attribute feature. * diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/ChangeImpl.java b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/ChangeImpl.java index 2317fe229..452db6b49 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/ChangeImpl.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/ChangeImpl.java @@ -18,6 +18,7 @@ *

              *
                *
              • {@link com.specmate.model.history.impl.ChangeImpl#getObjectName Object Name}
                • + *
              • {@link com.specmate.model.history.impl.ChangeImpl#getObjectType Object Type}
                • *
              • {@link com.specmate.model.history.impl.ChangeImpl#getOldValue Old Value}
                • *
              • {@link com.specmate.model.history.impl.ChangeImpl#getNewValue New Value}
                • *
              • {@link com.specmate.model.history.impl.ChangeImpl#getFeature Feature}
                • @@ -38,6 +39,16 @@ public class ChangeImpl extends CDOObjectImpl implements Change { */ protected static final String OBJECT_NAME_EDEFAULT = null; + /** + * The default value of the '{@link #getObjectType() Object Type}' attribute. + * + * + * @see #getObjectType() + * @generated + * @ordered + */ + protected static final String OBJECT_TYPE_EDEFAULT = ""; + /** * The default value of the '{@link #getOldValue() Old Value}' attribute. * @@ -135,6 +146,24 @@ public void setObjectName(String newObjectName) { eDynamicSet(HistoryPackage.CHANGE__OBJECT_NAME, HistoryPackage.Literals.CHANGE__OBJECT_NAME, newObjectName); } + /** + * + * + * @generated + */ + public String getObjectType() { + return (String)eDynamicGet(HistoryPackage.CHANGE__OBJECT_TYPE, HistoryPackage.Literals.CHANGE__OBJECT_TYPE, true, true); + } + + /** + * + * + * @generated + */ + public void setObjectType(String newObjectType) { + eDynamicSet(HistoryPackage.CHANGE__OBJECT_TYPE, HistoryPackage.Literals.CHANGE__OBJECT_TYPE, newObjectType); + } + /** * * @@ -235,6 +264,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case HistoryPackage.CHANGE__OBJECT_NAME: return getObjectName(); + case HistoryPackage.CHANGE__OBJECT_TYPE: + return getObjectType(); case HistoryPackage.CHANGE__OLD_VALUE: return getOldValue(); case HistoryPackage.CHANGE__NEW_VALUE: @@ -260,6 +291,9 @@ public void eSet(int featureID, Object newValue) { case HistoryPackage.CHANGE__OBJECT_NAME: setObjectName((String)newValue); return; + case HistoryPackage.CHANGE__OBJECT_TYPE: + setObjectType((String)newValue); + return; case HistoryPackage.CHANGE__OLD_VALUE: setOldValue((String)newValue); return; @@ -290,6 +324,9 @@ public void eUnset(int featureID) { case HistoryPackage.CHANGE__OBJECT_NAME: setObjectName(OBJECT_NAME_EDEFAULT); return; + case HistoryPackage.CHANGE__OBJECT_TYPE: + setObjectType(OBJECT_TYPE_EDEFAULT); + return; case HistoryPackage.CHANGE__OLD_VALUE: setOldValue(OLD_VALUE_EDEFAULT); return; @@ -319,6 +356,8 @@ public boolean eIsSet(int featureID) { switch (featureID) { case HistoryPackage.CHANGE__OBJECT_NAME: return OBJECT_NAME_EDEFAULT == null ? getObjectName() != null : !OBJECT_NAME_EDEFAULT.equals(getObjectName()); + case HistoryPackage.CHANGE__OBJECT_TYPE: + return OBJECT_TYPE_EDEFAULT == null ? getObjectType() != null : !OBJECT_TYPE_EDEFAULT.equals(getObjectType()); case HistoryPackage.CHANGE__OLD_VALUE: return OLD_VALUE_EDEFAULT == null ? getOldValue() != null : !OLD_VALUE_EDEFAULT.equals(getOldValue()); case HistoryPackage.CHANGE__NEW_VALUE: diff --git a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java index 597d9e134..8e104c351 100644 --- a/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java +++ b/bundles/specmate-model-gen/src/com/specmate/model/history/impl/HistoryPackageImpl.java @@ -241,7 +241,7 @@ public EAttribute getChange_ObjectName() { * * @generated */ - public EAttribute getChange_OldValue() { + public EAttribute getChange_ObjectType() { return (EAttribute)changeEClass.getEStructuralFeatures().get(1); } @@ -250,7 +250,7 @@ public EAttribute getChange_OldValue() { * * @generated */ - public EAttribute getChange_NewValue() { + public EAttribute getChange_OldValue() { return (EAttribute)changeEClass.getEStructuralFeatures().get(2); } @@ -259,7 +259,7 @@ public EAttribute getChange_NewValue() { * * @generated */ - public EAttribute getChange_Feature() { + public EAttribute getChange_NewValue() { return (EAttribute)changeEClass.getEStructuralFeatures().get(3); } @@ -268,7 +268,7 @@ public EAttribute getChange_Feature() { * * @generated */ - public EAttribute getChange_IsCreate() { + public EAttribute getChange_Feature() { return (EAttribute)changeEClass.getEStructuralFeatures().get(4); } @@ -277,10 +277,19 @@ public EAttribute getChange_IsCreate() { * * @generated */ - public EAttribute getChange_IsDelete() { + public EAttribute getChange_IsCreate() { return (EAttribute)changeEClass.getEStructuralFeatures().get(5); } + /** + * + * + * @generated + */ + public EAttribute getChange_IsDelete() { + return (EAttribute)changeEClass.getEStructuralFeatures().get(6); + } + /** * * @@ -321,6 +330,7 @@ public void createPackageContents() { changeEClass = createEClass(CHANGE); createEAttribute(changeEClass, CHANGE__OBJECT_NAME); + createEAttribute(changeEClass, CHANGE__OBJECT_TYPE); createEAttribute(changeEClass, CHANGE__OLD_VALUE); createEAttribute(changeEClass, CHANGE__NEW_VALUE); createEAttribute(changeEClass, CHANGE__FEATURE); @@ -370,6 +380,7 @@ public void initializePackageContents() { initEClass(changeEClass, Change.class, "Change", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getChange_ObjectName(), ecorePackage.getEString(), "objectName", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getChange_ObjectType(), ecorePackage.getEString(), "objectType", "", 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getChange_OldValue(), ecorePackage.getEString(), "oldValue", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getChange_NewValue(), ecorePackage.getEString(), "newValue", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getChange_Feature(), ecorePackage.getEString(), "feature", null, 0, 1, Change.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/bundles/specmate-persistency-api/src/com/specmate/persistency/IChangeListener.java b/bundles/specmate-persistency-api/src/com/specmate/persistency/IChangeListener.java index 16f12653a..af9b72362 100644 --- a/bundles/specmate-persistency-api/src/com/specmate/persistency/IChangeListener.java +++ b/bundles/specmate-persistency-api/src/com/specmate/persistency/IChangeListener.java @@ -10,7 +10,7 @@ public interface IChangeListener { void changedObject(EObject object, EStructuralFeature feature, EChangeKind changeKind, Object oldValue, - Object newValue); + Object newValue, String objectClassName); void removedObject(EObject object); diff --git a/bundles/specmate-persistency-api/src/com/specmate/persistency/ITransaction.java b/bundles/specmate-persistency-api/src/com/specmate/persistency/ITransaction.java index 710e9c570..208b73ddb 100644 --- a/bundles/specmate-persistency-api/src/com/specmate/persistency/ITransaction.java +++ b/bundles/specmate-persistency-api/src/com/specmate/persistency/ITransaction.java @@ -10,8 +10,17 @@ * */ public interface ITransaction extends IView { - public static final String COMMENT_FIELD_SEPARATOR = ";"; - public static final String COMMENT_DATA_SEPARATOR = ","; + /* + * A comment can consist of several records. Each record consists of one or more + * fields. Each field consists of one or more data items. + * + * Example with the following records (username;deleted objects;comment): + * michael;Model1|CEGModel,Library Folder|Folder;deleted empty models + */ + + public static final String COMMENT_FIELD_SEPARATOR = ","; + public static final String COMMENT_DATA_SEPARATOR = "|"; + public static final String COMMENT_RECORD_SEPARATOR = ";"; /** Rolls back changes made in this transaction since the last commit */ public void rollback(); diff --git a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/CDOPersistencyService.java b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/CDOPersistencyService.java index 7a583a679..817aa9c3c 100644 --- a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/CDOPersistencyService.java +++ b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/CDOPersistencyService.java @@ -367,8 +367,8 @@ protected void detachedObject(CDOID id, int version) { @Override public void changedObject(CDOID id, EStructuralFeature feature, EChangeKind changeKind, Object oldValue, - Object newValue, int index) { - postEvent(view, id, null, 0, Collections.singletonMap(feature, newValue), changeKind, index); + Object newValue, int index, String objectClassName) { + postEvent(view, id, objectClassName, 0, Collections.singletonMap(feature, newValue), changeKind, index); } }; processor.process(); diff --git a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/DeltaProcessor.java b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/DeltaProcessor.java index 29c475afe..cab373d94 100644 --- a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/DeltaProcessor.java +++ b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/DeltaProcessor.java @@ -47,53 +47,55 @@ public void process() { for (CDORevisionKey key : data.getChangedObjects()) { if (key instanceof CDORevisionDelta) { CDORevisionDelta delta = (CDORevisionDelta) key; + // System.out.println(delta.getEClass().getName()); for (CDOFeatureDelta fDelta : delta.getFeatureDeltas()) { - processDelta(delta.getID(), fDelta); + processDelta(delta.getID(), fDelta, delta.getEClass().getName()); } } } } - private void processDelta(CDOID id, CDOFeatureDelta delta) { + private void processDelta(CDOID id, CDOFeatureDelta delta, String objectClassName) { if (delta.getType().equals(Type.LIST)) { CDOListFeatureDelta listDelta = (CDOListFeatureDelta) delta; ArrayList deltas = new ArrayList<>(listDelta.getListChanges()); for (CDOFeatureDelta nestedDelta : deltas) { - processDelta(id, nestedDelta); + processDelta(id, nestedDelta, objectClassName); } return; } - processBasicDelta(id, delta); + processBasicDelta(id, delta, objectClassName); } - private void processBasicDelta(CDOID id, CDOFeatureDelta delta) { + private void processBasicDelta(CDOID id, CDOFeatureDelta delta, String objectClassName) { switch (delta.getType()) { case SET: CDOSetFeatureDelta setDelta = (CDOSetFeatureDelta) delta; changedObject(id, setDelta.getFeature(), EChangeKind.SET, setDelta.getOldValue(), setDelta.getValue(), - setDelta.getIndex()); + setDelta.getIndex(), objectClassName); break; case ADD: CDOAddFeatureDelta addDelta = (CDOAddFeatureDelta) delta; - changedObject(id, addDelta.getFeature(), EChangeKind.ADD, null, addDelta.getValue(), addDelta.getIndex()); + changedObject(id, addDelta.getFeature(), EChangeKind.ADD, null, addDelta.getValue(), addDelta.getIndex(), + objectClassName); break; case REMOVE: CDORemoveFeatureDelta removeDelta = (CDORemoveFeatureDelta) delta; changedObject(id, removeDelta.getFeature(), EChangeKind.REMOVE, removeDelta.getValue(), null, - removeDelta.getIndex()); + removeDelta.getIndex(), objectClassName); break; case CLEAR: CDOClearFeatureDelta clearDelta = (CDOClearFeatureDelta) delta; - changedObject(id, clearDelta.getFeature(), EChangeKind.CLEAR, null, null, 0); + changedObject(id, clearDelta.getFeature(), EChangeKind.CLEAR, null, null, 0, objectClassName); break; } } protected abstract void changedObject(CDOID id, EStructuralFeature feature, EChangeKind changeKind, Object oldValue, - Object newValue, int index); + Object newValue, int index, String objectClassName); protected abstract void newObject(CDOID id, String className, Map featureMap); diff --git a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java index 945ae8096..689e93b63 100644 --- a/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java +++ b/bundles/specmate-persistency-cdo/src/com/specmate/persistency/cdo/internal/HistoryProviderImpl.java @@ -125,7 +125,7 @@ private void extractCommentInfo(CDOCommitInfo cdoHistoryElement, HistoryEntry hi return; } - String[] info = comment.split(ITransaction.COMMENT_FIELD_SEPARATOR); + String[] info = comment.split(ITransaction.COMMENT_RECORD_SEPARATOR); if (info.length == 0) { return; } @@ -133,7 +133,7 @@ private void extractCommentInfo(CDOCommitInfo cdoHistoryElement, HistoryEntry hi historyEntry.setUser(info[0]); if (info.length == 2) { - String[] deletedObjects = info[1].split(ITransaction.COMMENT_DATA_SEPARATOR); + String[] deletedObjects = info[1].split(ITransaction.COMMENT_FIELD_SEPARATOR); for (int i = 0; i < deletedObjects.length; i++) { historyEntry.getDeletedObjects().add(deletedObjects[i]); } @@ -177,7 +177,7 @@ public List getChanges() { @Override protected void changedObject(CDOID id, EStructuralFeature feature, EChangeKind changeKind, Object oldValue, - Object newValue, int index) { + Object newValue, int index, String objectClassName) { if (!id.equals(this.cdoId)) { return; } @@ -197,6 +197,7 @@ protected void changedObject(CDOID id, EStructuralFeature feature, EChangeKind c change.setOldValue(oldValue.toString()); } + change.setObjectType(objectClassName); change.setFeature(feature.getName()); change.setObjectName(objectName); changes.add(change); @@ -217,6 +218,7 @@ protected void newObject(CDOID id, String className, Map detachedObjects) { StringBuilder names = new StringBuilder(); if (detachedObjects.size() > 0) { - names.append(COMMENT_FIELD_SEPARATOR); + names.append(COMMENT_RECORD_SEPARATOR); boolean addDataSeparator = false; for (CDOIDAndVersion cdoidv : detachedObjects) { CDOObject obj = transaction.getObject(cdoidv.getID()); if (obj instanceof ISpecmateModelObject || obj instanceof com.specmate.model.processes.Process) { INamed named = (INamed) obj; if (addDataSeparator) { - names.append(COMMENT_DATA_SEPARATOR); + names.append(COMMENT_FIELD_SEPARATOR); } + names.append(named.getName()); + names.append(COMMENT_DATA_SEPARATOR); + names.append(named.eClass().getName()); addDataSeparator = true; } } } - names.append(COMMENT_FIELD_SEPARATOR); + names.append(COMMENT_RECORD_SEPARATOR); return names.toString(); } @@ -194,12 +197,13 @@ protected void detachedObject(CDOID id, int version) { @Override public void changedObject(CDOID id, EStructuralFeature feature, EChangeKind changeKind, Object oldValue, - Object newValue, int index) { + Object newValue, int index, String objectClassName) { for (IChangeListener listener : changeListeners) { if (newValue instanceof CDOID) { newValue = transaction.getObject((CDOID) newValue); } - listener.changedObject(transaction.getObject(id), feature, changeKind, oldValue, newValue); + listener.changedObject(transaction.getObject(id), feature, changeKind, oldValue, newValue, + objectClassName); } } diff --git a/web/src/app/model/Change.ts b/web/src/app/model/Change.ts index f86fe98eb..b5d211533 100644 --- a/web/src/app/model/Change.ts +++ b/web/src/app/model/Change.ts @@ -11,6 +11,7 @@ // Attributes public objectName: EString; + public objectType: EString; public oldValue: EString; public newValue: EString; public feature: EString; diff --git a/web/src/app/modules/views/side/modules/history-view/components/history-view.component.ts b/web/src/app/modules/views/side/modules/history-view/components/history-view.component.ts index dfe0c7471..864e80b3f 100644 --- a/web/src/app/modules/views/side/modules/history-view/components/history-view.component.ts +++ b/web/src/app/modules/views/side/modules/history-view/components/history-view.component.ts @@ -37,6 +37,19 @@ export class HistoryView { }); } + public getDeletedObjectName(s: string): string { + return s.split('|')[0]; + } + + public getDeletedObjectType(s: string): string { + let data = s.split('|'); + if (data.length == 2) { + return '(' + data[1] + ')'; + } + + return ''; + } + public getDate(timestamp: string): Date { // jax-rs serializes long as string, so we need to convert here return new Date(Number(timestamp)); diff --git a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html index 81374500c..4b414b988 100644 --- a/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html +++ b/web/src/app/modules/views/side/modules/history-view/components/simple-history-view.component.html @@ -8,17 +8,17 @@
                {{getDate(entry.timestamp) | date:'yyyy-MM-dd HH:mm:ss'}} {{entry.user}}
                • -  {{deletedObject}} +  {{getDeletedObjectName(deletedObject)}} {{getDeletedObjectType(deletedObject)}}
                • -  {{change.objectName}} ({{change.feature}}) -
                  {{change.newValue}} +  {{change.objectName}} ({{change.objectType}}) +
                  {{change.feature | translate | titlecase }} {{ 'ChangedTo' | translate }}: {{change.newValue}}
                  -  {{change.objectName}} +  {{change.objectName}} ({{change.objectType}})
                diff --git a/web/src/assets/i18n/de.json b/web/src/assets/i18n/de.json index b4fb671ab..2d5ff923b 100644 --- a/web/src/assets/i18n/de.json +++ b/web/src/assets/i18n/de.json @@ -2,6 +2,7 @@ "Action": "Aktion", "Cause-EffectModels": "Ursache-Wirkungs-Modelle", "Changed": "Verändert", + "ChangedTo": "geändert nach", "Changes": "Änderungsverlauf", "Condition": "Zustand", "ConfirmationRequired": "Bestätigung erforderlich", @@ -74,6 +75,7 @@ "createTestSpecification": "Testspezifikation anlegen", "createTestStep": "Testschritt anlegen", "delete": "Löschen", + "description": "Beschreibung", "discard": "Verwerfen", "discardUnsavedChangesConfirmation": "Es gibt ungespeicherte Änderungen. Verwerfen?", "doYouReallyWantToDelete": "Möchten Sie \"{{name}}\" wirklich löschen?", diff --git a/web/src/assets/i18n/gb.json b/web/src/assets/i18n/gb.json index 741fb7211..93742b065 100644 --- a/web/src/assets/i18n/gb.json +++ b/web/src/assets/i18n/gb.json @@ -2,6 +2,7 @@ "Action": "Action", "Cause-EffectModels": "Cause-Effect Models", "Changed": "Changed", + "ChangedTo": "changed to", "Changes": "Change History", "Condition": "Condition", "ConfirmationRequired": "Confirmation required", From d1960bffd381254e1860828df6f241a6700b1843 Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Thu, 11 Oct 2018 23:08:25 +0200 Subject: [PATCH 08/10] Let view controller decide whether to show tracing links --- .../specmate/components/specmate.component.html | 4 +++- .../services/view-controller.service.ts | 11 ++++++++++- .../components/tracing-links.component.html | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/web/src/app/modules/specmate/components/specmate.component.html b/web/src/app/modules/specmate/components/specmate.component.html index 6625f681a..d38a35479 100644 --- a/web/src/app/modules/specmate/components/specmate.component.html +++ b/web/src/app/modules/specmate/components/specmate.component.html @@ -13,7 +13,9 @@ - + + + diff --git a/web/src/app/modules/views/controller/modules/view-controller/services/view-controller.service.ts b/web/src/app/modules/views/controller/modules/view-controller/services/view-controller.service.ts index 1086f106a..00d602575 100644 --- a/web/src/app/modules/views/controller/modules/view-controller/services/view-controller.service.ts +++ b/web/src/app/modules/views/controller/modules/view-controller/services/view-controller.service.ts @@ -6,6 +6,7 @@ import { SelectedElementService } from '../../../../side/modules/selected-elemen import { AdditionalInformationService } from '../../../../side/modules/links-actions/services/additional-information.service'; import { AuthenticationService } from '../../../../main/authentication/modules/auth/services/authentication.service'; import { Folder } from '../../../../../../model/Folder'; +import { ISpecmateModelObject } from '../../../../../../model/ISpecmateModelObject'; @Injectable() export class ViewControllerService { @@ -61,7 +62,15 @@ export class ViewControllerService { } public get tracingLinksShown(): boolean { - return this.isLoggedIn && Type.is(this.selectedElementService.selectedElement, ProcessStep); + let selected = this.selectedElementService.selectedElement; + if (this.isLoggedIn && selected !== undefined) { + let model = selected as ISpecmateModelObject; + if (model.tracesTo !== undefined) { + return true; + } + } + + return false; } public get linksActionsShown(): boolean { diff --git a/web/src/app/modules/views/side/modules/tracing-links/components/tracing-links.component.html b/web/src/app/modules/views/side/modules/tracing-links/components/tracing-links.component.html index 44cdf71cb..0bafc0332 100644 --- a/web/src/app/modules/views/side/modules/tracing-links/components/tracing-links.component.html +++ b/web/src/app/modules/views/side/modules/tracing-links/components/tracing-links.component.html @@ -1,4 +1,4 @@ -
                +
                {{'Traces' | translate}} @@ -9,7 +9,7 @@
                - + @@ -31,4 +31,4 @@
              - \ No newline at end of file + From e7398a1d253ff84ba9935773f76bd399ae51436b Mon Sep 17 00:00:00 2001 From: Sebastian Eder <23170307+sebeder@users.noreply.github.com> Date: Fri, 12 Oct 2018 15:47:54 +0200 Subject: [PATCH 09/10] Enabling disabling content-validation-checks --- .../components/common-controls.component.ts | 6 +----- .../modules/validation/services/validation.service.ts | 10 +++++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/web/src/app/modules/actions/modules/common-controls/components/common-controls.component.ts b/web/src/app/modules/actions/modules/common-controls/components/common-controls.component.ts index f59c11d99..a6348f17e 100644 --- a/web/src/app/modules/actions/modules/common-controls/components/common-controls.component.ts +++ b/web/src/app/modules/actions/modules/common-controls/components/common-controls.component.ts @@ -1,11 +1,7 @@ -import { Location } from '@angular/common'; -import { Component, Input, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { SpecmateDataService } from '../../../../data/modules/data-service/services/specmate-data.service'; -import { ConfirmationModal } from '../../../../notification/modules/modals/services/confirmation-modal.service'; import { NavigatorService } from '../../../../navigation/modules/navigator/services/navigator.service'; -import { Config } from '../../../../../config/config'; import { ValidationService } from '../../../../forms/modules/validation/services/validation.service'; -import { IContainer } from '../../../../../model/IContainer'; import { TranslateService } from '@ngx-translate/core'; import { ServerConnectionService } from '../../../../common/modules/connection/services/server-connection-service'; diff --git a/web/src/app/modules/forms/modules/validation/services/validation.service.ts b/web/src/app/modules/forms/modules/validation/services/validation.service.ts index 463063eb4..7782c34d1 100644 --- a/web/src/app/modules/forms/modules/validation/services/validation.service.ts +++ b/web/src/app/modules/forms/modules/validation/services/validation.service.ts @@ -5,10 +5,14 @@ import { ValidationResult } from '../../../../../validation/validation-result'; import { Injectable } from '@angular/core'; import { RequiredFieldsValidator } from '../../../../../validation/required-fields-validator'; import { NavigatorService } from '../../../../navigation/modules/navigator/services/navigator.service'; +import { Folder } from '../../../../../model/Folder'; +import { Type } from '../../../../../util/type'; @Injectable() export class ValidationService { + private static DISABLED_CHILD_VALIDATION_TYPES: { className: string }[] = [Folder]; + constructor(private navigator: NavigatorService) { } private static requiredFieldValidatorMap: {[className: string]: RequiredFieldsValidator}; @@ -42,7 +46,11 @@ export class ValidationService { } public get currentValid(): boolean { - return this.isValid(this.navigator.currentElement, this.navigator.currentContents); + const currentElement = this.navigator.currentElement; + const ignoreContents = ValidationService.DISABLED_CHILD_VALIDATION_TYPES + .find(disabledType => Type.is(currentElement, disabledType)) !== undefined; + const contents = ignoreContents ? [] : this.navigator.currentContents; + return this.isValid(this.navigator.currentElement, contents); } public get currentInvalidElements(): IContainer[] { From 1f8b1d2bd7fd21204cb269bed392b1b9ba4f8404 Mon Sep 17 00:00:00 2001 From: Michael Unterkalmsteiner Date: Sun, 14 Oct 2018 10:57:54 +0200 Subject: [PATCH 10/10] Fix trace view controller --- .../view-controller/services/view-controller.service.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web/src/app/modules/views/controller/modules/view-controller/services/view-controller.service.ts b/web/src/app/modules/views/controller/modules/view-controller/services/view-controller.service.ts index 00d602575..26adbceb4 100644 --- a/web/src/app/modules/views/controller/modules/view-controller/services/view-controller.service.ts +++ b/web/src/app/modules/views/controller/modules/view-controller/services/view-controller.service.ts @@ -1,4 +1,3 @@ -import { ProcessStep } from '../../../../../../model/ProcessStep'; import { Type } from '../../../../../../util/type'; import { Injectable } from '@angular/core'; import { Config } from '../../../../../../config/config'; @@ -6,7 +5,7 @@ import { SelectedElementService } from '../../../../side/modules/selected-elemen import { AdditionalInformationService } from '../../../../side/modules/links-actions/services/additional-information.service'; import { AuthenticationService } from '../../../../main/authentication/modules/auth/services/authentication.service'; import { Folder } from '../../../../../../model/Folder'; -import { ISpecmateModelObject } from '../../../../../../model/ISpecmateModelObject'; +import { CEGModel } from '../../../../../../model/CEGModel'; @Injectable() export class ViewControllerService { @@ -64,8 +63,7 @@ export class ViewControllerService { public get tracingLinksShown(): boolean { let selected = this.selectedElementService.selectedElement; if (this.isLoggedIn && selected !== undefined) { - let model = selected as ISpecmateModelObject; - if (model.tracesTo !== undefined) { + if (Type.is(selected, CEGModel) && selected['tracesTo']) { return true; } }