This commit is contained in:
Nav
2021-12-24 14:35:20 +00:00
parent c665215d69
commit 80cc29ad65

View File

@@ -306,7 +306,7 @@ void MemoryRegionManagerWindow::applyChanges() {
if (!validationFailures.empty()) { if (!validationFailures.empty()) {
auto* errorDialogue = new ErrorDialogue( auto* errorDialogue = new ErrorDialogue(
"Invalid memory region", "Invalid Memory Region",
"Invalid memory region \"" + focusedRegionItem->getRegionNameInputValue() + "\"" "Invalid memory region \"" + focusedRegionItem->getRegionNameInputValue() + "\""
+ "<br/><br/>- " + validationFailures.join("<br/>- "), + "<br/><br/>- " + validationFailures.join("<br/>- "),
this this
@@ -319,7 +319,7 @@ void MemoryRegionManagerWindow::applyChanges() {
for (const auto& processedFocusedRegion : processedFocusedMemoryRegions) { for (const auto& processedFocusedRegion : processedFocusedMemoryRegions) {
if (processedFocusedRegion.intersectsWith(focusedRegion)) { if (processedFocusedRegion.intersectsWith(focusedRegion)) {
auto* errorDialogue = new ErrorDialogue( auto* errorDialogue = new ErrorDialogue(
"Intersection region found", "Intersecting Region Found",
"Region \"" + focusedRegionItem->getRegionNameInputValue() "Region \"" + focusedRegionItem->getRegionNameInputValue()
+ "\" intersects with region \"" + processedFocusedRegion.name + "\". " + "\" intersects with region \"" + processedFocusedRegion.name + "\". "
+ "Regions cannot intersect. Please review the relevant address ranges.", + "Regions cannot intersect. Please review the relevant address ranges.",
@@ -338,7 +338,7 @@ void MemoryRegionManagerWindow::applyChanges() {
if (!validationFailures.empty()) { if (!validationFailures.empty()) {
auto* errorDialogue = new ErrorDialogue( auto* errorDialogue = new ErrorDialogue(
"Invalid memory region", "Invalid Memory Region",
"Invalid memory region \"" + excludedRegionItem->getRegionNameInputValue() + "\"" "Invalid memory region \"" + excludedRegionItem->getRegionNameInputValue() + "\""
+ "<br/><br/>- " + validationFailures.join("<br/>- "), + "<br/><br/>- " + validationFailures.join("<br/>- "),
this this
@@ -351,7 +351,7 @@ void MemoryRegionManagerWindow::applyChanges() {
for (const auto& processedFocusedRegion : processedFocusedMemoryRegions) { for (const auto& processedFocusedRegion : processedFocusedMemoryRegions) {
if (processedFocusedRegion.intersectsWith(excludedRegion)) { if (processedFocusedRegion.intersectsWith(excludedRegion)) {
auto* errorDialogue = new ErrorDialogue( auto* errorDialogue = new ErrorDialogue(
"Intersecting region found", "Intersecting Region Found",
"Region \"" + excludedRegionItem->getRegionNameInputValue() "Region \"" + excludedRegionItem->getRegionNameInputValue()
+ "\" intersects with region \"" + processedFocusedRegion.name + "\". " + "\" intersects with region \"" + processedFocusedRegion.name + "\". "
+ "Regions cannot intersect. Please review the relevant address ranges.", + "Regions cannot intersect. Please review the relevant address ranges.",
@@ -365,7 +365,7 @@ void MemoryRegionManagerWindow::applyChanges() {
for (const auto& processedExcludedRegion : processedExcludedMemoryRegions) { for (const auto& processedExcludedRegion : processedExcludedMemoryRegions) {
if (processedExcludedRegion.intersectsWith(excludedRegion)) { if (processedExcludedRegion.intersectsWith(excludedRegion)) {
auto* errorDialogue = new ErrorDialogue( auto* errorDialogue = new ErrorDialogue(
"Intersecting region found", "Intersecting Region Found",
"Region \"" + excludedRegionItem->getRegionNameInputValue() "Region \"" + excludedRegionItem->getRegionNameInputValue()
+ "\" intersects with region \"" + processedExcludedRegion.name + "\". " + "\" intersects with region \"" + processedExcludedRegion.name + "\". "
+ "Regions cannot intersect. Please review the relevant address ranges.", + "Regions cannot intersect. Please review the relevant address ranges.",