Skip to content

Commit 9fbc5b9

Browse files
committed
Improving wording in select bytes dialog.
1 parent cf0c434 commit 9fbc5b9

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/SelectBlockDialog.java

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,12 @@
1515
*/
1616
package ghidra.app.plugin.core.select;
1717

18-
import java.awt.GridBagConstraints;
19-
import java.awt.GridBagLayout;
20-
import java.awt.Insets;
18+
import java.awt.*;
2119
import java.awt.event.ActionEvent;
2220
import java.awt.event.ActionListener;
2321
import java.math.BigInteger;
2422

25-
import javax.swing.BorderFactory;
26-
import javax.swing.ButtonGroup;
27-
import javax.swing.JOptionPane;
28-
import javax.swing.JPanel;
29-
import javax.swing.JRadioButton;
30-
import javax.swing.JTextField;
31-
import javax.swing.SwingUtilities;
23+
import javax.swing.*;
3224

3325
import docking.ComponentProvider;
3426
import docking.DialogComponentProvider;
@@ -38,16 +30,7 @@
3830
import ghidra.app.nav.Navigatable;
3931
import ghidra.app.nav.NavigationUtils;
4032
import ghidra.framework.plugintool.PluginTool;
41-
import ghidra.program.model.address.Address;
42-
import ghidra.program.model.address.AddressFactory;
43-
import ghidra.program.model.address.AddressFormatException;
44-
import ghidra.program.model.address.AddressOutOfBoundsException;
45-
import ghidra.program.model.address.AddressRange;
46-
import ghidra.program.model.address.AddressRangeIterator;
47-
import ghidra.program.model.address.AddressSet;
48-
import ghidra.program.model.address.AddressSetView;
49-
import ghidra.program.model.address.AddressSpace;
50-
import ghidra.program.model.address.OverlayAddressSpace;
33+
import ghidra.program.model.address.*;
5134
import ghidra.program.util.ProgramSelection;
5235
import ghidra.util.HelpLocation;
5336
import ghidra.util.layout.PairLayout;
@@ -133,7 +116,7 @@ private JPanel methodPanel() {
133116
forwardButton.addActionListener(new ActionListener() {
134117
@Override
135118
public void actionPerformed(ActionEvent ae) {
136-
setStatusText("Enter number of bytes to highlight");
119+
setStatusText("Enter number of bytes to select");
137120
setAddressFieldEnabled(false);
138121
setLengthInputEnabled(true);
139122
}
@@ -144,7 +127,7 @@ public void actionPerformed(ActionEvent ae) {
144127
backwardButton.addActionListener(new ActionListener() {
145128
@Override
146129
public void actionPerformed(ActionEvent ae) {
147-
setStatusText("Enter number of bytes to highlight");
130+
setStatusText("Enter number of bytes to select");
148131
setAddressFieldEnabled(false);
149132
setLengthInputEnabled(true);
150133
}
@@ -182,7 +165,7 @@ public void actionPerformed(ActionEvent ae) {
182165
main.add(forwardButton, gbc);
183166
gbc.gridy++;
184167
main.add(backwardButton, gbc);
185-
setStatusText("Enter number of bytes to highlight");
168+
setStatusText("Enter number of bytes to select");
186169
return main;
187170
}
188171

@@ -264,7 +247,6 @@ private void handleToAddressSelection() {
264247
toAddress = currentAddress;
265248
currentAddress = tmp;
266249
}
267-
AddressFactory addressFactory = navigatable.getProgram().getAddressFactory();
268250
AddressSet addressSet = new AddressSet(currentAddress, toAddress);
269251
ProgramSelection selection = new ProgramSelection(addressSet);
270252
NavigationUtils.setSelection(tool, navigatable, selection);
@@ -284,7 +266,6 @@ private void handleForwardSelection() {
284266
// the addressable unit size of the processor
285267
Address currentAddress = navigatable.getLocation().getAddress();
286268

287-
AddressFactory addressFactory = navigatable.getProgram().getAddressFactory();
288269
AddressSet addressSet = new AddressSet(navigatable.getSelection());
289270

290271
if (addressSet.isEmpty()) {

0 commit comments

Comments
 (0)