SuccessChanges

Summary

  1. Fixed performance regression due to the category mechanism (details)
  2. Revert "Improved a few hashCode() implementations" (details)
  3. Bug 506290 - NPE with null values on multi-valued attributes (details)
Commit 9ea5cf14744c1daddb738d08b9ea425214ab58a4 by olivier constant
Fixed performance regression due to the category mechanism

Change-Id: I1fc91146a2f4791e29a8034a4af83e853746d475
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
The file was modifiedplugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java
Commit 06c25384b57d7d48ed6ed4349d146e1edfbd8d50 by olivier constant
Revert "Improved a few hashCode() implementations"

This reverts commit 8a9b4c3bb829a3df879eae6aab651bd53996050b.
The file was modifiedplugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ValuesViewer.java
The file was modifiedplugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/ComparisonResourceManager.java
The file was modifiedplugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/diffdata/impl/EMatchImpl.java
The file was modifiedplugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/FeaturesViewer.java
The file was modifiedplugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/helpers/DiffOperation.java
Commit 25bb9d574aae0890984ec4b33b10dfb6e4fabcce by olivier constant
Bug 506290 - NPE with null values on multi-valued attributes

Change-Id: I5a75f51f60281bff9bc05b68be217b6bcf8409cc
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
The file was modifiedplugins/org.eclipse.emf.diffmerge/src/org/eclipse/emf/diffmerge/impl/scopes/AbstractModelScope.java