|
|
| Re: [EMF Compare] Compare editor return a text compare and not a model compare [message #1015144 is a reply to message #1015018] |
Wed, 27 February 2013 15:11   |
 Jacques Bouthillier
Messages: 5
Registered: May 2011 |
Junior Member |
|
|
Hi Laurent,
Note: this is not the only model I get the error.(ClassCastException)
The code to test is available from github
1- The model code I used to test is :
Remote Fetch URL github.com/lmcalvs/modelSamples.git
I used the model/ExtendedPO.ecorediag
If you try to compare the ExtendedPO.ecorediag with the previous version, Only the text compare will show, not the EMF compare as a model GUI, but the diff can be seen if you select text compare
2- The code from R4E is available on github as well:
Remote Fetch URL github.com:lmcalvs/r4e_reviews.git
The branch is: emf_compare_merge_2.1
Target platform used: r4e-emf-compare_2.1_eclipse3.8_mylyn3.9
3- To use R4E
Instruction on user guide:
http://wiki.eclipse.org/Reviews/R4E/User_Guide
Since the R4E code is in your workspace, execute R4E in the runtime,
- Open R4E navigator view
- Create a review group
- Create a R4E review
To test the model:
- Right click on the EcoreModel project, then Select R4E (Find review Item)
- In the dialogue, just press ok, this will generate the review item for the testing
--> The handling of the model will be executed from the following class: UIEMFCompareUtils.createModelDeltas()
The error listed in the previous discussion will occurs when we try to open the EMF compare editor with the comparison of the model file: ecoreModels/model/ExtendedPO.ecorediag
Thanks
Jacques
|
|
|
| Re: [EMF Compare] Compare editor return a text compare and not a model compare [message #1015578 is a reply to message #1015144] |
Fri, 01 March 2013 09:28 |
|
Jacques,
There are a number of problems in there :
If I try and "compare with > ..." the ecorediag model, EMF Compare is simply not called. Please go to Window > Preferences, then General > Content-Types. In there, add "*.ecorediag" in the "Text > XML > XML Metadata Interchange (XMI)" content-type. There will soon be an "EMF Compare" specific content-type (planned for M6), but for now you can use the XMI one.
Second, even if you _do_ add the correct content-type, EGit will not call the necessary Team APIs to allow us to kick in and say that "ecorediag" cannot be compared alone : it needs to be compared along with its associated "ecore" file. Thus, the comparison will show a lot of "label" changes since we haven't loaded the associated ecore (everything is proxy, so every label, computed on the fly, changes). Label changes can be safely ignored, they are planned for deletion. As for EGit, we are currently working on its integration with the model providers, and a number of improvements are already in review from their side.
Laurent Goubet
Obeo
|
|
|
|
| Re: [EMF Compare] Compare editor return a text compare and not a model compare [message #1015670 is a reply to message #1015635] |
Fri, 01 March 2013 15:57 |
|
Jacques,
I do not get NPEs from my side, but as I mentionned there is a lot of ongoing development both from our side and EGit to better support the logical models (the link between ecorediag and ecore, in your case). A lot of errors have been fixed already, but there are some that remains. For now, you should avoid comparing files from Git repositories with their remote revisions. This will already be much more stable by M6, the planned end of development for this integration is M7. Do note that even with M6, you will still need to update EGit to one of its latest versions to benefit from this.
Laurent Goubet
Obeo
|
|
|
|
Powered by
FUDForum. Page generated in 1.79311 seconds
] 
Search
Help
Register
Login
Home
