Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-16 15:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GP-0_ryanmkurtz_PR-7131_hippietrail_duplicate-line'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-11-05 13:34:15 -05:00
commit d6f63af049
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Framework/Docking/src/main/java/docking/options/editor/FontPropertyEditor.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.
@ -158,7 +158,6 @@ public class FontPropertyEditor extends PropertyEditorSupport {
sizeCombo = sizeCombo =
new GComboBox<>(IntStream.rangeClosed(1, 72).boxed().toArray(Integer[]::new)); new GComboBox<>(IntStream.rangeClosed(1, 72).boxed().toArray(Integer[]::new));
sizeCombo.setMaximumRowCount(9); sizeCombo.setMaximumRowCount(9);
sizeCombo.setMaximumRowCount(9);
sizeCombo.addActionListener(actionListener); sizeCombo.addActionListener(actionListener);
panel.add(sizeCombo); panel.add(sizeCombo);