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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2024-07-18 14:56:19 -04:00
commit 7d28136399
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/AbstractEditFunctionSignatureDialog.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -235,7 +235,7 @@ public abstract class AbstractEditFunctionSignatureDialog extends DialogComponen
private void installInlineWidget(JPanel parentPanel) { private void installInlineWidget(JPanel parentPanel) {
inlineCheckBox = new GCheckBox("Inline"); inlineCheckBox = new GCheckBox("Inline");
inlineCheckBox.addChangeListener(e -> { inlineCheckBox.addItemListener(e -> {
if (inlineCheckBox.isSelected() && callFixupComboBox != null) { if (inlineCheckBox.isSelected() && callFixupComboBox != null) {
callFixupComboBox.setSelectedItem(NONE_CHOICE); callFixupComboBox.setSelectedItem(NONE_CHOICE);
} }

8
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditMemoryReferencePanel.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -103,7 +103,7 @@ class EditMemoryReferencePanel extends EditReferencePanel {
.setAccessibleDescription( .setAccessibleDescription(
"Selecting this checkbox allows entering a refernce offset"); "Selecting this checkbox allows entering a refernce offset");
offsetCheckbox.setHorizontalAlignment(SwingConstants.RIGHT); offsetCheckbox.setHorizontalAlignment(SwingConstants.RIGHT);
offsetCheckbox.addChangeListener(e -> enableOffsetField(offsetCheckbox.isSelected())); offsetCheckbox.addItemListener(e -> enableOffsetField(offsetCheckbox.isSelected()));
offsetField = new JTextField(); offsetField = new JTextField();
offsetField.getAccessibleContext().setAccessibleName("Enter Offset"); offsetField.getAccessibleContext().setAccessibleName("Enter Offset");
@ -123,7 +123,7 @@ class EditMemoryReferencePanel extends EditReferencePanel {
includeOtherOverlaysCheckbox = new JCheckBox("Include OTHER overlay spaces", includeOtherOverlaysCheckbox = new JCheckBox("Include OTHER overlay spaces",
Boolean.getBoolean(Preferences.getProperty(INCLUDE_OTHER_OVERLAY_PREFERENCE, "false"))); Boolean.getBoolean(Preferences.getProperty(INCLUDE_OTHER_OVERLAY_PREFERENCE, "false")));
includeOtherOverlaysCheckbox.addChangeListener(e -> refreshToAddressField()); includeOtherOverlaysCheckbox.addItemListener(e -> refreshToAddressField());
refTypes = new GhidraComboBox<>(MEM_REF_TYPES); refTypes = new GhidraComboBox<>(MEM_REF_TYPES);
refTypes.getAccessibleContext().setAccessibleName("Memory Ref Types"); refTypes.getAccessibleContext().setAccessibleName("Memory Ref Types");

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/AddressInput.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -416,7 +416,7 @@ public class AddressInput extends JPanel implements FocusableEditor {
remove(combo); remove(combo);
comboAdded = false; comboAdded = false;
} }
invalidate(); revalidate();
} }
@Override @Override

6
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/ApplyMarkupPropertyEditor.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -838,7 +838,7 @@ public class ApplyMarkupPropertyEditor implements OptionsEditor {
private JCheckBox createCheckBox(String optionName) { private JCheckBox createCheckBox(String optionName) {
JCheckBox applyCheckBox = new GCheckBox(optionName); JCheckBox applyCheckBox = new GCheckBox(optionName);
applyCheckBox.addChangeListener(e -> changesMade(true)); applyCheckBox.addItemListener(e -> changesMade(true));
return applyCheckBox; return applyCheckBox;
} }

6
Ghidra/Framework/Docking/src/main/java/docking/widgets/conditiontestpanel/ConditionTestPanel.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -376,7 +376,7 @@ public class ConditionTestPanel extends JPanel {
label = new GDLabel(test.getName()); label = new GDLabel(test.getName());
add(label); add(label);
label.setToolTipText(test.getDescription()); label.setToolTipText(test.getDescription());
checkbox.addChangeListener(e -> { checkbox.addItemListener(e -> {
conditionTestModel.setEnabled(test, checkbox.isSelected()); conditionTestModel.setEnabled(test, checkbox.isSelected());
label.setEnabled(checkbox.isSelected()); label.setEnabled(checkbox.isSelected());
}); });