MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ThreeState instead of Boolean

Browse Source
This commit is contained in:
Egor.Ushakov
2015-09-25 16:11:23 +03:00
parent 243448a1d1
commit cf85053b77
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java
+9 -8
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
*/
package com.intellij.debugger.jdi;
import com.intellij.util.ThreeState;
import com.sun.jdi.*;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -33,7 +34,7 @@ public class ObjectReferenceProxyImpl extends JdiProxy {
//caches
private ReferenceType myReferenceType;
private Type myType;
private Boolean myIsCollected = null;
private ThreeState myIsCollected = ThreeState.UNSURE;
public ObjectReferenceProxyImpl(VirtualMachineProxyImpl virtualMachineProxy, @NotNull ObjectReference objectReference) {
super(virtualMachineProxy);
@@ -83,15 +84,15 @@ public class ObjectReferenceProxyImpl extends JdiProxy {
public boolean isCollected() {
checkValid();
if (myIsCollected == null || Boolean.FALSE.equals(myIsCollected)) {
if (myIsCollected != ThreeState.YES) {
try {
myIsCollected = Boolean.valueOf(VirtualMachineProxyImpl.isCollected(myObjectReference));
myIsCollected = ThreeState.fromBoolean(VirtualMachineProxyImpl.isCollected(myObjectReference));
}
catch (VMDisconnectedException ignored) {
myIsCollected = Boolean.TRUE;
myIsCollected = ThreeState.YES;
}
}
return myIsCollected.booleanValue();
return myIsCollected.toBoolean();
}
public long uniqueID() {
@@ -141,9 +142,9 @@ public class ObjectReferenceProxyImpl extends JdiProxy {
*/
@Override
protected void clearCaches() {
if (Boolean.FALSE.equals(myIsCollected)) {
if (myIsCollected == ThreeState.NO) {
// clearing cache makes sense only if the object has not been collected yet
myIsCollected = null;
myIsCollected = ThreeState.UNSURE;
}
}
}
java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java
+6 -5
View File
@@ -26,6 +26,7 @@ import com.intellij.debugger.engine.evaluation.EvaluateException;
import com.intellij.debugger.engine.jdi.VirtualMachineProxy;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ThreeState;
import com.intellij.util.containers.HashMap;
import com.sun.jdi.*;
import com.sun.jdi.event.EventQueue;
@@ -698,19 +699,19 @@ public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy {
private abstract static class Capability {
private Boolean myValue = null;
private ThreeState myValue = ThreeState.UNSURE;
public final boolean isAvailable() {
if (myValue == null) {
if (myValue == ThreeState.UNSURE) {
try {
myValue = Boolean.valueOf(calcValue());
myValue = ThreeState.fromBoolean(calcValue());
}
catch (VMDisconnectedException e) {
LOG.info(e);
myValue = Boolean.FALSE;
myValue = ThreeState.NO;
}
}
return myValue.booleanValue();
return myValue.toBoolean();
}
protected abstract boolean calcValue();