yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-1093-dragonmacher-listing-xref-condensing' (Closes #1305)
This commit is contained in:
Ryan Kurtz 2021-09-15 07:06:59 -04:00
commit ec6bc9c22d
46 changed files with 3421 additions and 937 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/ClangTextField.java
View file

@ -33,7 +33,7 @@ public class ClangTextField extends WrappingVerticalLayoutTextField {
private FieldElement lineNumberFieldElement;
private static FieldElement createSingleLineElement(FieldElement[] textElements) {
return new CompositeFieldElement(textElements, 0, textElements.length);
return new CompositeFieldElement(textElements);
}
/**

18
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/DecompilerClipboardProvider.java
View file

@ -48,7 +48,7 @@ public class DecompilerClipboardProvider extends ByteCopier
private static final PaintContext PAINT_CONTEXT = new PaintContext();
private static final ClipboardType TEXT_TYPE =
new ClipboardType(DataFlavor.stringFlavor, "Text");
private static final List<ClipboardType> COPY_TYPES = new LinkedList<ClipboardType>();
private static final List<ClipboardType> COPY_TYPES = new LinkedList<>();
static {
COPY_TYPES.add(TEXT_TYPE);
@ -58,7 +58,7 @@ public class DecompilerClipboardProvider extends ByteCopier
private FieldSelection selection;
private boolean copyFromSelectionEnabled;
private Set<ChangeListener> listeners = new CopyOnWriteArraySet<ChangeListener>();
private Set<ChangeListener> listeners = new CopyOnWriteArraySet<>();
private int spaceCharWidthInPixels = 7;
public DecompilerClipboardProvider(DecompilePlugin plugin, DecompilerProvider provider) {
@ -161,12 +161,12 @@ public class DecompilerClipboardProvider extends ByteCopier
return false;
}
protected Transferable copyText(TaskMonitor monitor) {
private Transferable copyText(TaskMonitor monitor) {
return createStringTransferable(getText());
}
String getText() {
StringBuffer buffer = new StringBuffer();
private String getText() {
StringBuilder buffer = new StringBuilder();
int numRanges = selection.getNumRanges();
for (int i = 0; i < numRanges; i++) {
appendText(buffer, selection.getFieldRange(i));
@ -174,7 +174,7 @@ public class DecompilerClipboardProvider extends ByteCopier
return buffer.toString();
}
void appendText(StringBuffer buffer, FieldRange fieldRange) {
private void appendText(StringBuilder buffer, FieldRange fieldRange) {
int startIndex = fieldRange.getStart().getIndex().intValue();
int endIndex = fieldRange.getEnd().getIndex().intValue();
if (startIndex == endIndex) { // single line selection (don't include padding)
@ -189,7 +189,7 @@ public class DecompilerClipboardProvider extends ByteCopier
}
}
private void appendText(StringBuffer buffer, int lineNumber,
private void appendText(StringBuilder buffer, int lineNumber,
FieldSelection singleLineSelection) {
if (singleLineSelection.isEmpty()) {
return;
@ -224,7 +224,7 @@ public class DecompilerClipboardProvider extends ByteCopier
}
}
private void appendTextSingleLine(StringBuffer buffer, int lineNumber,
private void appendTextSingleLine(StringBuilder buffer, int lineNumber,
FieldSelection singleLineSelection) {
if (singleLineSelection.isEmpty()) {
return;
@ -249,7 +249,7 @@ public class DecompilerClipboardProvider extends ByteCopier
//==================================================================================================
// Unsupported Operations
//==================================================================================================
//==================================================================================================
@Override
public boolean enablePaste() {