You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/08/28 00:33:07 UTC
svn commit: r1377894 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/analysis/
lucene/core/src/java/org/apache/lucene/document/
lucene/core/src/java/org/apache/lucene/index/ lucene/core/src/test/org/a...
Author: rmuir
Date: Mon Aug 27 22:33:06 2012
New Revision: 1377894
URL: http://svn.apache.org/viewvc?rev=1377894&view=rev
Log:
remove useless inheritdocs (if you dont add to it, it does nothing)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVGroupFacetCollector.java
lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java Mon Aug 27 22:33:06 2012
@@ -326,16 +326,12 @@ public abstract class Analyzer {
*/
public final static class GlobalReuseStrategy extends ReuseStrategy {
- /**
- * {@inheritDoc}
- */
+ @Override
public TokenStreamComponents getReusableComponents(String fieldName) {
return (TokenStreamComponents) getStoredValue();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void setReusableComponents(String fieldName, TokenStreamComponents components) {
setStoredValue(components);
}
@@ -347,19 +343,15 @@ public abstract class Analyzer {
*/
public static class PerFieldReuseStrategy extends ReuseStrategy {
- /**
- * {@inheritDoc}
- */
@SuppressWarnings("unchecked")
+ @Override
public TokenStreamComponents getReusableComponents(String fieldName) {
Map<String, TokenStreamComponents> componentsPerField = (Map<String, TokenStreamComponents>) getStoredValue();
return componentsPerField != null ? componentsPerField.get(fieldName) : null;
}
- /**
- * {@inheritDoc}
- */
@SuppressWarnings("unchecked")
+ @Override
public void setReusableComponents(String fieldName, TokenStreamComponents components) {
Map<String, TokenStreamComponents> componentsPerField = (Map<String, TokenStreamComponents>) getStoredValue();
if (componentsPerField == null) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java Mon Aug 27 22:33:06 2012
@@ -61,25 +61,16 @@ public abstract class AnalyzerWrapper ex
*/
protected abstract TokenStreamComponents wrapComponents(String fieldName, TokenStreamComponents components);
- /**
- * {@inheritDoc}
- */
@Override
protected final TokenStreamComponents createComponents(String fieldName, Reader aReader) {
return wrapComponents(fieldName, getWrappedAnalyzer(fieldName).createComponents(fieldName, aReader));
}
- /**
- * {@inheritDoc}
- */
@Override
public final int getPositionIncrementGap(String fieldName) {
return getWrappedAnalyzer(fieldName).getPositionIncrementGap(fieldName);
}
- /**
- * {@inheritDoc}
- */
@Override
public final int getOffsetGap(String fieldName) {
return getWrappedAnalyzer(fieldName).getOffsetGap(fieldName);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/document/Field.java Mon Aug 27 22:33:06 2012
@@ -213,7 +213,7 @@ public class Field implements IndexableF
}
/**
- * The TokesStream for this field to be used when indexing, or null. If null,
+ * The TokenStream for this field to be used when indexing, or null. If null,
* the Reader value or String value is analyzed to produce the indexed tokens.
*/
public TokenStream tokenStreamValue() {
@@ -405,9 +405,6 @@ public class Field implements IndexableF
return type;
}
- /**
- * {@inheritDoc}
- */
public TokenStream tokenStream(Analyzer analyzer) throws IOException {
if (!fieldType().indexed()) {
return null;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java Mon Aug 27 22:33:06 2012
@@ -174,7 +174,6 @@ public final class SegmentInfo {
return Collections.unmodifiableSet(setFiles);
}
- /** {@inheritDoc} */
@Override
public String toString() {
return toString(dir, 0);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java Mon Aug 27 22:33:06 2012
@@ -168,17 +168,11 @@ public class TestCrashCausesCorruptIndex
this.crashAfterCreateOutput = name;
}
- /**
- * {@inheritDoc}
- */
@Override
public void close() throws IOException {
realDirectory.close();
}
- /**
- * {@inheritDoc}
- */
@Override
public IndexOutput createOutput(String name, IOContext cxt) throws IOException {
IndexOutput indexOutput = realDirectory.createOutput(name, cxt);
@@ -194,49 +188,31 @@ public class TestCrashCausesCorruptIndex
return indexOutput;
}
- /**
- * {@inheritDoc}
- */
@Override
public void deleteFile(String name) throws IOException {
realDirectory.deleteFile(name);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean fileExists(String name) throws IOException {
return realDirectory.fileExists(name);
}
- /**
- * {@inheritDoc}
- */
@Override
public long fileLength(String name) throws IOException {
return realDirectory.fileLength(name);
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] listAll() throws IOException {
return realDirectory.listAll();
}
- /**
- * {@inheritDoc}
- */
@Override
public IndexInput openInput(String name, IOContext cxt) throws IOException {
return realDirectory.openInput(name, cxt);
}
- /**
- * {@inheritDoc}
- */
@Override
public void sync(Collection<String> names) throws IOException {
realDirectory.sync(names);
Modified: lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVGroupFacetCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVGroupFacetCollector.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVGroupFacetCollector.java (original)
+++ lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVGroupFacetCollector.java Mon Aug 27 22:33:06 2012
@@ -262,9 +262,7 @@ public abstract class DVGroupFacetCollec
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
protected void nextTerm() throws IOException {
mergeTerm = facetFieldSource.getByOrd(mergePos, spare);
}
Modified: lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java (original)
+++ lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java Mon Aug 27 22:33:06 2012
@@ -70,9 +70,7 @@ public class FunctionAllGroupHeadsCollec
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
protected void retrieveGroupHeadAndAddIfNotExist(int doc) throws IOException {
filler.fillValue(doc);
GroupHead groupHead = groups.get(mval);
@@ -87,13 +85,12 @@ public class FunctionAllGroupHeadsCollec
this.temporalResult.groupHead = groupHead;
}
- /**
- * {@inheritDoc}
- */
+ @Override
protected Collection<GroupHead> getCollectedGroupHeads() {
return groups.values();
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
for (GroupHead groupHead : groups.values()) {
@@ -103,6 +100,7 @@ public class FunctionAllGroupHeadsCollec
}
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
this.readerContext = context;
FunctionValues values = groupBy.getValues(vsContext, context);
Modified: lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java (original)
+++ lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java Mon Aug 27 22:33:06 2012
@@ -61,13 +61,12 @@ public class FunctionAllGroupsCollector
this.groupBy = groupBy;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public Collection<MutableValue> getGroups() {
return groups;
}
+ @Override
public void collect(int doc) throws IOException {
filler.fillValue(doc);
if (!groups.contains(mval)) {
@@ -75,9 +74,7 @@ public class FunctionAllGroupsCollector
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
FunctionValues values = groupBy.getValues(vsContext, context);
filler = values.getValueFiller();
Modified: lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java (original)
+++ lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java Mon Aug 27 22:33:06 2012
@@ -64,17 +64,13 @@ public class FunctionSecondPassGroupingC
this.vsContext = vsContext;
}
- /**
- * {@inheritDoc}
- */
+ @Override
protected SearchGroupDocs<MutableValue> retrieveGroup(int doc) throws IOException {
filler.fillValue(doc);
return groupMap.get(mval);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void setNextReader(AtomicReaderContext readerContext) throws IOException {
super.setNextReader(readerContext);
FunctionValues values = groupByVS.getValues(vsContext, readerContext);
Modified: lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java (original)
+++ lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java Mon Aug 27 22:33:06 2012
@@ -82,6 +82,7 @@ public class TermAllGroupsCollector exte
this(groupField, DEFAULT_INITIAL_SIZE);
}
+ @Override
public void collect(int doc) throws IOException {
int key = index.getOrd(doc);
if (!ordSet.exists(key)) {
@@ -91,13 +92,12 @@ public class TermAllGroupsCollector exte
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
public Collection<BytesRef> getGroups() {
return groups;
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
index = FieldCache.DEFAULT.getTermsIndex(context.reader(), groupField);
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java?rev=1377894&r1=1377893&r2=1377894&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java Mon Aug 27 22:33:06 2012
@@ -138,9 +138,6 @@ public class FSTCompletionLookup extends
completion.getFST(), true, exactMatchFirst);
}
- /**
- * {@inheritDoc}
- */
@Override
public void build(TermFreqIterator tfit) throws IOException {
File tempInput = File.createTempFile(