Author: otis
Date: Fri Mar 11 19:50:54 2005
New Revision: 157225
URL: http://svn.apache.org/viewcvs?view=rev&rev=157225
Log:
- Cosmetics (tabs, indentation)
Modified:
lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java
URL:
http://svn.apache.org/viewcvs/lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java?view=diff&r1=157224&r2=157225
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java
(original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/IndexWriter.java Fri Mar
11 19:50:54 2005
@@ -656,8 +656,7 @@
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 @@
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)