Merge remote-tracking branch 'origin/GP-1-dragonmacher-function-graph-format-fix'

Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldFormatModel.java

@@ -16,6 +16,7 @@
 package ghidra.app.util.viewer.format;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import org.jdom2.Element;
 
@@ -283,6 +284,13 @@ public class FieldFormatModel {
 		}
 	}
 
+	@Override
+	public String toString() {
+		return name + ":\n" + Arrays.stream(factories)
+				.map(f -> f.getClass().getSimpleName())
+				.collect(Collectors.joining(",\n"));
+	}
+
 	/**
 	 * Saves this format to XML.
 	 * @return the XML element for the saved format
@@ -324,10 +332,11 @@ public class FieldFormatModel {
 	 */
 	public void restoreFromXml(Element root) {
 		List<?> list = root.getChildren("ROW");
-		Iterator<?> rowIter = list.iterator();
-		rows = new ArrayList<>(list.size());
-		while (rowIter.hasNext()) {
-			Row row = createRow((Element) rowIter.next());
+		Iterator<?> it = list.iterator();
+		rows = new ArrayList<>();
+		while (it.hasNext()) {
+			Element element = (Element) it.next();
+			Row row = createRow(element);
 			rows.add(row);
 		}
 		findWidth();
@@ -462,6 +471,7 @@ public class FieldFormatModel {
 			row.fieldOptionsChanged(options, optionName, oldValue, newValue);
 		}
 	}
+
 //==================================================================================================
 //Inner Classes 
 //==================================================================================================
@@ -564,6 +574,8 @@ class Row {
 
 	@Override
 	public String toString() {
-		return fields.toString();
+		return fields.stream()
+				.map(f -> f.getClass().getSimpleName())
+				.collect(Collectors.joining(","));
 	}
 }

Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java

@@ -116,7 +116,7 @@ public class FormatManager implements OptionsChangeListener {
 		FormatManager newManager = new FormatManager(displayOptions, fieldOptions);
 		SaveState saveState = new SaveState();
 		saveState(saveState);
-		newManager.readState(saveState);
+		newManager.readState(saveState, false);
 		return newManager;
 	}
 
@@ -961,7 +961,10 @@ public class FormatManager implements OptionsChangeListener {
 	 */
 	public void saveState(SaveState saveState) {
 		for (int i = 0; i < NUM_MODELS; i++) {
-			saveState.putXmlElement(models[i].getName(), models[i].saveToXml());
+			FieldFormatModel model = models[i];
+			String name = model.getName();
+			Element element = model.saveToXml();
+			saveState.putXmlElement(name, element);
 		}
 	}
 
@@ -972,16 +975,30 @@ public class FormatManager implements OptionsChangeListener {
 	 * @param saveState the SaveState to read from.
 	 */
 	public void readState(SaveState saveState) {
+		readState(saveState, true);
+	}
+
+	// Note: only for clients that manage their own exact formats; remove when 
+	// checkForMissingNewCriticalFields() gets removed
+	@Deprecated(since = "12.2", forRemoval = true)
+	public void readState(SaveState saveState, boolean checkForMissingFields) {
 		initialized = false;
 		for (int i = 0; i < NUM_MODELS; i++) {
-			if (saveState.hasValue(models[i].getName())) {
-				models[i].restoreFromXml(saveState.getXmlElement(models[i].getName()));
-				// hack to make sure the new open/close variables field is present
-				// If missing, we are just going to reset it to the default format
-				checkForMissingNewCriticalFields(models[i]);
+			FieldFormatModel model = models[i];
+			String name = model.getName();
+			if (!saveState.hasValue(name)) {
+				Element element = getDefaultModel(i);
+				model.restoreFromXml(element);
+				continue;
 			}
-			else {
-				models[i].restoreFromXml(getDefaultModel(i));
+
+			Element element = saveState.getXmlElement(name);
+			model.restoreFromXml(element);
+
+			if (checkForMissingFields) {
+				// Hack to make sure the new open/close variables field is present. If missing, we 
+				// are just going to reset it to the default format
+				checkForMissingNewCriticalFields(model);
 			}
 		}
 		initialized = true;
@@ -993,17 +1010,20 @@ public class FormatManager implements OptionsChangeListener {
 	private void checkForMissingNewCriticalFields(FieldFormatModel model) {
 		if (model.getName().equals("Variable")) {
 			if (!hasField(model, "+")) {
-				model.restoreFromXml(getDefaultVariableFormat());
+				Element element = getDefaultVariableFormat();
+				model.restoreFromXml(element);
 			}
 		}
 		if (model.getName().equals("Function")) {
 			if (!hasField(model, "+")) {
-				model.restoreFromXml(getDefaultFunctionFormat());
+				Element element = getDefaultFunctionFormat();
+				model.restoreFromXml(element);
 			}
 		}
 		if (model.getName().equals("Address Break")) {
 			if (!hasField(model, "Collapsed Code")) {
-				model.restoreFromXml(getDefaultDividerFormat());
+				Element element = getDefaultDividerFormat();
+				model.restoreFromXml(element);
 			}
 		}
 	}

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/listing/ListingCodeComparisonView.java

@@ -177,7 +177,7 @@ public class ListingCodeComparisonView
 	private void changeRightToMatchLeftFormat(FieldFormatModel model) {
 		SaveState formatState = new SaveState();
 		displays.get(LEFT).getFormatManager().saveState(formatState);
-		displays.get(RIGHT).getFormatManager().readState(formatState);
+		displays.get(RIGHT).getFormatManager().readState(formatState, false);
 
 		saveFormat(saveState);
 		tool.setConfigChanged(true);