Diff and Merge with Ease: EMF Compare
- 1. DIFF AND MERGE WITH EASE E M F C O M PA R E Mikaël Barbero Obeo October 30th, 2013 Eclipse Con Europe © Csilla Zelko http://500px.com/photo/37091940
- 2. DIFF AND MERGE WITH EASE E M F C O M PA R E Mikaël Barbero Obeo October 30th, 2013 Eclipse Con Europe © Csilla Zelko http://500px.com/photo/37091940
- 3. DIFF AND MERGE WITH EASE E M F C O M PA R E Mikaël Barbero Obeo October 30th, 2013 Eclipse Con Europe
- 4. DIFF AND MERGE WITH EASE E M F C O M PA R E Mikaël Barbero Obeo October 30th, 2013 Eclipse Con Europe
- 6. Who know what is EMF? © David Cornejo http://500px.com/photo/1683454
- 7. Who know what is EMF? I T I S P R E C I S E LY W H AT W E W I L L N O T TA L K A B O U T © David Cornejo http://500px.com/photo/1683454
- 8. IT IS ALL ABOUT DIFFERENCES © Adrian Limani http://500px.com/photo/18438151
- 13. E M F C O M PA R E BIRD VIEW EMF MODEL 1 EMF MODEL 2
- 14. E M F C O M PA R E BIRD VIEW EMF MODEL 1 EMF MODEL 2
- 15. E M F C O M PA R E BIRD VIEW EMF MODEL 1 C O M PA R I S O N EMF MODEL 2
- 16. E M F C O M PA R E BIRD VIEW EMF MODEL 1 C O M PA R I S O N EMF MODEL 2 MERGED MODEL
- 17. E M F C O M PA R E BIRD VIEW EMF MODEL 1 EMF MODEL 2 EMF MODEL 3 C O M PA R I S O N MERGED MODEL
- 19. TA G L I N E If you can inject your data within EMF, ! EMF Compare will diff and merge it for free
- 20. INDEX
- 21. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 Structured Data Comparison
- 22. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 Structured Data Comparison © Guille Massagué Conde http://500px.com/photo/42703584 Java API Evolution
- 23. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 Structured Data Comparison © Guille Massagué Conde http://500px.com/photo/42703584 Java API Evolution © Ryan Photography http://500px.com/photo/33582547 Incremental Transformation
- 24. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 Structured Data Comparison © Guille Massagué Conde http://500px.com/photo/42703584 Java API Evolution © Ryan Photography http://500px.com/photo/33582547 Incremental Transformation
- 25. <? XML ?>
- 26. <? XML ?> <? TROUBLE ?>
- 27. DOM MODEL <?xml version="1.0"?> <project name="guice"> <target name="jar" depends="manifest"> <jar jarfile="guice-${version}.jar"> <zipfileset src="${build.dir}/deps.jar"/> </jar> </target> </project>
- 28. DOM MODEL DOCUMENT <?xml version="1.0"?> <project name="guice"> <target name="jar" depends="manifest"> <jar jarfile="guice-${version}.jar"> <zipfileset src="${build.dir}/deps.jar"/> </jar> </target> </project> ELEMENT NAME AT T R I B U T E NAME VA L U E
- 29. 3… 2… 1… SHOWTIME © Christoph Ruhland http://500px.com/photo/1145370
- 30. ANT MODEL <?xml version="1.0"?> <project name="guice"> <target name="jar" depends="manifest"> <jar jarfile="guice-${version}.jar"> <zipfileset src="${build.dir}/deps.jar"/> </jar> </target> </project>
- 31. ANT MODEL PROJECT <?xml version="1.0"?> <project name="guice"> <target name="jar" depends="manifest"> <jar jarfile="guice-${version}.jar"> <zipfileset src="${build.dir}/deps.jar"/> </jar> </target> </project> TA R G E T NAME DEPENDS JAR DIRECTIVE
- 32. ANT MODEL PROJECT <?xml version="1.0"?> <project name="guice"> <target name="jar" depends="manifest"> <jar jarfile="guice-${version}.jar"> <zipfileset src="${build.dir}/deps.jar"/> </jar> </target> </project> TA R G E T NAME DEPENDS JAR DIRECTIVE …
- 33. 3… 2… 1… SHOWTIME © Christoph Ruhland http://500px.com/photo/1145370
- 34. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 © Guille Massagué Conde http://500px.com/photo/42703584 Structured Data Comparison Java API Evolution © Ryan Photography http://500px.com/photo/33582547 Incremental Transformation
- 35. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 © Guille Massagué Conde http://500px.com/photo/42703584 Structured Data Comparison Java API Evolution © Ryan Photography http://500px.com/photo/33582547 Incremental Transformation
- 38. RULES FOR E V O LV I N G A P I I N T E R F A C E S CHANGE RESTRICTION IF NOT IMPLEMENTED BY CLIENT DELETE API METHOD MOVE API METHOD UP TYPE HIERARCHY B I N A R Y C O M PAT I B L E IF IMPLEMENTED BY CLIENT ADD API METHOD I M PA C T B R E A K S C O M PAT I B I L I T Y — B R E A K S C O M PAT I B I L I T Y IF METHOD IN SUPERTYPE NEED NOT BE IMPLEMENTED BY CLIENT B I N A R Y C O M PAT I B L E IF METHOD IN SUPERTYPE MUST BE IMPLEMENTED BY CLIENT B R E A K S C O M PAT I B I L I T Y http://wiki.eclipse.org/index.php/Evolving_Java-based_APIs
- 39. C O M PA R I S O N M O D E L TEARDOWN
- 40. C O M PA R I S O N M O D E L TEARDOWN C O M PA R I S O N
- 41. C O M PA R I S O N M O D E L TEARDOWN C O M PA R I S O N REFERENCE CHANGE
- 42. C O M PA R I S O N M O D E L TEARDOWN C O M PA R I S O N REFERENCE CHANGE EREFERENCE (FROM ECORE)
- 43. C O M PA R I S O N M O D E L TEARDOWN C O M PA R I S O N REFERENCE CHANGE EOBJECT (FROM ECORE) EREFERENCE (FROM ECORE)
- 44. C O M PA R I S O N M O D E L TEARDOWN C O M PA R I S O N AT T R I B U T E CHANGE REFERENCE CHANGE EOBJECT (FROM ECORE) EREFERENCE (FROM ECORE)
- 45. C O M PA R I S O N M O D E L TEARDOWN C O M PA R I S O N E AT T R I B U T E (FROM ECORE) AT T R I B U T E CHANGE REFERENCE CHANGE EOBJECT (FROM ECORE) EREFERENCE (FROM ECORE)
- 46. C O M PA R I S O N M O D E L TEARDOWN C O M PA R I S O N E AT T R I B U T E (FROM ECORE) AT T R I B U T E CHANGE REFERENCE CHANGE E J AVA O B J E C T EOBJECT (FROM ECORE) (FROM ECORE) EREFERENCE (FROM ECORE)
- 47. 3… 2… 1… SHOWTIME © Christoph Ruhland http://500px.com/photo/1145370
- 48. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 Structured Data Comparison © Guille Massagué Conde http://500px.com/photo/42703584 Java API Evolution © Ryan Photography http://500px.com/photo/33582547 Incremental Transformation
- 49. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 Structured Data Comparison © Guille Massagué Conde http://500px.com/photo/42703584 Java API Evolution © Ryan Photography http://500px.com/photo/33582547 Incremental Transformation
- 50. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0
- 51. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0
- 52. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0
- 53. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0
- 54. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL A1 MODEL B0
- 55. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 MODEL B1
- 56. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 MODEL B1
- 57. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 MODEL B1
- 58. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL A1 MODEL B0
- 59. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 E M F C O M PA R E
- 60. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL A1 E M F C O M PA R E
- 61. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL A1 E M F C O M PA R E
- 62. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 C O M PA R I S O N MODEL A1 E M F C O M PA R E
- 63. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 C O M PA R I S O N MODEL A1 E M F C O M PA R E MODEL B0
- 64. 3… 2… 1… SHOWTIME © Christoph Ruhland http://500px.com/photo/1145370
- 65. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 MODEL B1
- 66. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL B2 MODEL A1 MODEL B1
- 67. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL B2 MODEL A1 MODEL B1 E M F C O M PA R E
- 68. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 MODEL B1
- 69. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 MODEL B1 MODEL B2
- 70. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 MODEL B1 MODEL B2
- 71. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL A1 MODEL B1 MODEL B2
- 72. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL B2 MODEL A1 MODEL B1 MODEL B3
- 73. PRINCIPLES OF I N C R E M E N TA L T R A N S F O R M AT I O N MODEL A0 MODEL B0 MODEL B2 MODEL A1 MODEL B1 MODEL B3 E M F C O M PA R E
- 74. 3… 2… 1… SHOWTIME © Christoph Ruhland http://500px.com/photo/1145370
- 75. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 Structured Data Comparison © Guille Massagué Conde http://500px.com/photo/42703584 Java API Evolution © Ryan Photography http://500px.com/photo/33582547 Incremental Transformation
- 76. INDEX © Joe @Plasmatico http://500px.com/photo/38068154 Structured Data Comparison © Guille Massagué Conde http://500px.com/photo/42703584 Java API Evolution © Ryan Photography http://500px.com/photo/33582547 Incremental Transformation
- 78. « One more thing! » G R A P H I C A L C O M PA R I S O N
- 79. W H AT Y O U S H O U L D REMEMBER • Infinite potential for delta computation • EMF Compare will diff and merge any EMF data for free • Default UI with tremendous extension capabilities © Braeden Petruk http://500px.com/photo/23711467
- 80. H T T P : / / W W W. E C L I P S E . O R G / E M F / C O M PA R E / EMF Compare
- 82. PLEASE L E AV E F E E D B A C K SIGN IN W W W. E C L I P S E C O N . O R G SELECT SESSION E V A L U AT E VOTE +1, 0, OR -1 © Denis Dervisevic http://www.flickr.com/photos/denisdervisevic/4745520501/