Notice: This Wiki is now read only and edits are no longer possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "EMF Compare/API Breaks"
(Created page with "API Breaks =2.1 To 3.0= ==Removed Types== org.eclipse.emf.compare.command.DelagatingCommandStack org.eclipse.emf.compare.command.impl.CopyAllNonConflictingCommand ==Removed...") |
(→Removed Methods) |
||
| Line 8: | Line 8: | ||
==Removed Methods== | ==Removed Methods== | ||
| − | org.eclipse.emf.compare.merge.ReferenceChangeMerger.handleEquivalences(Diff, boolean, Monitor) | + | {| border="1" cellpadding="7" cellspacing="0" |
| − | org.eclipse.emf.compare.merge.PseudoConflictMerger.handleEquivalences(Diff, boolean, Monitor) - | + | ! Name !! Replacement (if any) |
| − | + | |- | |
| − | org.eclipse.emf.compare.domain.ICompareEditingDomain.createCopyAllNonConflictingCommand(List<? extends Diff>, boolean, IMerger.Registry) | + | | org.eclipse.emf.compare.merge.ReferenceChangeMerger.handleEquivalences(Diff, boolean, Monitor) || super-class (removed overriden implementation from ReferenceChangeMerger) |
| − | org.eclipse.emf.compare.domain.ICompareEditingDomain.dispose() | + | |- |
| − | + | | org.eclipse.emf.compare.merge.PseudoConflictMerger.handleEquivalences(Diff, boolean, Monitor) || super-class (removed overriden implementation from ReferenceChangeMerger) | |
| − | org.eclipse.emf.compare.domain.impl.EMFCompareEditingDomain.createCopyAllNonConflictingCommand(List<? extends Diff>, boolean, IMerger.Registry) | + | |- |
| − | + | | org.eclipse.emf.compare.domain.ICompareEditingDomain.createCopyAllNonConflictingCommand(List<? extends Diff>, boolean, IMerger.Registry) || | |
| − | org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.containmentReferencesValues(Match) | + | |- |
| − | org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.getChildrenIterable(Match) | + | | org.eclipse.emf.compare.domain.ICompareEditingDomain.dispose() || |
| − | org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.getFilteredChildren(Match) | + | |- |
| − | org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.matchOfContainmentDiff(ImmutableSet<? extends EObject>) | + | | org.eclipse.emf.compare.domain.impl.EMFCompareEditingDomain.createCopyAllNonConflictingCommand(List<? extends Diff>, boolean, IMerger.Registry) || |
| − | + | |- | |
| − | org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin.getDifferenceGroupProviderRegistry() | + | | org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.containmentReferencesValues(Match) || |
| − | org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin.getFilterActionRegistry() | + | |- |
| + | | org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.getChildrenIterable(Match) || | ||
| + | |- | ||
| + | | org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.getFilteredChildren(Match) || | ||
| + | |- | ||
| + | | org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.matchOfContainmentDiff(ImmutableSet<? extends EObject>) || | ||
| + | |- | ||
| + | | org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin.getDifferenceGroupProviderRegistry() | ||
| + | |- | ||
| + | | org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin.getFilterActionRegistry() | ||
| + | |- | ||
| + | |} | ||
==Added Methods== | ==Added Methods== | ||
org.eclipse.emf.compare.domain.ICompareEditingDomain.createCopyCommand(List<? extends Diff>, boolean, IMerger.Registry, IMergeRunnable) | org.eclipse.emf.compare.domain.ICompareEditingDomain.createCopyCommand(List<? extends Diff>, boolean, IMerger.Registry, IMergeRunnable) | ||
org.eclipse.emf.compare.provider.utils.IStyledString.IComposedStyledString.append(IStyledString.IComposedStyledString) | org.eclipse.emf.compare.provider.utils.IStyledString.IComposedStyledString.append(IStyledString.IComposedStyledString) | ||
Revision as of 11:53, 30 January 2014
API Breaks
2.1 To 3.0
Removed Types
org.eclipse.emf.compare.command.DelagatingCommandStack org.eclipse.emf.compare.command.impl.CopyAllNonConflictingCommand
Removed Methods
| Name | Replacement (if any) |
|---|---|
| org.eclipse.emf.compare.merge.ReferenceChangeMerger.handleEquivalences(Diff, boolean, Monitor) | super-class (removed overriden implementation from ReferenceChangeMerger) |
| org.eclipse.emf.compare.merge.PseudoConflictMerger.handleEquivalences(Diff, boolean, Monitor) | super-class (removed overriden implementation from ReferenceChangeMerger) |
| org.eclipse.emf.compare.domain.ICompareEditingDomain.createCopyAllNonConflictingCommand(List<? extends Diff>, boolean, IMerger.Registry) | |
| org.eclipse.emf.compare.domain.ICompareEditingDomain.dispose() | |
| org.eclipse.emf.compare.domain.impl.EMFCompareEditingDomain.createCopyAllNonConflictingCommand(List<? extends Diff>, boolean, IMerger.Registry) | |
| org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.containmentReferencesValues(Match) | |
| org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.getChildrenIterable(Match) | |
| org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.getFilteredChildren(Match) | |
| org.eclipse.emf.compare.provider.spec.MatchItemProviderSpec.matchOfContainmentDiff(ImmutableSet<? extends EObject>) | |
| org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin.getDifferenceGroupProviderRegistry() | |
| org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin.getFilterActionRegistry() |
Added Methods
org.eclipse.emf.compare.domain.ICompareEditingDomain.createCopyCommand(List<? extends Diff>, boolean, IMerger.Registry, IMergeRunnable) org.eclipse.emf.compare.provider.utils.IStyledString.IComposedStyledString.append(IStyledString.IComposedStyledString)