# HG changeset patch # User Doug Simon # Date 1379976093 -7200 # Node ID bbcb724430669449126735fc051bab1385cd7d0d # Parent 6e734982f89f35b9fa54c1c7592488ef2b679c93 renames: Graph.inputChanged -> inputChangedListener, Graph.usagesDroppedZero -> usagesDroppedToZeroListener diff -r 6e734982f89f -r bbcb72443066 graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java --- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Tue Sep 24 00:35:35 2013 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java Tue Sep 24 00:41:33 2013 +0200 @@ -56,8 +56,8 @@ private int deletedNodeCount; private GraphEventLog eventLog; - NodeChangedListener inputChanged; - NodeChangedListener usagesDroppedZero; + NodeChangedListener inputChangedListener; + NodeChangedListener usagesDroppedToZeroListener; private final HashMap cachedNodes = new HashMap<>(); private static final class CacheEntry { @@ -266,37 +266,37 @@ } } - public void trackInputChange(NodeChangedListener inputChangedListener) { - if (inputChanged == null) { - inputChanged = inputChangedListener; + public void trackInputChange(NodeChangedListener listener) { + if (inputChangedListener == null) { + inputChangedListener = listener; } else { - inputChanged = new ChainedNodeChangedListener(inputChangedListener, inputChanged); + inputChangedListener = new ChainedNodeChangedListener(listener, inputChangedListener); } } public void stopTrackingInputChange() { - assert inputChanged != null; - if (inputChanged instanceof ChainedNodeChangedListener) { - inputChanged = ((ChainedNodeChangedListener) inputChanged).next; + assert inputChangedListener != null; + if (inputChangedListener instanceof ChainedNodeChangedListener) { + inputChangedListener = ((ChainedNodeChangedListener) inputChangedListener).next; } else { - inputChanged = null; + inputChangedListener = null; } } - public void trackUsagesDroppedZero(NodeChangedListener usagesDroppedZeroListener) { - if (usagesDroppedZero == null) { - usagesDroppedZero = usagesDroppedZeroListener; + public void trackUsagesDroppedZero(NodeChangedListener listener) { + if (usagesDroppedToZeroListener == null) { + usagesDroppedToZeroListener = listener; } else { - usagesDroppedZero = new ChainedNodeChangedListener(usagesDroppedZeroListener, usagesDroppedZero); + usagesDroppedToZeroListener = new ChainedNodeChangedListener(listener, usagesDroppedToZeroListener); } } public void stopTrackingUsagesDroppedZero() { - assert usagesDroppedZero != null; - if (usagesDroppedZero instanceof ChainedNodeChangedListener) { - usagesDroppedZero = ((ChainedNodeChangedListener) usagesDroppedZero).next; + assert usagesDroppedToZeroListener != null; + if (usagesDroppedToZeroListener instanceof ChainedNodeChangedListener) { + usagesDroppedToZeroListener = ((ChainedNodeChangedListener) usagesDroppedToZeroListener).next; } else { - usagesDroppedZero = null; + usagesDroppedToZeroListener = null; } } diff -r 6e734982f89f -r bbcb72443066 graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java --- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Tue Sep 24 00:35:35 2013 +0200 +++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java Tue Sep 24 00:41:33 2013 +0200 @@ -433,15 +433,15 @@ assert assertTrue(result, "not found in usages, old input: %s", oldInput); } if (newInput != null) { - NodeChangedListener inputChanged = graph.inputChanged; - if (inputChanged != null) { - inputChanged.nodeChanged(this); + NodeChangedListener listener = graph.inputChangedListener; + if (listener != null) { + listener.nodeChanged(this); } newInput.addUsage(this); } else if (oldInput != null && oldInput.usages().isEmpty()) { - NodeChangedListener nodeChangedListener = graph.usagesDroppedZero; - if (nodeChangedListener != null) { - nodeChangedListener.nodeChanged(oldInput); + NodeChangedListener listener = graph.usagesDroppedToZeroListener; + if (listener != null) { + listener.nodeChanged(oldInput); } } } @@ -495,9 +495,9 @@ boolean result = usage.getNodeClass().replaceFirstInput(usage, this, other); assert assertTrue(result, "not found in inputs, usage: %s", usage); if (other != null) { - NodeChangedListener inputChanged = graph.inputChanged; - if (inputChanged != null) { - inputChanged.nodeChanged(usage); + NodeChangedListener listener = graph.inputChangedListener; + if (listener != null) { + listener.nodeChanged(usage); } other.addUsage(usage); } @@ -542,9 +542,9 @@ for (Node input : inputs()) { removeThisFromUsages(input); if (input.usages().isEmpty()) { - NodeChangedListener nodeChangedListener = graph.usagesDroppedZero; - if (nodeChangedListener != null) { - nodeChangedListener.nodeChanged(input); + NodeChangedListener listener = graph.usagesDroppedToZeroListener; + if (listener != null) { + listener.nodeChanged(input); } } }