Merge remote-tracking branch

'origin/GT-3308-dragonmacher-structure-editor-F2-with-arrow-keys' (fixes
NationalSecurityAgency#703 again)

Author: ryanmkurtz

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java

@@ -68,7 +68,7 @@
  */
 public abstract class CompositeEditorPanel extends JPanel
 		implements CompositeEditorModelListener, ComponentCellEditorListener, Draggable, Droppable {
-	private static final long serialVersionUID = 1L;
+
 	// Normal color for selecting components in the table.
 	// TODO: Why do we choose a different selection color?
 	//private static final Color SELECTION_COLOR = Color.YELLOW.brighter().brighter();
@@ -179,12 +179,12 @@ private void setupTableCellEditor() {
 		table.addPropertyChangeListener("tableCellEditor", evt -> {
 			TableCellEditor fieldEditor = (TableCellEditor) evt.getNewValue();
 			if (fieldEditor == null) {
-				// Ending cell edit.
-				SwingUtilities.invokeLater(() -> model.endEditingField());
+				// Ending cell edit
+				Swing.runLater(() -> model.endEditingField());
 			}
 			else {
-				// Starting cell edit.
-				SwingUtilities.invokeLater(() -> {
+				// Starting cell edit
+				Swing.runLater(() -> {
 					int editingRow = table.getEditingRow();
 					if (editingRow < 0) {
 						return;
@@ -255,11 +255,11 @@ protected void startCellEditing(int row, int viewColumn) {
 	public void moveCellEditor(final int direction, final String value) {
 		stopCellEditing();
 
-		// Note: We perform an invokeLater here due to focus dependencies (SCR 6915).  When we call
+		// Note: We run this later due to focus dependencies.  When we call
 		// stopCellEditing() this will trigger a focusLost() event, which itself happens in
-		// an invokeLater().  If we do not trigger the moving of the cell editor after that focus
+		// a Swing.runLater().  If we do not trigger the moving of the cell editor after that focus
 		// event, then the focusLost() will trigger our new edit to be cancelled.
-		SwingUtilities.invokeLater(() -> doMoveCellEditor(direction, value));
+		Swing.runLater(() -> doMoveCellEditor(direction, value));
 	}
 
 	private void doMoveCellEditor(int direction, String value) {
@@ -457,8 +457,10 @@ protected boolean editBelowField() {
 	}
 
 	/**
-	 * Puts the next editable cell into edit mode.
-	 * @return true if there was a table cell that could be edited.
+	 * Puts the next editable cell into edit mode
+	 * 
+	 * @param currentRow the current row
+	 * @return true if there was a table cell that could be edited
 	 */
 	protected boolean editNextField(int currentRow) {
 		if (locateNextEditField(currentRow)) {
@@ -479,13 +481,6 @@ protected boolean editPreviousField(int currentRow) {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see ghidra.app.plugin.compositeeditor.CompositeEditorModelListener#lockStateChanged(int)
-	 */
-	public void lockStateChanged(int type) {
-		// no-op
-	}
-
 	/**
 	 * Scrolls the table so that the table cell indicated becomes viewable.
 	 * @param rowIndex the row of the table cell
@@ -585,7 +580,15 @@ private void createTable() {
 			if (e.getValueIsAdjusting()) {
 				return;
 			}
-			model.setColumn(e.getFirstIndex());
+
+			TableColumnModel cm = table.getColumnModel();
+			int[] selected = cm.getSelectedColumns();
+			if (selected.length == 1) {
+				model.setColumn(selected[0]);
+			}
+			else {
+				model.setColumn(-1);
+			}
 		});
 
 		JPanel tablePanel = new JPanel(new BorderLayout());
@@ -870,23 +873,14 @@ public Transferable getTransferable(Point p) {
 		return new DataTypeTransferable(dt);
 	}
 
-	/**
-	 * Return true if it is OK to drop the transferable at the location
-	 * specified by the event.
-	 * Data Types can only be dropped on undefined bytes in locked state
-	 * and only if they fit there.
-	 *
-	 * @param e event that has current state of drag and drop operation
-	 * @param obj the DataType being dropped
-	 */
 	@Override
 	public boolean isDropOk(DropTargetDragEvent e) {
 		return true;
 	}
 
 	/**
-	 * Add the object to the droppable component. The DragSrcAdapter
-	 * calls this method from its drop() method.
+	 * Add the object to the droppable component. The DragSrcAdapter calls this method from its 
+	 * drop() method.
 	 *
 	 * @param obj Transferable object that is to be dropped.
 	 * @param e  has current state of drop operation
@@ -913,13 +907,11 @@ public void add(Object obj, DropTargetDropEvent e, DataFlavor f) {
 	}
 
 	/**
-	 * Add the object to the droppable component. The DragSrcAdapter
-	 * calls this method from its drop() method.
+	 * Add the object to the droppable component. The DragSrcAdapter calls this method from its 
+	 * drop() method.
 	 *
-	 * @param obj Transferable object that is to be dropped.
-	 * @param e  has current state of drop operation
-	 * @param f represents the opaque concept of a data format as
-	 * would appear on a clipboard, during drag and drop.
+	 * @param p the point of insert
+	 * @param dt the data type to insert
 	 */
 	public void insertAtPoint(Point p, DataType dt) {
 		endFieldEditing(); // Make sure a field isn't being edited.
@@ -934,13 +926,11 @@ public void insertAtPoint(Point p, DataType dt) {
 	}
 
 	/**
-	 * Add the object to the droppable component. The DragSrcAdapter
-	 * calls this method from its drop() method.
-	 *
-	 * @param obj Transferable object that is to be dropped.
-	 * @param e  has current state of drop operation
-	 * @param f represents the opaque concept of a data format as
-	 * would appear on a clipboard, during drag and drop.
+	 * Add the object to the droppable component. The DragSrcAdapter calls this method from its 
+	 * drop() method.
+	 * 
+	 * @param p the point of insert
+	 * @param dt the data type to insert
 	 */
 	public void addAtPoint(Point p, DataType dt) {
 		endFieldEditing(); // Make sure a field isn't being edited.
@@ -1217,10 +1207,6 @@ public ComponentNameCellEditor() {
 			super(new JTextField());
 		}
 
-		/**
-		 * Calls <code>fireEditingStopped</code> and returns true.
-		 * @return true
-		 */
 		@Override
 		public boolean stopCellEditing() {
 			try {
@@ -1238,7 +1224,7 @@ public boolean stopCellEditing() {
 
 	private class ComponentDataTypeCellEditor extends AbstractCellEditor
 			implements TableCellEditor {
-		private static final long serialVersionUID = 1L;
+
 		private DataTypeSelectionEditor editor;
 		private DataType dt;
 		private int maxLength;
@@ -1295,8 +1281,6 @@ public void editingStopped(ChangeEvent e) {
 
 			// force a small button for the table's cell editor
 			JButton dataTypeChooserButton = new JButton("...") {
-				private static final long serialVersionUID = 1L;
-
 				@Override
 				public Dimension getPreferredSize() {
 					Dimension preferredSize = super.getPreferredSize();
@@ -1305,28 +1289,22 @@ public Dimension getPreferredSize() {
 				}
 			};
 
-			dataTypeChooserButton.addActionListener(e -> SwingUtilities.invokeLater(() -> {
-				DataTypeManagerService service = tool.getService(DataTypeManagerService.class);
-				DataType dataType = service.getDataType((String) null);
-				if (dataType != null) {
-					editor.setCellEditorValue(dataType);
-					editor.stopCellEditing();
-				}
-				else {
-					editor.cancelCellEditing();
+			dataTypeChooserButton.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					Swing.runLater(() -> stopEdit(tool));
 				}
-			}));
-			FocusAdapter focusListener = new FocusAdapter() {
+			});
+
+			textField.addFocusListener(new FocusAdapter() {
 				@Override
 				public void focusGained(FocusEvent e) {
 					textField.selectAll();
 					textField.removeFocusListener(this);
 				}
-			};
-			textField.addFocusListener(focusListener);
+			});
 
 			editorPanel = new JPanel() {
-
 				@Override
 				public void requestFocus() {
 					textField.requestFocus();
@@ -1337,6 +1315,18 @@ public void requestFocus() {
 			editorPanel.add(dataTypeChooserButton, BorderLayout.EAST);
 		}
 
+		private void stopEdit(PluginTool tool) {
+			DataTypeManagerService service = tool.getService(DataTypeManagerService.class);
+			DataType dataType = service.getDataType((String) null);
+			if (dataType != null) {
+				editor.setCellEditorValue(dataType);
+				editor.stopCellEditing();
+			}
+			else {
+				editor.cancelCellEditing();
+			}
+		}
+
 		@Override
 		public Object getCellEditorValue() {
 			return dt;
@@ -1503,7 +1493,7 @@ public CompositeTable(TableModel dm) {
 		// overridden because the editor component was not being given focus
 		public Component prepareEditor(TableCellEditor editor, int row, int column) {
 			final Component component = super.prepareEditor(editor, row, column);
-			SwingUtilities.invokeLater(() -> component.requestFocus());
+			Swing.runLater(() -> component.requestFocus());
 			return component;
 		}
 	}