diff options
author | Carsten Hammer | 2019-06-01 20:26:28 +0000 |
---|---|---|
committer | Jeff Johnston | 2020-04-06 20:35:04 +0000 |
commit | 54f0c25ae9a9e066b1f87ef6d12ecb5a1e8d092e (patch) | |
tree | bc026dbf7089ef4945687853d9aefc063403d507 | |
parent | 54a968f17d9a83d268c575f762f3dac1f26a9018 (diff) | |
download | eclipse.jdt.debug-I20200413-1800.tar.gz eclipse.jdt.debug-I20200413-1800.tar.xz eclipse.jdt.debug-I20200413-1800.zip |
Use isEmpty() instead of size()==0 where possible S4_16_0_M1I20200414-0630I20200413-1800I20200412-1800I20200411-1800I20200411-0950I20200411-0720I20200411-0510I20200411-0300I20200410-2300I20200410-1800I20200409-0200I20200408-1800I20200408-0600I20200407-1800I20200407-1210I20200407-0120I20200406-1800
Change-Id: Ibe3fe951f62a5c1bc47068e937d3dbe8e77b705e
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
10 files changed, 14 insertions, 14 deletions
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java index b4efcf8b1..545e82129 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java +++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java @@ -1344,7 +1344,7 @@ public abstract class AbstractJDITest extends TestCase { // Ensure that the test didn't leave a modification watchpoint that could change the expected state of the program if (fVM != null) { - assertTrue(fVM.eventRequestManager().modificationWatchpointRequests().size() == 0); + assertTrue(fVM.eventRequestManager().modificationWatchpointRequests().isEmpty()); if (fInControl) { shutDownTarget(); } diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java index 41686d1a0..18e3fdd8a 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java +++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java @@ -283,7 +283,7 @@ public class ReferenceTypeTest extends AbstractJDITest { for (int i = 0; i < fTypes.size(); ++i) { ReferenceType type = fTypes.get(i); List<?> methods = type.methods(); - assertTrue("" + i, (methods.size() != 0) == fHasMethods[i]); + assertTrue("" + i, (!methods.isEmpty()) == fHasMethods[i]); } } /** diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java index 7676ebe83..ab216e9d7 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java +++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java @@ -180,7 +180,7 @@ public class ThreadReferenceTest extends AbstractJDITest { // Create a java.lang.Throwable instance in List<ReferenceType> classes = fVM.classesByName("java.lang.Throwable"); - assertTrue("1", classes.size() != 0); + assertTrue("1", !classes.isEmpty()); ClassType threadDeathClass = (ClassType) classes.get(0); Method constructor = threadDeathClass.concreteMethodByName("<init>", "()V"); diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java index cf6b26ea6..55eb48ec9 100644 --- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java +++ b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java @@ -307,7 +307,7 @@ public class VirtualMachineTest extends AbstractJDITest { // The test program has started, the number of classes is != 0 List<?> classes = fVM.allClasses(); - assertTrue("1", classes.size() != 0); + assertTrue("1", !classes.isEmpty()); // Collect names of received classes String[] names = new String[classes.size()]; @@ -344,7 +344,7 @@ public class VirtualMachineTest extends AbstractJDITest { // The test program has started, the number of threads is != 0 List<?> threads = fVM.allThreads(); - assertTrue("1", threads.size() != 0); + assertTrue("1", !threads.isEmpty()); // Collect names of received threads String[] names = new String[threads.size()]; diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java index fd7189f13..aa3d27309 100644 --- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java +++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java @@ -496,7 +496,7 @@ public class OpenFromClipboardAction implements IWorkbenchWindowActionDelegate { } } else if (matches.size() == 1) { openJavaElements(matches.toArray(), line); - } else if (matches.size() == 0) { + } else if (matches.isEmpty()) { openInputEditDialog(inputText); } } diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/BinaryBasedSourceGenerator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/BinaryBasedSourceGenerator.java index a91e07d25..54fea75a0 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/BinaryBasedSourceGenerator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/BinaryBasedSourceGenerator.java @@ -203,7 +203,7 @@ public class BinaryBasedSourceGenerator { source.append(getUniqueMethodName(EVAL_METHOD_NAME, referenceType)); source.append("() {\nnew "); //$NON-NLS-1$ - if (interfaceList.size() != 0) { + if (!interfaceList.isEmpty()) { source.append(getDotName(interfaceList .get(0).name())); } else { @@ -212,7 +212,7 @@ public class BinaryBasedSourceGenerator { source.append("()"); //$NON-NLS-1$ } else { source.append("public class ").append(ANONYMOUS_CLASS_NAME).append(" "); //$NON-NLS-1$ //$NON-NLS-2$ - if (interfaceList.size() != 0) { + if (!interfaceList.isEmpty()) { source.append(" implements ").append(getDotName(interfaceList.get(0).name())); //$NON-NLS-1$ } else { source.append(" extends ").append(getDotName(superClassName)); //$NON-NLS-1$ @@ -294,7 +294,7 @@ public class BinaryBasedSourceGenerator { } catch (ClassNotPreparedException e) { return new StringBuilder(); } - if (interfaces.size() != 0) { + if (!interfaces.isEmpty()) { source.append("implements "); //$NON-NLS-1$ Iterator<InterfaceType> iterator = interfaces.iterator(); InterfaceType interface_ = iterator @@ -486,7 +486,7 @@ public class BinaryBasedSourceGenerator { List<String> arguments = method.argumentTypeNames(); int i = 0; - if (arguments.size() != 0) { + if (!arguments.isEmpty()) { Iterator<String> iterator = arguments.iterator(); source.append(getDotName(iterator.next())) .append(" arg").append(i++); //$NON-NLS-1$ diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayReferenceImpl.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayReferenceImpl.java index 2a2650b61..868d8df98 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayReferenceImpl.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/ArrayReferenceImpl.java @@ -309,7 +309,7 @@ public class ArrayReferenceImpl extends ObjectReferenceImpl implements @Override public void setValues(int index, List<? extends Value> values, int srcIndex, int length) throws InvalidTypeException, ClassNotLoadedException { - if (values == null || values.size() == 0) { + if (values == null || values.isEmpty()) { // trying to set nothing should do no work return; } diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java index a8de8e1bc..9cc4f9104 100644 --- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java +++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketSendManager.java @@ -108,7 +108,7 @@ public class PacketSendManager extends PacketManager { IOException { LinkedList<JdwpPacket> packetsToSend = new LinkedList<>(); synchronized (fOutgoingPackets) { - while (fOutgoingPackets.size() == 0) { + while (fOutgoingPackets.isEmpty()) { fOutgoingPackets.wait(); } packetsToSend.addAll(fOutgoingPackets); diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java index df58a2e01..27eec43b9 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIDebugTarget.java @@ -2041,7 +2041,7 @@ public class JDIDebugTarget extends JDIDebugElement implements new VMDisconnectedException()); } List<ReferenceType> classes = vm.classesByName(name); - if (classes.size() == 0) { + if (classes.isEmpty()) { switch (name.charAt(0)) { case 'b': if (name.equals("boolean")) { //$NON-NLS-1$ diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java index 030a04594..c9137b846 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java @@ -128,7 +128,7 @@ public class JavaAppletLaunchConfigurationDelegate extends JavaLaunchDelegate im buf.append(Integer.toString(configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_APPLET_HEIGHT, 200))); buf.append("\" >\n"); //$NON-NLS-1$ Map<String, String> parameters = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_APPLET_PARAMETERS, new HashMap<String, String>()); - if (parameters.size() != 0) { + if (!parameters.isEmpty()) { Iterator<Entry<String, String>> iterator = parameters.entrySet().iterator(); while (iterator.hasNext()) { Entry<String, String> next = iterator.next(); |