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 'origin/GP-4310_ghida1_RGB_DataTypes'

Browse source 
(Closes #6191)
This commit is contained in:
Ryan Kurtz 2025-07-09 12:32:41 -04:00
commit 794cb1c07c
18 changed files with 1073 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Ghidra/Framework/Docking/src/main/java/ghidra/docking/settings/SettingsDefinition.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -16,7 +16,6 @@
package ghidra.docking.settings;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.function.Predicate;
/**
@ -40,14 +39,10 @@ public interface SettingsDefinition {
if (settings == null) {
return additional;
}
ArrayList<SettingsDefinition> list = new ArrayList<>();
list.addAll(Arrays.asList(settings));
for (SettingsDefinition def : additional) {
if (!list.contains(def)) {
list.add(def);
}
}
return list.toArray(new SettingsDefinition[list.size()]);
SettingsDefinition[] newArray = new SettingsDefinition[settings.length + additional.length];
System.arraycopy(settings, 0, newArray, 0, settings.length);
System.arraycopy(additional, 0, newArray, settings.length, additional.length);
return newArray;
}
/**