Changelog: MergeManager

11.4_PUBLIC

static void showBlockingError(java.lang.String title, java.lang.String msg)

static void showBlockingError(java.lang.String title, java.lang.String msg, java.lang.Exception e)

static void displayErrorAndWait(java.lang.Object originator, java.lang.String title, java.lang.String msg)

ghidra.app.merge.MergeManagerPlugin createMergeManagerPlugin(ghidra.framework.plugintool.ModalPluginTool mergePluginTool, ghidra.app.merge.MergeManager multiUserMergeManager, ghidra.framework.model.DomainObject modifiableDomainObject)

modifiedmethod: getDomainObject

return type: UndoableDomainObject → DomainObject

- ghidra.framework.model.UndoableDomainObject getDomainObject(int version)

+ ghidra.framework.model.DomainObject getDomainObject(int version)

modifiedfield: latestDomainObject

type: UndoableDomainObject → DomainObject

- ghidra.framework.model.UndoableDomainObject latestDomainObject

+ ghidra.framework.model.DomainObject latestDomainObject

modifiedfield: myDomainObject

type: UndoableDomainObject → DomainObject

- ghidra.framework.model.UndoableDomainObject myDomainObject

+ ghidra.framework.model.DomainObject myDomainObject

modifiedfield: originalDomainObject

type: UndoableDomainObject → DomainObject

- ghidra.framework.model.UndoableDomainObject originalDomainObject

+ ghidra.framework.model.DomainObject originalDomainObject

modifiedfield: resultDomainObject

type: UndoableDomainObject → DomainObject

- ghidra.framework.model.UndoableDomainObject resultDomainObject

+ ghidra.framework.model.DomainObject resultDomainObject

removedmethod: createMergeManagerPlugin

ghidra.app.merge.MergeManagerPlugin createMergeManagerPlugin(ghidra.framework.plugintool.ModalPluginTool mergePluginTool, ghidra.app.merge.MergeManager multiUserMergeManager, ghidra.framework.model.UndoableDomainObject modifiableDomainObject)

9.2_PUBLIC

addedmethod: displayErrorAndWait

static void displayErrorAndWait(java.lang.Object originator, java.lang.String title, java.lang.String msg)

9.0.2_PUBLIC

addedmethod: cleanupMerge

void cleanupMerge()

addedmethod: createMergeManagerPlugin

ghidra.app.merge.MergeManagerPlugin createMergeManagerPlugin(ghidra.framework.plugintool.ModalPluginTool mergePluginTool, ghidra.app.merge.MergeManager multiUserMergeManager, ghidra.framework.model.UndoableDomainObject modifiableDomainObject)

addedmethod: createMergeResolvers

void createMergeResolvers()

addedfield: currentIndex

int currentIndex

addedmethod: getPreferredMergeToolSize

java.awt.Dimension getPreferredMergeToolSize()

addedmethod: initializeMerge

void initializeMerge()

addedfield: inputReceived

boolean inputReceived

addedfield: latestChangeSet

ghidra.program.model.listing.DomainObjectChangeSet latestChangeSet