mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-06-02 05:38:17 +08:00
Merge branch 'GP-0_ryanmkurtz_PR-5011_LukeSerne_fix-type-replacement-typo'
This commit is contained in:
+2
-2
@@ -112,7 +112,7 @@ public class ReplaceDataTypeAction extends DockingAction {
|
|||||||
updatedPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 10, 0));
|
updatedPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 10, 0));
|
||||||
updatedPanel.setLayout(new VerticalLayout(5));
|
updatedPanel.setLayout(new VerticalLayout(5));
|
||||||
|
|
||||||
GLabel label = new GLabel("Choose the relacement data type: ");
|
GLabel label = new GLabel("Choose the replacement data type: ");
|
||||||
label.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
|
label.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
|
||||||
updatedPanel.add(label);
|
updatedPanel.add(label);
|
||||||
|
|
||||||
@@ -146,7 +146,7 @@ public class ReplaceDataTypeAction extends DockingAction {
|
|||||||
}
|
}
|
||||||
catch (DataTypeDependencyException e) {
|
catch (DataTypeDependencyException e) {
|
||||||
Msg.showError(this, null, "Replace Failed", "Replace failed. Existing type " + newDt +
|
Msg.showError(this, null, "Replace Failed", "Replace failed. Existing type " + newDt +
|
||||||
"; replacment type " + oldDt + ". " + e.getMessage());
|
"; replacement type " + oldDt + ". " + e.getMessage());
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
dtm.endTransaction(txId, true);
|
dtm.endTransaction(txId, true);
|
||||||
|
|||||||
Reference in New Issue
Block a user