Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-05-21[398361] Model Merge UIaxrichard/modelmergeuiAxel Richard16-1101/+1735
New model merge UI
2013-05-16Rename SubDiffElementsFilter as CascadingDifferencesFilterAxel Richard3-6/+7
Rename in class and in plugin.xml
2013-05-15add kepler m7 target platformMikaël Barbero1-0/+46
2013-05-14Bug fix: the creation of phantoms in lists does not take into accountCedric Notot1-6/+48
invisible items to locate to the correct position.
2013-05-13fix choco commitMikaël Barbero1-4/+15
String(byte[], Charset) is JDK6 only
2013-05-13change the range for the #populateMenuManager fixMikaël Barbero1-1/+1
It has been fixed for kepler, the workaround must be there for juno only.
2013-05-09A cache for distance computationcbrun1-0/+137
Follow up of the previous commit with the actual cache implementation.
2013-05-07A cache for distance computationcbrun2-3/+4
During the content match, as model grows we often compute the same distance(a,b) or even an supposedly equivalent one : distance(b,a) This commit introduces a CachingDistance which wrapps another distance and cache the results for subsequent calls.
2013-05-02remove unnecessary singleton directive2.1.0M7Mikaël Barbero1-1/+1
2013-04-30[406537] Edition of text merge viewer live-updates model.Mikaël Barbero2-29/+245
We are now listening to any change of the text merge viewer. Each time we spawn a delayed update thread capable to update the model. It provides very convenient textual editing facilities.
2013-04-30Execute UI-related code in safe utilityMikaël Barbero2-20/+57
In case listeners are called from non UI code.
2013-04-30Added minimum version of UML to 4.0Mikaël Barbero1-2/+2
2013-04-30Added method to log exceptionsMikaël Barbero1-0/+11
2013-04-30[406310] Item doesn't collapse after slecting a new diff.Axel Richard1-113/+123
Explicitly collapse the parent's old selected item.
2013-04-30[406513] Define a label of 42 whitespaces to make the selection easier.Axel Richard2-2/+10
2013-04-30remove hard dependency to uml 4.1 in testsMikaël Barbero1-2/+2
2013-04-30remove hard dependency to papyrus 0.10 in testsMikaël Barbero1-1/+1
2013-04-29[406539] - NPE when using groupsAxel Richard1-2/+7
Test null value of match before calling method on it.
2013-04-29Removed unnecessary keywordMikaël Barbero1-1/+1
2013-04-29Add progress monitor to logical model resolution.Mikaël Barbero7-80/+180
- modifiy every methods that should report progress in NotLoadingResourceSet, SyncResourceSet and EMFSynchronizationModel - adjust time factor of different logical model operations Change-Id: I9f700092a392fd5f995cfa2a43da1e062465ab4c
2013-04-26Fixed the enable status of merge buttonMikaël Barbero1-1/+1
Only set the merge button active when the selected diff is unresolved
2013-04-26[406445] copy all should also work in 2 waysMikaël Barbero4-15/+75
Previously, it was only able to do its work on 3 ways, or on 2 ways from left to right. The CopyAllNonConflictingCommand has been deprecated as long as it was containing a broken filter that should be done externally. Without this filter the Command become unnecessary.
2013-04-26[406626] update dirty state during content merger viewer <init>Mikaël Barbero6-43/+61
also prevent potential NPE in CMVContentProvider when comparing EObject not in resources.
2013-04-25[406541] allow merge when comparing two EObjectsMikaël Barbero2-22/+28
Do not systematically create TransactionalEditingDomain in constructor
2013-04-25make the save possible from the EMFCompareTextMergeViewerMikaël Barbero1-39/+34
2013-04-25[406548] Allow to save more than onceMikaël Barbero4-136/+114
- listen to property changes in content merge viewer and react accordingly when it is the editing domain that change - re-create a new CompareEditingDomain for each new Comparison and dispose properly the previous one.
2013-04-25Remove comparison cache fieldMikaël Barbero2-11/+3
It's dangerous if it changes
2013-04-25[406540] - Diff not selected in content viewersAxel Richard1-108/+63
Improve many case where the diff selected in the StructureMergeViewer was not selected in the ContentMergeViewer parts.
2013-04-25[406536] Listen to textual merge to update the dirty state of theMikaël Barbero1-13/+57
editor.
2013-04-25[406524] call super.start() and super.stop() in class inheriting fromMikaël Barbero2-2/+5
Plugin Call super.start first and super.stop last
2013-04-25Build against the latest nightly of EGitLaurent Goubet1-1/+1
2013-04-24Bug fix: utility method to know if a view is an element of a graphicalCedric Notot1-2/+35
list. The algorithm did not apply for properties embedded in classes of a composite structure diagram. As now, we look at the type of the edit part for that.
2013-04-24Fix regression on commit ac4cd20590fb90792c53b869f9ef74b2f63bb04e aboutCedric Notot1-2/+2
label provider on styles.
2013-04-24[406401] Fix bug in SingleStructuralFeatureAccessorImpl#getItems()Axel Richard1-78/+77
2013-04-24Add Papyrus tests in build.Cedric Notot4-25/+40
2013-04-24revert promoterLaurent Goubet1-19/+7
2013-04-24Add of the management of GMF styles for the label providers in diagramCedric Notot2-0/+76
structure merge viewer.
2013-04-24Ignore builds failing for 406101, build against nightly EGitLaurent Goubet2-2/+7
These two changes should allow us to build without test failures.
2013-04-24Improve ResourceAttachmentChangeMergeViewerItem#getChildren()Axel Richard1-22/+23
2013-04-24Manage case of ancestor in ResourceContentsAccessorImpl#getInitialItem()Axel Richard1-0/+4
In case of pseudo conflict difference with element existing in ancestor but not in left nad right, the selection of the difference in SMV didn't higlighted the differences in the CMV parts.
2013-04-24Override of the label providers for diagram structure merge viewer.Cedric Notot20-3/+264
2013-04-23Updating Indigo targetLaurent Goubet1-7/+4
2013-04-23Updating Helios TP (missing EMF Store)Laurent Goubet1-7/+3
The tests won't compile (EMF Store requires 3.7).
2013-04-23Update our galileo TP (missing EMF Store dependency for tests)Laurent Goubet1-5/+4
2013-04-23Compatibility with GalileoLaurent Goubet1-2/+2
2013-04-23Build against M6Laurent Goubet1-1/+1
2013-04-23update TP to m6Mikaël Barbero1-6/+9
2013-04-23Remove dead codeMikaël Barbero1-29/+0
2013-04-23[405720] Undo doesn't work after a mergeAxel Richard1-253/+262
Sometimes the TreeContentMergeViewerConetntProvider was created before the EMFComparestructureMergeViewer and so the comparison object was not yet contained in the properties of the compare configuration object.
2013-04-22Bugs fixes on diagram changes:Cedric Notot3-32/+62
- To avoid a NPE if no configuration found for coordinates change. - It is needed to add a requirement link from a macroscopic change and the related semantic one.

Back to the top