Model Merge Tooling: Whats New in EMF Diff/Merge for Neon - - PowerPoint PPT Presentation

▶
model merge tooling what s new in emf diff merge for neon
SMART_READER_LITE
LIVE PREVIEW

Model Merge Tooling: Whats New in EMF Diff/Merge for Neon - - PowerPoint PPT Presentation

Nov 06, 2022 208 likes •421 views

Model Merge Tooling: Whats New in EMF Diff/Merge for Neon ECLIPSECON FRANCE, 08/06/2016 Model merging? + Transfer data Align (totally/partially) model subsets Report changes 2 EMF Diff/Merge Vision Merging =

slide-1
SLIDE 1

Model Merge Tooling: What’s New in EMF Diff/Merge for Neon

ECLIPSECON FRANCE, 08/06/2016

slide-2
SLIDE 2

2

Model merging?

+ –

▌Transfer data ▌Align (totally/partially) model subsets ▌Report changes ▌…

slide-3
SLIDE 3

3

EMF Diff/Merge

▌Vision Merging = primitive, consistency-preserving operation for model manipulation, transformation, evolution

slide-4
SLIDE 4

4

EMF Diff/Merge

▌Vision Merging = primitive, consistency-preserving operation for model manipulation, transformation, evolution Operates on arbitrary model scopes whose behavior can be customized

slide-5
SLIDE 5

5

EMF Diff/Merge

▌Vision Merging = primitive, consistency-preserving operation for model manipulation, transformation, evolution Operates on arbitrary model scopes whose behavior can be customized customized semantics of addition, deletion,

  • rdering…
slide-6
SLIDE 6

6

EMF Diff/Merge

▌Vision Merging = primitive, consistency-preserving operation for model manipulation, transformation, evolution Operates on arbitrary model scopes whose behavior can be customized ▌ A framework for implementing merge-based features customized semantics of addition, deletion,

  • rdering…
slide-7
SLIDE 7

7

Project contents

Engine/Framework UI Components Modeling Patterns Model Synchronization SCM Integration

slide-8
SLIDE 8

8

UI Components – improvements

▌Multiline viewer and tooltip ▌Next/Previous toolbar button

Neon

slide-9
SLIDE 9

9

UI Components – improvements

▌Local history support

Neon

slide-10
SLIDE 10

10

SCM Integration

▌EGit support

Neon

slide-11
SLIDE 11

11

SCM Integration

▌Subversion support

Neon

slide-12
SLIDE 12

12

(Offline) Model Synchronization

▌Approach

Synchronization definition

=

NEW - Experimental

Point Modelers Integrated Modeling System Modeling  CAD, CAM, ...  DMU  LIFE CYCLE  SYSTEM DMU / MECHATRONICS  DIGITAL PRODUCTION

Sys2Soft

slide-13
SLIDE 13

13

(Offline) Model Synchronization

▌Approach

+

Mapping [sources, targets]

Synchronization definition

=

NEW - Experimental

Point Modelers Integrated Modeling System Modeling  CAD, CAM, ...  DMU  LIFE CYCLE  SYSTEM DMU / MECHATRONICS  DIGITAL PRODUCTION

Sys2Soft

slide-14
SLIDE 14

14

(Offline) Model Synchronization

▌Approach

+

Mapping [sources, targets]

Synchronization definition

=

NEW - Experimental

Experiments so far: Java, EMF-IncQuery, Xtend Could also be: OCL, QVT, …?

Point Modelers Integrated Modeling System Modeling  CAD, CAM, ...  DMU  LIFE CYCLE  SYSTEM DMU / MECHATRONICS  DIGITAL PRODUCTION

Sys2Soft

slide-15
SLIDE 15

15

(Offline) Model Synchronization

Update policy

▌Approach

+

Mapping [sources, targets]

Synchronization definition

=

NEW - Experimental

Experiments so far: Java, EMF-IncQuery, Xtend Could also be: OCL, QVT, …?

Point Modelers Integrated Modeling System Modeling  CAD, CAM, ...  DMU  LIFE CYCLE  SYSTEM DMU / MECHATRONICS  DIGITAL PRODUCTION

Sys2Soft

slide-16
SLIDE 16

16

(Offline) Model Synchronization

Sources Targets

Synchronization execution

=

▌Approach

Point Modelers Integrated Modeling System Modeling  CAD, CAM, ...  DMU  LIFE CYCLE  SYSTEM DMU / MECHATRONICS  DIGITAL PRODUCTION

Sys2Soft

NEW - Experimental

slide-17
SLIDE 17

17

(Offline) Model Synchronization

Sources Targets

  • 1. Query &

Transform

Synchronization execution

=

▌Approach

Point Modelers Integrated Modeling System Modeling  CAD, CAM, ...  DMU  LIFE CYCLE  SYSTEM DMU / MECHATRONICS  DIGITAL PRODUCTION

Sys2Soft

NEW - Experimental

slide-18
SLIDE 18

18

(Offline) Model Synchronization

Sources Targets Trace

  • 1. Query &

Transform

Synchronization execution

=

▌Approach

Point Modelers Integrated Modeling System Modeling  CAD, CAM, ...  DMU  LIFE CYCLE  SYSTEM DMU / MECHATRONICS  DIGITAL PRODUCTION

Sys2Soft

NEW - Experimental

slide-19
SLIDE 19

19

(Offline) Model Synchronization

Sources Targets

  • 2. Compare &

Update Trace

  • 1. Query &

Transform

Synchronization execution

=

▌Approach

Reconciliation / Impact UI

Point Modelers Integrated Modeling System Modeling  CAD, CAM, ...  DMU  LIFE CYCLE  SYSTEM DMU / MECHATRONICS  DIGITAL PRODUCTION

Sys2Soft

NEW - Experimental

slide-20
SLIDE 20

The end

▌http://wiki.eclipse.org/EMF_DiffMerge