@@ -500,7 +500,7 @@ public class BTree { } /** - * Delete a section of node content - (key, (predecessor)child) pairs. Bounds checking + * Deletes a section of node content - (key, (predecessor)child) pairs. Bounds checking * is not performed. To allow deletion of the final child (which has no corresponding key) * the routine behaves as though there were a corresponding key existing with value zero.
* Content is deleted and remaining content is moved leftward the appropriate amount.
@@ -522,7 +522,7 @@ public class BTree {
}
/**
- * Visit all nodes beginning when the visitor comparator
+ * Visits all nodes beginning when the visitor comparator
* returns >= 0 until the visitor visit returns falls.
*
* @param visitor
@@ -539,9 +539,7 @@ public class BTree {
if (node == 0) {
return true;
}
- if (visitor instanceof IBTreeVisitor2) {
- ((IBTreeVisitor2) visitor).preNode(node);
- }
+ visitor.preNode(node);
try {
Chunk chunk = db.getChunk(node);
@@ -553,7 +551,7 @@ public class BTree {
upper--;
}
while (lower < upper) {
- int middle= (lower + upper) / 2;
+ int middle= (lower + upper) >>> 1;
long checkRec = getRecord(chunk, node, middle);
if (checkRec == 0) {
upper= middle;
@@ -578,7 +576,7 @@ public class BTree {
if (compare > 0) {
// Start point is to the left.
return accept(getChild(chunk, node, i), visitor);
- } else if (compare == 0) {
+ } else if (compare == 0) {
if (!accept(getChild(chunk, node, i), visitor))
return false;
if (!visitor.visit(record))
@@ -587,25 +585,14 @@ public class BTree {
}
return accept(getChild(chunk, node, i), visitor);
} finally {
- if (visitor instanceof IBTreeVisitor2) {
- ((IBTreeVisitor2) visitor).postNode(node);
- }
+ visitor.postNode(node);
}
}
- /*
- * TODO: It would be good to move these into IBTreeVisitor and eliminate
- * IBTreeVisitor2 if this is acceptable.
- */
- private interface IBTreeVisitor2 extends IBTreeVisitor {
- void preNode(long node) throws CoreException;
- void postNode(long node) throws CoreException;
- }
-
/**
- * Debugging method for checking B-tree invariants
- * @return the empty String if B-tree invariants hold, otherwise
- * a human readable report
+ * Debugging method for checking B-tree invariants.
+ *
+ * @return the empty String if B-tree invariants hold, otherwise a human readable report
* @throws CoreException
*/
public String getInvariantsErrorReport() throws CoreException {
@@ -618,7 +605,7 @@ public class BTree {
* A B-tree visitor for checking some B-tree invariants.
* Note ordering invariants are not checked here.
*/
- private class InvariantsChecker implements IBTreeVisitor2 {
+ private class InvariantsChecker implements IBTreeVisitor {
boolean valid = true;
String msg = ""; //$NON-NLS-1$
Integer leafDepth;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/IBTreeVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/IBTreeVisitor.java
index 1e43ed26be3..a9002b38e37 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/IBTreeVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/IBTreeVisitor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2012 QNX Software Systems and others.
+ * Copyright (c) 2005, 2015 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,21 +20,33 @@ import org.eclipse.core.runtime.CoreException;
*/
public interface IBTreeVisitor {
/**
- * Compare the record against an internally held key. The comparison must be
- * compatible with the one used for the btree.
+ * Compares the record against an internally held key. The comparison must be
+ * compatible with the one used for the B-tree.
* Used for visiting.
*
* @param record
* @return -1 if record < key, 0 if record == key, 1 if record > key
- * @throws CoreException
*/
- public abstract int compare(long record) throws CoreException;
+ public int compare(long record) throws CoreException;
/**
- * Visit a given record and return whether to continue or not.
-
- * @return true to continue the visit, false to abort it.
- * @throws CoreException
+ * Visits a given record and returns whether to continue or not.
+ *
+ * @return {@code true} to continue the visit, {@code false} to abort it.
*/
- public abstract boolean visit(long record) throws CoreException;
+ public boolean visit(long record) throws CoreException;
+
+ /**
+ * Called before visiting a node.
+ *
+ * @param record the node being visited
+ */
+ public default void preNode(long record) throws CoreException {}
+
+ /**
+ * Called after visiting a node.
+ *
+ * @param record the node being visited
+ */
+ public default void postNode(long record) throws CoreException {}
}