Bug 242219 - Can't force text compare for UML models in ganymede
Summary: Can't force text compare for UML models in ganymede
Status: CLOSED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows XP
: P3 enhancement with 1 vote (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 210001 220457
Blocks:
  Show dependency tree
 
Reported: 2008-07-28 08:05 EDT by Lutz Wrage CLA
Modified: 2011-08-18 04:05 EDT (History)
4 users (show)

See Also:


Attachments
location of the export menu (13.09 KB, image/png)
2009-01-07 10:57 EST, Laurent Goubet CLA
no flags Details
my compare view (28.02 KB, image/jpeg)
2009-01-08 05:33 EST, Ruben Lang CLA
no flags Details
plug-in registry contentMergeViewers (86.65 KB, image/jpeg)
2009-01-09 04:27 EST, Ruben Lang CLA
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Lutz Wrage CLA 2008-07-28 08:05:33 EDT
In ganymede it is not possible to compare UML models using text compare. The solution from the FAQ (http://wiki.eclipse.org/EMF_Compare_FAQ#How_to_force_text_comparison.3F) does not work in 3.4.
Comment 1 Ruben Lang CLA 2009-01-07 07:28:42 EST
It's the same with *.xmi files. They're even listed as 'locked' under 'Content Types' 'Text' -> 'XML' -> 'XML Metadata Interchange (XMI)'. This is very annoying since graphical Ecore Compare of my *.xmi files is pretty useless for me.

Thanks for fixing.

Greetz,
Ruben
Comment 2 Laurent Goubet CLA 2009-01-07 07:37:24 EST
Ruben,

humm we shouldn't have xmi compared through EMF Compare in the first place, the impossibility to compare files textually should only be true with ecore and uml. If xmi gets compared with EMF Compare, then you most likely have it added under the "EMF Compare" content type. Simply remove it from there.
Comment 3 Ruben Lang CLA 2009-01-07 09:05:26 EST
(In reply to comment #2)
> Ruben,
> 
> humm we shouldn't have xmi compared through EMF Compare in the first place, the
> impossibility to compare files textually should only be true with ecore and
> uml. If xmi gets compared with EMF Compare, then you most likely have it added
> under the "EMF Compare" content type. Simply remove it from there.
> 

Hi Laurent,

nope, *.xmi isn't listed anywhere but under 'Text' ... '.. (XMI)'. "EMF Compare" has only those three types: '*.ecore', '*.emfdiff' and '*.uml'.

Ruben
Comment 4 Laurent Goubet CLA 2009-01-07 09:26:02 EST
Ruben,

Could you provide me with a little more info then? With only those three content types listed under "EMF Compare", you select two ".xmi" files, right click and select compare with => each other and still it is EMF Compare that's called up? Are you sure it isn't WTP or another of your plugins that's providing a custom tool for xmi comparison?

What puzzles me even more is that we have had the opposite problem issued to us : http://www.eclipse.org/newsportal/article.php?id=5468&group=eclipse.technology.emft .

We've never seen EMF Compare being used were it shouldn't have been before :(.
Comment 5 Ruben Lang CLA 2009-01-07 10:51:36 EST
(In reply to comment #4)
> Ruben,
> 
> Could you provide me with a little more info then? With only those three
> content types listed under "EMF Compare", you select two ".xmi" files, right
> click and select compare with => each other and still it is EMF Compare that's
> called up? Are you sure it isn't WTP or another of your plugins that's
> providing a custom tool for xmi comparison?
> 
> What puzzles me even more is that we have had the opposite problem issued to us
> :
> http://www.eclipse.org/newsportal/article.php?id=5468&group=eclipse.technology.emft
> .
> 
> We've never seen EMF Compare being used were it shouldn't have been before :(.
> 

Hi Laurent,

yes, no matter how I'm trying to compare an .xmi file to another (history, cvs, rightclick) no text compare schows up. WTP is not installed. It's eclipse-modeling-ganymede-SR1-incubation-win32.zip with only AnyEditTools manually added (tried already without it).

I'm not sure it's "EMF Compare". How can I tell which editor/compare is beeing shown? It looks like "EMF Compare" as far as I can tell. (comparing .ecore files looks similar)

Ruben
Comment 6 Laurent Goubet CLA 2009-01-07 10:57:24 EST
Created attachment 121817 [details]
location of the export menu

Then there is a good chance it *is* EMF Compare ... Yet how can it be selected as the comparison engine for files which are *not* registered under the content-type EMF Compare I truly fail to understand.

A good way to see if it is indeed EMF Compare is to look at the little save icon on the top right of the comparison UI (see attached image): if it contains a drop down item "As emfdiff", then it's EMF Compare' UI.
Comment 7 Ruben Lang CLA 2009-01-08 05:33:53 EST
Created attachment 121931 [details]
my compare view
Comment 8 Ruben Lang CLA 2009-01-08 05:35:12 EST
(In reply to comment #6)
> Created an attachment (id=121817) [details]
> location of the export menu
> 
> Then there is a good chance it *is* EMF Compare ... Yet how can it be selected
> as the comparison engine for files which are *not* registered under the
> content-type EMF Compare I truly fail to understand.
> 
> A good way to see if it is indeed EMF Compare is to look at the little save
> icon on the top right of the comparison UI (see attached image): if it contains
> a drop down item "As emfdiff", then it's EMF Compare' UI.
> 

Hi Laurent,

there's no save icon in the upper right corner (see (previously attached)  attachment). The compare uses the same look & feel (element icons) as the "Sample (Reflective) Ecore Model Editor". The same is true for .ecore model files (editing and comparing looking similar).

Ruben
Comment 9 Laurent Goubet CLA 2009-01-08 11:52:41 EST
Yes , apart from the missing structural differences and save icon, this seems awfully close to EMF Compare :(. I have never seen it called were it shouldn't have been and have to idea how it could even be called on xmi files if *.xmi isn't in the EMF Compare content-type... let alone help you on that matter :/.

Could you open the plug-in registry and filter on "org.eclipse.compare.diff.engine" to see if any plugin in your configuration provides a diff engine on "xmi" file-extension? And another filter on org.eclipse.compare.contentMergeViewer to see if any plugin provides a custom comparison for xmi files? Just send me screenshots with those filter activated, either here or via mail :).

Thanks for your time
Comment 10 Ruben Lang CLA 2009-01-09 04:27:00 EST
Created attachment 122076 [details]
plug-in registry contentMergeViewers

Hi Laurent,

with filtering on 'org.eclipse.compare.diff.engine' nothing showed up. Filtering on 'org.eclipse.compare.contentMergeViewer' hit. I found a contentTypeBinding for 'org.eclipse.emf.ecore.xmi' under 'org.eclipse.emf.compare.ui' (see attached screenshot). Does this help/explain?

Sparing some of my time for getting help could be seen as selfish :). Thanks for yours.

Ruben
Comment 11 Laurent Goubet CLA 2009-01-09 05:44:29 EST
Ruben,

ok that makes it clear and it is indeed a problem on our side ... seems the behavior has changed since my first tests in 3.4. This will be fixed in our very next build but, out of curiosity, which version of Eclipse are you using?
Comment 12 Ruben Lang CLA 2009-01-09 07:49:14 EST
(In reply to comment #11)
> Ruben,
> 
> ok that makes it clear and it is indeed a problem on our side ... seems the
> behavior has changed since my first tests in 3.4. This will be fixed in our
> very next build but, out of curiosity, which version of Eclipse are you using?
> 

Hi Laurent,

Eclipse Version:

Eclipse Platform

Version: 3.4.1
Build id: M20080911-1700

5th donwload on www.eclipse.org/downloads 'Eclipse Modeling Tools...', filename 'eclipse-modeling-ganymede-SR1-incubation-win32.zip'.

Thanks for fixing.

Ruben
Comment 13 Laurent Goubet CLA 2009-01-14 09:23:04 EST
Ruben,

After some more investigation, this is something we cannot fix directly within EMF Compare :(. EMF Compare being called for xmi files comparison will not be fixed directly : we'll have to find a way to allow users to force the text comparison (hence fixing this bug) so that you can at least fall back to the default comparison.

What causes your files to be compared with EMF Compare even though their extension isn't registered is the FIX mentionned on bug 217986 , comment #2. This bug also shows links to bug against the compare framework that prevent us from totally fixing these issues.
Comment 14 Laurent Goubet CLA 2009-01-27 04:33:38 EST
We found a way to work around bug #210001 to fix bug #199882 , a way to call for a textual comparison from EMF compare UI should be provided in the coming builds.
Comment 15 Laurent Goubet CLA 2009-04-08 08:03:11 EDT
Adding bug 220457 as a blocker of this one since its resolution will resolve this
Comment 16 Laurent Goubet CLA 2009-05-15 08:05:04 EDT
Fixes for compare bug 266476 solved this problem, allowing users to change the comparator to be used from the compare editor.
Comment 17 Laurent Goubet CLA 2009-05-15 08:05:44 EDT
FIX available through Eclipse platform 3.5M6
Comment 18 Laurent Goubet CLA 2011-08-18 04:05:17 EDT
Closing our "resolved" and "verified" bugs.