yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GT-3354: Removing some Guava

Browse source
This commit is contained in:
Ryan Kurtz 2019-12-05 14:34:03 -05:00
parent 3a6c3312fe
commit 2a64cf2a77
20 changed files with 91 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java
View file

@ -22,6 +22,7 @@ import java.awt.KeyboardFocusManager;
import java.awt.event.*;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
import javax.swing.*;
@ -32,8 +33,6 @@ import org.jdom.*;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
import com.google.common.collect.Sets;
import docking.DockingTool;
import docking.DockingUtils;
import docking.action.*;
@ -493,10 +492,10 @@ public class KeyBindingUtils {
*/
public static Set<DockingActionIf> getActions(Set<DockingActionIf> allActions, String owner,
String name) {
Set<DockingActionIf> ownerMatch =
Sets.filter(allActions, action -> action.getOwner().equals(owner));
return Sets.filter(ownerMatch, action -> action.getName().equals(name));
return allActions.stream()
.filter(a -> a.getOwner().equals(owner))
.filter(a -> a.getName().equals(name))
.collect(Collectors.toSet());
}
/**

6
Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java
View file

@ -37,8 +37,6 @@ import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.*;
import com.google.common.collect.Sets;
import docking.*;
import docking.action.DockingActionIf;
import docking.action.ToggleDockingActionIf;
@ -1137,7 +1135,9 @@ public abstract class AbstractDockingTest extends AbstractGenericTest {
public static Set<DockingActionIf> getActionsByOwnerAndName(DockingTool tool, String owner,
String name) {
Set<DockingActionIf> ownerActions = tool.getDockingActionsByOwnerName(owner);
return Sets.filter(ownerActions, action -> action.getName().equals(name));
return ownerActions.stream()
.filter(action -> action.getName().equals(name))
.collect(Collectors.toSet());
}
/**

12
Ghidra/Framework/Docking/src/test.slow/java/docking/widgets/filechooser/GhidraFileChooserTest.java
View file

@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.swing.*;
import javax.swing.table.JTableHeader;
import org.apache.commons.collections4.IteratorUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@ -43,8 +44,6 @@ import org.apache.logging.log4j.*;
import org.apache.logging.log4j.core.config.Configurator;
import org.junit.*;
import com.google.common.collect.Iterables;
import docking.*;
import docking.action.DockingAction;
import docking.test.AbstractDockingTest;
@ -1755,7 +1754,8 @@ public class GhidraFileChooserTest extends AbstractDockingTest {
CompletableFuture<List<File>> results = showMultiSelectionChooser(files.parent, FILES_ONLY);
selectFiles(Iterables.concat(files.files, files.dirs));
selectFiles(CollectionUtils.asIterable(
IteratorUtils.chainedIterator(files.files.iterator(), files.dirs.iterator())));
pressOk();
assertChooserHidden();
@ -1769,11 +1769,13 @@ public class GhidraFileChooserTest extends AbstractDockingTest {
CompletableFuture<List<File>> results =
showMultiSelectionChooser(files.parent, GhidraFileChooserMode.FILES_AND_DIRECTORIES);
selectFiles(Iterables.concat(files.files, files.dirs));
selectFiles(CollectionUtils.asIterable(
IteratorUtils.chainedIterator(files.files.iterator(), files.dirs.iterator())));
pressOk();
assertChooserHidden();
assertChosen(results, Iterables.concat(files.files, files.dirs)); // dirs are dropped
assertChosen(results, CollectionUtils.asIterable(
IteratorUtils.chainedIterator(files.files.iterator(), files.dirs.iterator()))); // dirs are dropped
}
//==================================================================================================