Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Modeling » Papyrus » How to open GMF Compare Viewer for merging
How to open GMF Compare Viewer for merging [message #1403484] Thu, 24 July 2014 06:51 Go to next message
Marc-Florian Wendland is currently offline Marc-Florian WendlandFriend
Messages: 69
Registered: January 2013
Member
Hi all,

I started investigating the status of the graphical comparison capabilities
of Papyrus Luna, but I must admit I failed to merely open the graphical
compare editor. I installed all the necessary plugins both from Papyrus
Update Site and EMF compare.

I followed the instructions at
http://www.eclipse.org/emf/compare/documentation/latest/user/user-guide.html#Graphical_Comparison
but with no success. Every time I try to compare the graphical file (i.e.
the notation file), the textual compare editor is opened.

I would appreciate any hint on what I am doing wrong.

Best regards,
Marc-Florian
Re: How to open GMF Compare Viewer for merging [message #1403847 is a reply to message #1403484] Mon, 28 July 2014 09:24 Go to previous messageGo to next message
Camille Letavernier is currently offline Camille LetavernierFriend
Messages: 582
Registered: February 2011
Senior Member
Hi Marc-Florian,

In theory, the EMF Compare editor works fine when used on *.uml, *.di and *.notation files (Or the top-level Papyrus pseudo-folder). The support for *.notation and *.uml is natively provided by EMF Compare, whereas the support for *.di comparison is provided by Papyrus/UML Compare.

Note that EMF Compare relies on Content Types to identify models, which means that if you changed your content-type definitions in your workspace settings, this may prevent the comparison from working properly. Also, the current version of EMF Compare doesn't work properly when partial/invalid EMF/UML models are used (e.g. if a library/profile is missing). The scope of the comparison is the current project, so, trying to compare a Papyrus model when you have an invalid (even unrelated) *.xmi model in the same project will most likely not work.

HTH,
Camille


Camille Letavernier
Papyrus developer
Re: How to open GMF Compare Viewer for merging [message #1403891 is a reply to message #1403847] Mon, 28 July 2014 13:20 Go to previous messageGo to next message
Marc-Florian Wendland is currently offline Marc-Florian WendlandFriend
Messages: 69
Registered: January 2013
Member
Hi Camille,

after setting the content type explicitly to .notation in the Preferences,
it worked as expected. Thanks for the hint.

I have encountered a different defect when playing around with branching and
merging. Everytime you merge with the content of a branch, the compare
editor finishes with an exception related to the textual compare annotations
in the XMI. See pictures 1-3. After manually removing the content within the
workspace annotations (see picture 4) the compare model can be calculated
without any problems.

The notation file seems a little bit more buggy, since the diagrams always
get corrupted when trying to merge. It can be corrected manually and then
merged as well, but with almost no visual support (since all references got
broken).

Is merging of branches conceptually treated differently from merging
revisions of the same URL? It seems so to me, since a simply synchronization
with the repository did not cause any such failures.

I am not sure whether this is a Papyrus- or EMF Compare-related defect, too.

Best regards,
Marc-Florian

"Camille Letavernier" wrote in message
news:lr54s8$q7u$1@xxxxxxxxe.org...

Hi Marc-Florian,

In theory, the EMF Compare editor works fine when used on *.uml, *.di and
*.notation files (Or the top-level Papyrus pseudo-folder). The support for
*.notation and *.uml is natively provided by EMF Compare, whereas the
support for *.di comparison is provided by Papyrus/UML Compare.

Note that EMF Compare relies on Content Types to identify models, which
means that if you changed your content-type definitions in your workspace
settings, this may prevent the comparison from working properly. Also, the
current version of EMF Compare doesn't work properly when partial/invalid
EMF/UML models are used (e.g. if a library/profile is missing). The scope of
the comparison is the current project, so, trying to compare a Papyrus model
when you have an invalid (even unrelated) *.xmi model in the same project
will most likely not work.

HTH,
Camille
Re: How to open GMF Compare Viewer for merging [message #1403901 is a reply to message #1403891] Mon, 28 July 2014 14:08 Go to previous message
Camille Letavernier is currently offline Camille LetavernierFriend
Messages: 582
Registered: February 2011
Senior Member
Hi,

Papyrus only provides a thin integration layer on top of EMF Compare (A few menu contributions). Most bugs (and questions) should be reported to EMF Compare.

Quote:
Is merging of branches conceptually treated differently from merging
revisions of the same URL? It seems so to me, since a simply synchronization
with the repository did not cause any such failures.


I don't know. Maybe in some cases, the files are "pre-merged by Git"? I've had issues with that even for standard Java projects. The "Pre-merged" option wasn't really helpful last time I tried it (This might have been fixed since then). If you don't use "Pre-merged", these tags shouldn't appear.

HTH,
Camille


Camille Letavernier
Papyrus developer
Previous Topic:Should C++ code generation work with Kepler SR2?
Next Topic:Mapping URIs
Goto Forum:
  


Current Time: Thu Mar 05 18:45:01 GMT 2015

Powered by FUDForum. Page generated in 0.03381 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software