Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Modeling » EMF Diff/Merge » Is the UI useable on RCP app without (too many) dependancies ?
Is the UI useable on RCP app without (too many) dependancies ? [message #1276954] Tue, 25 March 2014 05:09 Go to next message
Jean-Baptiste Sarrodie is currently offline Jean-Baptiste Sarrodie
Messages: 3
Registered: March 2014
Junior Member
Hi,

I'm currently working on adding merge feature on an RCP application. In that context I'm starting to use you (good) diff/merge engine and I've read most information published on the wiki.

However, I've not found real examples of how to use the minimum UI components, and I wonder if using it would leads me to also include (too many) dependancies. I tried EMF Compare and this ruins my RCP apps as a lot of eclipse things came with it (team, Git...).

So do you have a small, working example of how to use it and some informations regarding dependancies (FYI, my app is based on EMF and GEF, not GMF).

Regards

Re: Is the UI useable on RCP app without (too many) dependancies ? [message #1277078 is a reply to message #1276954] Tue, 25 March 2014 09:20 Go to previous messageGo to next message
Olivier Constant is currently offline Olivier Constant
Messages: 33
Registered: January 2012
Member
Hello Jean-Baptiste,

The basic EMF Diff/Merge feature is indeed tailored for the Modeling platform and includes a customization for GMF.

Nevertheless, you may just include in your RCP application plug-ins org.eclipse.emf.diffmerge (engine) and org.eclipse.emf.diffmerge.ui (GUI).

Here are the transitive dependencies.

* Engine:
org.eclipse.core.runtime
org.eclipse.osgi
org.eclipse.equinox.common
org.eclipse.core.jobs
org.eclipse.core.runtime.compatibility.registry
org.eclipse.equinox.registry
org.eclipse.equinox.preferences
org.eclipse.core.contenttype
org.eclipse.equinox.app
org.eclipse.emf.ecore
org.eclipse.emf.common
org.eclipse.emf.ecore.xmi
org.eclipse.emf.edit
org.eclipse.emf.ecore.change

* GUI: same as engine plus:
org.eclipse.compare
org.eclipse.compare.core
org.eclipse.ui
org.eclipse.swt
org.eclipse.jface
org.eclipse.core.commands
org.eclipse.ui.workbench
org.eclipse.emf.ecore.edit
org.eclipse.emf.edit.ui
org.eclipse.ui.views
org.eclipse.emf.common.ui
org.eclipse.emf.workspace
org.eclipse.core.resources
org.eclipse.emf.transaction
org.eclipse.emf.validation

Is that OK for your needs?

Cheers,
Olivier
Re: Is the UI useable on RCP app without (too many) dependancies ? [message #1277320 is a reply to message #1277078] Tue, 25 March 2014 17:06 Go to previous messageGo to next message
Jean-Baptiste Sarrodie is currently offline Jean-Baptiste Sarrodie
Messages: 3
Registered: March 2014
Junior Member
Hi,

Thank you for your answer.

This list of dependancies seems fine and manageable.

Do you have a code snippet or example of how to use the UI? I've tried to figure how to do it through the wiki but didn't succeed so far.

Regards
Re: Is the UI useable on RCP app without (too many) dependancies ? [message #1279257 is a reply to message #1277320] Fri, 28 March 2014 09:17 Go to previous messageGo to next message
Olivier Constant is currently offline Olivier Constant
Messages: 33
Registered: January 2012
Member
Hi Jean-Baptiste,

I just added a simple dialog for displaying comparisons and merging without using the Eclipse Compare mechanism. It is called ui.util.DiffMergeDialog and it is included in the last build (see "Build jobs: main" in the wiki page).

final EMFDiffNode diffNode = new EMFDiffNode(YOUR_COMPARISON, ...);
final Display display = Display.getDefault();
display.syncExec(new Runnable() {
  public void run() {
    DiffMergeDialog dialog = new DiffMergeDialog(
        display.getActiveShell(), "Your Title", diffNode);
    dialog.open();
  }
});
Re: Is the UI useable on RCP app without (too many) dependancies ? [message #1280153 is a reply to message #1279257] Sat, 29 March 2014 18:20 Go to previous message
Jean-Baptiste Sarrodie is currently offline Jean-Baptiste Sarrodie
Messages: 3
Registered: March 2014
Junior Member
Hi Olivier,

Thank you !

This helps me a lot.
Previous Topic:Comparison and reference
Next Topic:How to totally hide Merge dialogs ?
Goto Forum:
  


Current Time: Thu Jul 24 04:39:45 EDT 2014

Powered by FUDForum. Page generated in 0.01634 seconds