View
6
Download
0
Category
Preview:
Citation preview
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 1
Collaborative Modelingfor DSMLs in Papyrus
with EMF Compare
June 23rd, 2015
Maximilian Koegel mkoegel@eclipsesource.com
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 2
Collaboration on models is essential
● Models become large● Teams of developers need to collaborate on models● Teams need to be able to work in isolation and integrate
their work later● Users need to understand what was changed and how
© by MIKI Yoshihito,CC licensed
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 3
Example of basic collaboration workflow
master
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 4
Example of basic collaboration workflow
clone
clone
master
master
master
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 5
Example of basic collaboration workflow
master
topicA
master
master
topicB
createbranch, commit
to branch
createbranch, commit
to branch
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 6
Example of basic collaboration workflow
mergeinto
master
master
topicA
master
master
topicB
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 7
Example of basic collaboration workflow
push tomaster
master
topicA
master
master
topicB
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 8
Example of basic collaboration workflow
pull frommaster
master
topicA
master
topicB
master
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 9
Example of basic collaboration workflow
mergeinto
master
master
topicA
master
topicB
master
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 10
Comparing Models without EMFCompare
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 11
Comparing Models with EMF Compare
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 12
Comparing Models with EMF Compare
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 13
EMF Compare integrates with Papyrus
● Customization for UML○ UML Profile support
■ Stereotypes■ Profiles
○ Support for the other specifics of UML■ Associations, Opaque Actions...
● Customization for GMF○ Visualization of diagram changes○ Diagram Layout changes
● Customization for Papyrus○ CSS support for diagram changes○ Special handling of Papyrus model file (di)
■ di, model, and notation are one unit■ Team actions available on model node
○ Papyrus-specific save parameters are respected
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 14
Demo: Papyrus, EMF Compare & EGit
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 15
More information
http://collaborative-modeling.org
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 16
Backup slides
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 17
Example of basic collaboration workflow
push tomaster
topicA
master
master
topicB
master
© 2015 EclipseSource | http://eclipsesource.com/munich | Dr. Maximilian Koegel | Collaborative Modeling 18
Example of basic collaboration workflow
pullmaster topicA
master
master
topicB
master
Recommended