Core: type arguments, unused imports

This commit is contained in:
str4d
2013-11-20 04:02:28 +00:00
parent bacce17990
commit 89dcceefee
76 changed files with 174 additions and 221 deletions

View File

@@ -94,7 +94,7 @@ public class BlockFile {
private boolean _isClosed;
/** cached list of free pages, only valid if freListStart > 0 */
private FreeListBlock flb;
private final HashMap openIndices = new HashMap();
private final HashMap<String, BSkipList> openIndices = new HashMap<String, BSkipList>();
private void mount() throws IOException {
file.seek(BlockFile.OFFSET_MOUNTED);
@@ -481,12 +481,12 @@ public class BlockFile {
_isClosed = true;
metaIndex.close();
Set oi = openIndices.keySet();
Iterator i = oi.iterator();
Set<String> oi = openIndices.keySet();
Iterator<String> i = oi.iterator();
Object k;
while(i.hasNext()) {
k = i.next();
BSkipList bsl = (BSkipList) openIndices.get(k);
BSkipList bsl = openIndices.get(k);
bsl.close();
}

View File

@@ -226,7 +226,7 @@ public class BSkipLevels extends SkipLevels {
* @since 0.8.8
*/
private boolean blvlfix() {
TreeSet<SkipLevels> lvls = new TreeSet(new LevelComparator());
TreeSet<SkipLevels> lvls = new TreeSet<SkipLevels>(new LevelComparator());
if (bf.log.shouldLog(Log.DEBUG))
bf.log.debug("Starting level search");
getAllLevels(this, lvls);
@@ -284,7 +284,7 @@ public class BSkipLevels extends SkipLevels {
* @param lvlSet out parameter, the result
* @since 0.8.8
*/
private void getAllLevels(SkipLevels l, Set lvlSet) {
private void getAllLevels(SkipLevels l, Set<SkipLevels> lvlSet) {
if (bf.log.shouldLog(Log.DEBUG))
bf.log.debug("GAL " + l.print());
// Do level 0 without recursion, on the assumption everything is findable

View File

@@ -58,8 +58,8 @@ public class BSkipList extends SkipList {
public final BlockFile bf;
private boolean isClosed;
final HashMap<Integer, BSkipSpan> spanHash = new HashMap();
final HashMap<Integer, SkipLevels> levelHash = new HashMap();
final HashMap<Integer, BSkipSpan> spanHash = new HashMap<Integer, BSkipSpan>();
final HashMap<Integer, SkipLevels> levelHash = new HashMap<Integer, SkipLevels>();
private final boolean fileOnly;