From b7a23cacd4b1145a37bf47f3e2e454864d615a71 Mon Sep 17 00:00:00 2001
From: ghidragon <106987263+ghidragon@users.noreply.github.com>
Date: Fri, 21 Mar 2025 14:41:52 -0400
Subject: [PATCH] GP-5326 adding "Add Date" and "Add Address" to edit data
 field dialog

---
 .../main/help/help/topics/DataPlugin/Data.htm |   4 +
 .../DataPlugin/images/EditFieldDialog.png     | Bin 7673 -> 8352 bytes
 .../app/plugin/core/data/DataPlugin.java      |   6 +-
 .../plugin/core/data/EditDataFieldDialog.java | 125 ++++++++++++++++--
 .../plugin/core/data/EditFieldDialogTest.java |  46 +++++++
 .../src/main/java/ghidra/util/DateUtils.java  |  17 ++-
 .../screenshot/DataPluginScreenShots.java     |  37 +++++-
 7 files changed, 222 insertions(+), 13 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/Data.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/Data.htm
index 5d9100e00c..240fd2e5e5 100644
--- a/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/Data.htm
+++ b/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/Data.htm
@@ -1376,6 +1376,10 @@
     	<LI><B>Comment</B>: The comment for the field can be entered or changed here.</LI>
     	<LI><B>DataType</B>: The data can be changed here. The text field is read only so you must
     	press the ... button to bring up the datatype chooser to change the datatype.</LI>
+    	<LI><B>Add Current Address</B>: If selected, the current address where this field is edited
+    	will be added to the datatype's field comment if not already there.</LI>
+    	<LI><B>Add Today's Date</B>: If selected, the current date will be added to the datatype's
+    	 field comment if not already there.</LI>
          <P><IMG src="help/shared/note.png"> If a default field (a field with an undefined
          datatype (??)) is named or given a comment, the datatype will be set to <B>undefined1</B> if
          no specific datatype is set. This is because undefined fields are not stored and therefore
diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/images/EditFieldDialog.png b/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/images/EditFieldDialog.png
index 47f90f76f20d5b283a2ae536e9aa53ce2324af6b..e0123004a4416e286f63d46b336014163f28e4c4 100644
GIT binary patch
literal 8352
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
JEeAah{cn|E`7r<h

literal 7673
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

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataPlugin.java
index 8d0df057a2..aa577f5fb9 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataPlugin.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/DataPlugin.java
@@ -109,6 +109,8 @@ public class DataPlugin extends Plugin implements DataService {
 	private DataTypeManagerChangeListenerAdapter adapter;
 
 	private SwingUpdateManager favoritesUpdateManager;
+	private boolean addAddress;
+	private boolean addDate;
 
 	public DataPlugin(PluginTool tool) {
 		super(tool);
@@ -855,8 +857,10 @@ public class DataPlugin extends Plugin implements DataService {
 		DataTypeComponent component = DataTypeUtils.getDataTypeComponent(program, address, path);
 		if (component != null) {
 			EditDataFieldDialog dialog =
-				new EditDataFieldDialog(tool, dtmService, location, component);
+				new EditDataFieldDialog(tool, dtmService, location, component, addAddress, addDate);
 			tool.showDialog(dialog);
+			addAddress = dialog.isAddAddressSelected();
+			addDate = dialog.isAddDateSelected();
 		}
 	}
 
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/EditDataFieldDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/EditDataFieldDialog.java
index e9f4450e2b..9de0f6046e 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/EditDataFieldDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/EditDataFieldDialog.java
@@ -16,6 +16,9 @@
 package ghidra.app.plugin.core.data;
 
 import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.util.Date;
 
 import javax.swing.*;
 
@@ -32,8 +35,7 @@ import ghidra.program.model.address.Address;
 import ghidra.program.model.data.*;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.ProgramLocation;
-import ghidra.util.HelpLocation;
-import ghidra.util.MessageType;
+import ghidra.util.*;
 import ghidra.util.exception.DuplicateNameException;
 import ghidra.util.layout.PairLayout;
 
@@ -51,6 +53,8 @@ public class EditDataFieldDialog extends DialogComponentProvider {
 	private DataType newDataType;
 	private ProgramLocation programLocation;
 	private DataTypeManagerService dtmService;
+	private JCheckBox addressCheckBox;
+	private JCheckBox dateCheckBox;
 
 	/**
 	 * Constructor
@@ -58,9 +62,12 @@ public class EditDataFieldDialog extends DialogComponentProvider {
 	 * @param dtmService the DataTypeManagerService used for choosing datatypes
 	 * @param location the location of the field being edited
 	 * @param dataTypeComponent the component of the field being edited
+	 * @param addDate selects the addDate checkbox
+	 * @param addAddress selects the addDate checkbox
 	 */
 	public EditDataFieldDialog(PluginTool tool, DataTypeManagerService dtmService,
-			ProgramLocation location, DataTypeComponent dataTypeComponent) {
+			ProgramLocation location, DataTypeComponent dataTypeComponent, boolean addAddress,
+			boolean addDate) {
 		super("Edit Field Dialog", true, true, true, false);
 		this.tool = tool;
 		this.dtmService = dtmService;
@@ -69,7 +76,7 @@ public class EditDataFieldDialog extends DialogComponentProvider {
 		setTitle(generateTitle());
 
 		addWorkPanel(buildMainPanel());
-		initializeFields();
+		initializeFields(addAddress, addDate);
 		setFocusComponent(nameField);
 		setHelpLocation(new HelpLocation("DataPlugin", "Edit_Field_Dialog"));
 
@@ -135,14 +142,43 @@ public class EditDataFieldDialog extends DialogComponentProvider {
 		updateDataTypeTextField();
 	}
 
-	private void initializeFields() {
+	/**
+	 * Returns true if the Add Address checkbox is selected.
+	 * @return  true if the Add Address checkbox is selected
+	 */
+	public boolean isAddAddressSelected() {
+		return addressCheckBox.isSelected();
+	}
+
+	/**
+	 * Returns true if the Add Date checkbox is selected.
+	 * @return  true if the Add Address checkbox is selected
+	 */
+	public boolean isAddDateSelected() {
+		return dateCheckBox.isSelected();
+	}
+
+	private void initializeFields(boolean addAddress, boolean addDate) {
 		String name = component.getFieldName();
 		if (StringUtils.isBlank(name)) {
 			name = "";
 		}
 		nameField.setText(name);
-		commentField.setText(component.getComment());
+		String comment = component.getComment();
+		if (comment == null) {
+			comment = "";
+		}
+		commentField.setText(comment);
 		dataTypeTextField.setText(component.getDataType().getDisplayName());
+
+		if (addAddress) {
+			addressCheckBox.setSelected(true);
+			addTextToComment(getCurrentAddressString());
+		}
+		if (addDate) {
+			dateCheckBox.setSelected(true);
+			addTextToComment(getTodaysDate());
+		}
 	}
 
 	@Override
@@ -202,6 +238,27 @@ public class EditDataFieldDialog extends DialogComponentProvider {
 	}
 
 	private JPanel buildMainPanel() {
+		JPanel panel = new JPanel(new BorderLayout());
+		panel.add(buildNameValuePanel(), BorderLayout.NORTH);
+		panel.add(buildCheckboxPanel(), BorderLayout.SOUTH);
+		return panel;
+	}
+
+	private JPanel buildCheckboxPanel() {
+		JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 30, 0));
+
+		addressCheckBox = new JCheckBox("Add Current Address");
+		addressCheckBox.addActionListener(this::addressCheckBoxChanged);
+
+		dateCheckBox = new JCheckBox("Add Today's Date");
+		dateCheckBox.addActionListener(this::dateCheckBoxChanged);
+
+		panel.add(addressCheckBox);
+		panel.add(dateCheckBox);
+		return panel;
+	}
+
+	private JPanel buildNameValuePanel() {
 		JPanel panel = new JPanel(new PairLayout(10, 10));
 		panel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
 
@@ -214,10 +271,10 @@ public class EditDataFieldDialog extends DialogComponentProvider {
 
 		panel.add(new JLabel("Field Name:", SwingConstants.LEFT));
 		panel.add(nameField);
-		panel.add(new JLabel("Comment:", SwingConstants.LEFT));
-		panel.add(commentField);
 		panel.add(new JLabel("Datatype:", SwingConstants.LEFT));
 		panel.add(buildDataTypeChooserPanel());
+		panel.add(new JLabel("Comment:", SwingConstants.LEFT));
+		panel.add(commentField);
 
 		return panel;
 	}
@@ -256,6 +313,58 @@ public class EditDataFieldDialog extends DialogComponentProvider {
 		return "Edit " + compositeName + ", Field " + component.getOrdinal();
 	}
 
+	private void dateCheckBoxChanged(ActionEvent e) {
+		String today = getTodaysDate();
+		if (dateCheckBox.isSelected()) {
+			addTextToComment(today);
+		}
+		else {
+			removeTextFromComment(today);
+		}
+	}
+
+	private void addressCheckBoxChanged(ActionEvent e) {
+		String address = getCurrentAddressString();
+		if (addressCheckBox.isSelected()) {
+			addTextToComment(address);
+		}
+		else {
+			removeTextFromComment(address);
+		}
+	}
+
+	private void removeTextFromComment(String text) {
+		String comment = commentField.getText().trim();
+		int index = comment.indexOf(text);
+		if (index < 0) {
+			return;
+		}
+
+		// remove the given text and any spaces that follow it.
+		comment = comment.replaceAll(text + "\\s*", "");
+		commentField.setText(comment.trim());
+	}
+
+	private String getTodaysDate() {
+		return DateUtils.formatCompactDate(new Date());
+	}
+
+	private String getCurrentAddressString() {
+		return programLocation.getAddress().toString();
+	}
+
+	private void addTextToComment(String text) {
+		String comment = commentField.getText().trim();
+		if (comment.contains(text)) {
+			return;
+		}
+		if (!comment.isBlank()) {
+			comment += " ";
+		}
+		comment += text;
+		commentField.setText(comment.trim());
+	}
+
 	public String getDataTypeText() {
 		return dataTypeTextField.getText();
 	}
diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/EditFieldDialogTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/EditFieldDialogTest.java
index adcd62d4d1..a450111d7a 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/EditFieldDialogTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/data/EditFieldDialogTest.java
@@ -17,6 +17,8 @@ package ghidra.app.plugin.core.data;
 
 import static org.junit.Assert.*;
 
+import java.util.Date;
+
 import org.junit.*;
 
 import docking.action.DockingActionIf;
@@ -27,6 +29,7 @@ import ghidra.program.model.data.*;
 import ghidra.program.model.listing.Data;
 import ghidra.program.model.listing.Program;
 import ghidra.test.*;
+import ghidra.util.DateUtils;
 
 public class EditFieldDialogTest extends AbstractGhidraHeadedIntegrationTest {
 	private TestEnv env;
@@ -162,6 +165,49 @@ public class EditFieldDialogTest extends AbstractGhidraHeadedIntegrationTest {
 		assertEquals("byte", structure.getComponent(1).getDataType().getDisplayName());
 	}
 
+	@Test
+	public void testAddAddressCheckbox() {
+		goTo(0x101);
+		showFieldEditDialog();
+		assertEquals("", getCommentText());
+		pressButtonByText(dialog.getComponent(), "Add Current Address");
+		assertEquals("00000101", getCommentText());
+
+		pressOk();
+		waitForTasks();
+		assertEquals("00000101", structure.getComponent(1).getComment());
+
+		showFieldEditDialog();
+		assertEquals("00000101", getCommentText());
+		pressButtonByText(dialog.getComponent(), "Add Current Address");
+		assertEquals("", getCommentText());
+
+		pressOk();
+		assertNull(structure.getComponent(1).getComment());
+	}
+
+	@Test
+	public void testAddDateCheckbox() {
+		String today = DateUtils.formatCompactDate(new Date());
+		goTo(0x101);
+		showFieldEditDialog();
+		assertEquals("", getCommentText());
+		pressButtonByText(dialog.getComponent(), "Add Today's Date");
+		assertEquals(today, getCommentText());
+
+		pressOk();
+		waitForTasks();
+		assertEquals(today, structure.getComponent(1).getComment());
+
+		showFieldEditDialog();
+		assertEquals(today, getCommentText());
+		pressButtonByText(dialog.getComponent(), "Add Today's Date");
+		assertEquals("", getCommentText());
+
+		pressOk();
+		assertNull(structure.getComponent(1).getComment());
+	}
+
 	private boolean isDialogVisible() {
 		return runSwing(() -> dialog.isVisible());
 	}
diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/DateUtils.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/DateUtils.java
index 942979a615..997a4fd906 100644
--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/DateUtils.java
+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/DateUtils.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,6 +31,7 @@ public class DateUtils {
 	/** Example: Oct 31, 2019 03:24 PM */
 	private static final String DATE_TIME_FORMAT_STRING = "MMM dd, yyyy hh:mm a";
 	private static final String DATE_FORMAT_STRING = "MM/dd/yyyy";
+	private static final String COMPACT_DATE_FORMAT_STRING = "MM/dd/yy";
 	private static final String TIME_FORMAT_STRING = "h:mm";
 
 	private static final DateTimeFormatter DATE_TIME_FORMATTER =
@@ -39,6 +40,8 @@ public class DateUtils {
 		DateTimeFormatter.ofPattern(DATE_FORMAT_STRING);
 	private static final DateTimeFormatter TIME_FORMATTER =
 		DateTimeFormatter.ofPattern(TIME_FORMAT_STRING);
+	private static final DateTimeFormatter COMPACT_DATE_FORMATTER =
+		DateTimeFormatter.ofPattern(COMPACT_DATE_FORMAT_STRING);
 
 	public static final long MS_PER_SEC = 1000;
 	public static final long MS_PER_MIN = MS_PER_SEC * 60;
@@ -227,6 +230,16 @@ public class DateUtils {
 		return DATE_FORMATTER.format(toLocalDate(date));
 	}
 
+	/**
+	 * Formats the given date into a compact date string (mm/dd/yy).
+	 *
+	 * @param date the date to format
+	 * @return the date string
+	 */
+	public static String formatCompactDate(Date date) {
+		return COMPACT_DATE_FORMATTER.format(toLocalDate(date));
+	}
+
 	/**
 	 * Formats the given date into a string that contains the date and time.  This is in
 	 * contrast to {@link #formatDate(Date)}, which only returns a date string.
diff --git a/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/DataPluginScreenShots.java b/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/DataPluginScreenShots.java
index 65d0427666..aa733c0e8c 100644
--- a/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/DataPluginScreenShots.java
+++ b/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/DataPluginScreenShots.java
@@ -15,11 +15,16 @@
  */
 package help.screenshot;
 
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import javax.swing.JRadioButton;
 
 import org.junit.Test;
 
-import docking.DialogComponentProvider;
+import docking.*;
+import docking.action.DockingActionIf;
+import ghidra.app.plugin.core.codebrowser.CodeViewerProvider;
 import ghidra.util.table.GhidraTable;
 
 public class DataPluginScreenShots extends GhidraScreenShotGenerator {
@@ -75,7 +80,10 @@ public class DataPluginScreenShots extends GhidraScreenShotGenerator {
 	@Test
 	public void testDefaultSettings() {
 		positionListingTop(0x40d3a4);
-		performAction("Default Data Settings", "DataPlugin", false);
+		ComponentProvider componentProvider = getProvider(CodeViewerProvider.class);
+		ActionContext actionContext = componentProvider.getActionContext(null);
+		DockingActionIf action = getAction("Default Settings", actionContext);
+		performAction(action, actionContext, false);
 		captureDialog();
 	}
 
@@ -86,4 +94,29 @@ public class DataPluginScreenShots extends GhidraScreenShotGenerator {
 		captureDialog();
 	}
 
+	private DockingActionIf getAction(String name, ActionContext context) {
+		Set<DockingActionIf> actions = getDataPluginActions(context);
+		for (DockingActionIf element : actions) {
+			String actionName = element.getName();
+			int pos = actionName.indexOf(" (");
+			if (pos > 0) {
+				actionName = actionName.substring(0, pos);
+			}
+			if (actionName.equals(name)) {
+				return element;
+			}
+		}
+		return null;
+	}
+
+	private Set<DockingActionIf> getDataPluginActions(ActionContext context) {
+		Set<DockingActionIf> actions = getActionsByOwner(tool, "DataPlugin");
+		if (context == null) {
+			return actions;
+		}
+		// assumes returned set may be modified
+		return actions.stream()
+				.filter(a -> a.isValidContext(context))
+				.collect(Collectors.toSet());
+	}
 }