From 0f8b179e576f713dee4f5803e39913ad2e62d53c Mon Sep 17 00:00:00 2001 From: Otis Gospodnetic Date: Sat, 12 Mar 2005 03:50:54 +0000 Subject: [PATCH] - Cosmetics (tabs, indentation) git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@157225 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/lucene/index/IndexWriter.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/java/org/apache/lucene/index/IndexWriter.java b/src/java/org/apache/lucene/index/IndexWriter.java index 18f112d7c19..b02f1415274 100644 --- a/src/java/org/apache/lucene/index/IndexWriter.java +++ b/src/java/org/apache/lucene/index/IndexWriter.java @@ -656,8 +656,7 @@ public class IndexWriter { throws IOException { final String mergedName = newSegmentName(); if (infoStream != null) infoStream.print("merging segments"); - SegmentMerger merger = - new SegmentMerger(this, mergedName); + SegmentMerger merger = new SegmentMerger(this, mergedName); final Vector segmentsToDelete = new Vector(); for (int i = minSegment; i < segmentInfos.size(); i++) { @@ -725,19 +724,19 @@ public class IndexWriter { for (int i = 0; i < segments.size(); i++) { SegmentReader reader = (SegmentReader)segments.elementAt(i); if (reader.directory() == this.directory) - deleteFiles(reader.files(), deletable); // try to delete our files + deleteFiles(reader.files(), deletable); // try to delete our files else - deleteFiles(reader.files(), reader.directory()); // delete other files + deleteFiles(reader.files(), reader.directory()); // delete other files } writeDeleteableFiles(deletable); // note files we can't delete } private final void deleteFiles(Vector files) throws IOException { - Vector deletable = new Vector(); - deleteFiles(readDeleteableFiles(), deletable); // try to delete deleteable - deleteFiles(files, deletable); // try to delete our files - writeDeleteableFiles(deletable); // note files we can't delete + Vector deletable = new Vector(); + deleteFiles(readDeleteableFiles(), deletable); // try to delete deleteable + deleteFiles(files, deletable); // try to delete our files + writeDeleteableFiles(deletable); // note files we can't delete } private final void deleteFiles(Vector files, Directory directory)