You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2016/12/26 13:34:20 UTC
[26/50] [abbrv] opennlp git commit: Remove redundant variable
initialization
Remove redundant variable initialization
See issue OPENNLP-871
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/06371807
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/06371807
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/06371807
Branch: refs/heads/889
Commit: 06371807f421926eefb99b0ce15dd552066b0cab
Parents: eb93f64
Author: J�rn Kottmann <jo...@apache.org>
Authored: Mon Nov 7 18:19:17 2016 +0100
Committer: J�rn Kottmann <jo...@apache.org>
Committed: Mon Dec 19 23:39:08 2016 +0100
----------------------------------------------------------------------
.../tools/cmdline/GenerateManualTool.java | 2 +-
.../tools/cmdline/parser/ParserTrainerTool.java | 2 +-
.../entitylinker/EntityLinkerProperties.java | 5 +---
.../tools/formats/ad/ADNameSampleStream.java | 3 +--
.../formats/brat/AnnotationConfiguration.java | 2 +-
.../tools/lemmatizer/DictionaryLemmatizer.java | 2 +-
.../opennlp/tools/ml/AbstractEventTrainer.java | 2 +-
.../opennlp/tools/ml/maxent/GISTrainer.java | 6 ++---
.../tools/ml/maxent/quasinewton/QNTrainer.java | 4 +--
.../tools/namefind/DictionaryNameFinder.java | 2 +-
.../tools/namefind/TokenNameFinderFactory.java | 2 +-
.../tools/parser/AbstractBottomUpParser.java | 6 ++---
.../parser/chunking/BuildContextGenerator.java | 19 +++++++------
.../opennlp/tools/parser/chunking/Parser.java | 2 +-
.../treeinsert/AttachContextGenerator.java | 9 +++----
.../treeinsert/BuildContextGenerator.java | 28 +++++++++-----------
.../treeinsert/CheckContextGenerator.java | 6 ++---
.../sentdetect/SentenceDetectorFactory.java | 2 +-
.../opennlp/tools/tokenize/TokenSample.java | 4 +--
.../tools/tokenize/TokenizerFactory.java | 2 +-
.../opennlp/tools/util/AbstractEventStream.java | 2 +-
.../opennlp/tools/util/BaseToolFactory.java | 2 +-
.../opennlp/tools/util/model/BaseModel.java | 7 ++---
23 files changed, 53 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/cmdline/GenerateManualTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/GenerateManualTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/GenerateManualTool.java
index b42f69c..b2a9c42 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/GenerateManualTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/GenerateManualTool.java
@@ -239,7 +239,7 @@ public class GenerateManualTool {
*/
private static String splitLongLines(String stringBlock) {
StringBuilder sb = new StringBuilder();
- String line = null;
+ String line;
try {
BufferedReader reader = new BufferedReader(new StringReader(stringBlock));
while ((line = reader.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java
index 5ea7ec4..10cf7c4 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java
@@ -83,7 +83,7 @@ public final class ParserTrainerTool extends AbstractTrainerTool<Parse, TrainerT
static HeadRules creaeHeadRules(TrainerToolParams params) throws IOException {
- ArtifactSerializer headRulesSerializer = null;
+ ArtifactSerializer headRulesSerializer;
if (params.getHeadRulesSerializerImpl() != null) {
headRulesSerializer = ExtensionLoader.instantiateExtension(ArtifactSerializer.class,
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/entitylinker/EntityLinkerProperties.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/entitylinker/EntityLinkerProperties.java b/opennlp-tools/src/main/java/opennlp/tools/entitylinker/EntityLinkerProperties.java
index 31e6486..bd7b6f6 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/entitylinker/EntityLinkerProperties.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/entitylinker/EntityLinkerProperties.java
@@ -76,13 +76,10 @@ public class EntityLinkerProperties {
*/
public String getProperty(String key, String defaultValue) throws IOException {
- String propVal = defaultValue;
-
if (props != null) {
- propVal = props.getProperty(key, defaultValue);
+ return props.getProperty(key, defaultValue);
} else {
throw new IOException("EntityLinkerProperties was not successfully initialized");
}
- return propVal;
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStream.java
index 22b3efb..5e131f2 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/ad/ADNameSampleStream.java
@@ -347,10 +347,9 @@ public class ADNameSampleStream implements ObjectStream<NameSample> {
// a NER.
// we check if it is true, and expand the last NER
int lastIndex = names.size() - 1;
- Span last = null;
boolean error = false;
if (names.size() > 0) {
- last = names.get(lastIndex);
+ Span last = names.get(lastIndex);
if (last.getEnd() == sentence.size() - 1) {
names.set(lastIndex, new Span(last.getStart(), sentence.size(),
last.getType()));
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/formats/brat/AnnotationConfiguration.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/AnnotationConfiguration.java b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/AnnotationConfiguration.java
index 505ba4e..723ddbc 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/AnnotationConfiguration.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/AnnotationConfiguration.java
@@ -56,7 +56,7 @@ public class AnnotationConfiguration {
BufferedReader reader = new BufferedReader(new InputStreamReader(in, Charset.forName("UTF-8")));
// Note: This only supports entities and relations section
- String line = null;
+ String line;
String sectionType = null;
while ((line = reader.readLine())!= null) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/DictionaryLemmatizer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/DictionaryLemmatizer.java b/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/DictionaryLemmatizer.java
index 815f35e..0ae8e37 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/DictionaryLemmatizer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/DictionaryLemmatizer.java
@@ -100,7 +100,7 @@ public class DictionaryLemmatizer implements Lemmatizer {
* @return the lemma
*/
public String apply(final String word, final String postag) {
- String lemma = null;
+ String lemma;
final List<String> keys = this.getDictKeys(word, postag);
// lookup lemma as value of the map
final String keyValue = this.dictMap.get(keys);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java b/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java
index cd1aa42..ae0c3b0 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/AbstractEventTrainer.java
@@ -66,7 +66,7 @@ public abstract class AbstractEventTrainer extends AbstractTrainer implements
int cutoff = getCutoff();
boolean sortAndMerge = isSortAndMerge();
- DataIndexer indexer = null;
+ DataIndexer indexer;
if (DATA_INDEXER_ONE_PASS_VALUE.equals(dataIndexerName)) {
indexer = new OnePassDataIndexer(events, cutoff, sortAndMerge);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
index bd6603e..0527979 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
@@ -340,7 +340,7 @@ class GISTrainer {
for (int oi = 0; oi < numOutcomes; oi++) {
allOutcomesPattern[oi] = oi;
}
- int numActiveOutcomes = 0;
+ int numActiveOutcomes;
for (int pi = 0; pi < numPreds; pi++) {
numActiveOutcomes = 0;
if (useSimpleSmoothing) {
@@ -404,7 +404,7 @@ class GISTrainer {
/* Estimate and return the model parameters. */
private void findParameters(int iterations, double correctionConstant) {
double prevLL = 0.0;
- double currLL = 0.0;
+ double currLL;
display("Performing " + iterations + " iterations.\n");
for (int i = 1; i <= iterations; i++) {
if (i < 10)
@@ -569,7 +569,7 @@ class GISTrainer {
}
for (Future<?> future : futures) {
- ModelExpactationComputeTask finishedTask = null;
+ ModelExpactationComputeTask finishedTask;
try {
finishedTask = (ModelExpactationComputeTask) future.get();
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java
index b8deb52..dbcc331 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java
@@ -156,7 +156,7 @@ public class QNTrainer extends AbstractEventTrainer {
public QNModel trainModel(int iterations, DataIndexer indexer) {
// Train model's parameters
- Function objectiveFunction = null;
+ Function objectiveFunction;
if (threads == 1) {
System.out.println("Computing model parameters ...");
objectiveFunction = new NegLogLikelihood(indexer);
@@ -237,4 +237,4 @@ public class QNTrainer extends AbstractEventTrainer {
return (double) nCorrect / nTotalEvents;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/namefind/DictionaryNameFinder.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/DictionaryNameFinder.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/DictionaryNameFinder.java
index b9e1f17..a8d249f 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/DictionaryNameFinder.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/DictionaryNameFinder.java
@@ -67,7 +67,7 @@ public class DictionaryNameFinder implements TokenNameFinder {
for (int offsetFrom = 0; offsetFrom < textTokenized.length; offsetFrom++) {
Span nameFound = null;
- String tokensSearching[] = new String[] {};
+ String tokensSearching[];
for (int offsetTo = offsetFrom; offsetTo < textTokenized.length; offsetTo++) {
int lengthSearching = offsetTo - offsetFrom + 1;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
index 3864c84..90381ff 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
@@ -170,7 +170,7 @@ public class TokenNameFinderFactory extends BaseToolFactory {
InputStream descriptorIn = new ByteArrayInputStream(featureGeneratorBytes);
- AdaptiveFeatureGenerator generator = null;
+ AdaptiveFeatureGenerator generator;
try {
generator = GeneratorFactory.create(descriptorIn, new FeatureGeneratorResourceProvider() {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java b/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
index 0a05d61..3fabfd2 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
@@ -219,7 +219,7 @@ public abstract class AbstractBottomUpParser implements Parser {
public static Parse[] collapsePunctuation(Parse[] chunks, Set<String> punctSet) {
List<Parse> collapsedParses = new ArrayList<Parse>(chunks.length);
int lastNonPunct = -1;
- int nextNonPunct = -1;
+ int nextNonPunct;
for (int ci=0,cn=chunks.length;ci<cn;ci++) {
if (punctSet.contains(chunks[ci].getType())) {
if (lastNonPunct >= 0) {
@@ -383,9 +383,9 @@ public abstract class AbstractBottomUpParser implements Parser {
String words[] = new String[children.length];
String ptags[] = new String[words.length];
double probs[] = new double[words.length];
- Parse sp = null;
+
for (int i = 0, il = children.length; i < il; i++) {
- sp = children[i];
+ Parse sp = children[i];
words[i] = sp.getHead().getCoveredText();
ptags[i] = sp.getType();
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/BuildContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/BuildContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/BuildContextGenerator.java
index 081ef9a..42d7c07 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/BuildContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/BuildContextGenerator.java
@@ -73,32 +73,31 @@ public class BuildContextGenerator extends AbstractContextGenerator {
// cons(-2), cons(-1), cons(0), cons(1), cons(2)
// cons(-2)
- Parse p_2 = null;
- Parse p_1 = null;
- Parse p0 = null;
- Parse p1 = null;
- Parse p2 = null;
- Collection<Parse> punct1s = null;
Collection<Parse> punct2s = null;
- Collection<Parse> punct_1s = null;
Collection<Parse> punct_2s = null;
+ Parse p_2 = null;
if (index - 2 >= 0) {
p_2 = constituents[index - 2];
}
+
+ Parse p_1 = null;
if (index - 1 >= 0) {
p_1 = constituents[index - 1];
punct_2s = p_1.getPreviousPunctuationSet();
}
- p0 = constituents[index];
- punct_1s=p0.getPreviousPunctuationSet();
- punct1s=p0.getNextPunctuationSet();
+ Parse p0 = constituents[index];
+ Collection<Parse> punct_1s = p0.getPreviousPunctuationSet();
+ Collection<Parse> punct1s = p0.getNextPunctuationSet();
+ Parse p1 = null;
if (index + 1 < ps) {
p1 = constituents[index + 1];
punct2s = p1.getNextPunctuationSet();
}
+
+ Parse p2 = null;
if (index + 2 < ps) {
p2 = constituents[index + 2];
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
index 05314ef..062e7f2 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
@@ -206,7 +206,7 @@ public class Parser extends AbstractBottomUpParser {
//String[] context = checkContextGenerator.getContext(newParse1.getChildren(), lastStartType, lastStartIndex, advanceNodeIndex);
checkModel.eval(checkContextGenerator.getContext(collapsePunctuation(newParse1.getChildren(),punctSet), lastStartType, lastStartIndex, advanceNodeIndex), cprobs);
//System.out.println("check "+lastStartType+" "+cprobs[completeIndex]+" "+cprobs[incompleteIndex]+" "+tag+" "+java.util.Arrays.asList(context));
- Parse newParse2 = newParse1;
+ Parse newParse2;
if (cprobs[completeIndex] > q) { //make sure a reduce is likely
newParse2 = (Parse) newParse1.clone();
if (createDerivationString) newParse2.getDerivation().append(1).append(".");
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/AttachContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/AttachContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/AttachContextGenerator.java
index 7ba8a90..9bce4cc 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/AttachContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/AttachContextGenerator.java
@@ -77,12 +77,9 @@ public class AttachContextGenerator extends AbstractContextGenerator {
p1 = constituents[index+1];
}
- Collection<Parse> punct1s = null;
- Collection<Parse> punct_1s = null;
- Collection<Parse> punct_1fs = null;
- punct_1fs = fn.getPreviousPunctuationSet();
- punct_1s=p0.getPreviousPunctuationSet();
- punct1s=p0.getNextPunctuationSet();
+ Collection<Parse> punct_1fs = fn.getPreviousPunctuationSet();
+ Collection<Parse> punct_1s = p0.getPreviousPunctuationSet();
+ Collection<Parse> punct1s = p0.getNextPunctuationSet();
String consfp = cons(fp,-3);
String consf = cons(fn,-2);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/BuildContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/BuildContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/BuildContextGenerator.java
index 0d91612..8677171 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/BuildContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/BuildContextGenerator.java
@@ -55,30 +55,27 @@ public class BuildContextGenerator extends AbstractContextGenerator {
* @return the contexts/features for the decision to build a new constituent.
*/
public String[] getContext(Parse[] constituents, int index) {
- Parse p_2 = null;
- Parse p_1 = null;
- Parse p0 = null;
- Parse p1 = null;
- Parse p2 = null;
int ps = constituents.length;
- p0 = constituents[index];
+ Parse p0 = constituents[index];
+
+ Parse p1 = null;
if (index + 1 < ps) {
p1 = constituents[index + 1];
}
+
+ Parse p2 = null;
if (index +2 < ps) {
p2 = constituents[index + 2];
}
- Collection<Parse> punct1s = null;
- Collection<Parse> punct_1s = null;
- Collection<Parse> punct2s = null;
- Collection<Parse> punct_2s = null;
- punct_1s=p0.getPreviousPunctuationSet();
- punct1s=p0.getNextPunctuationSet();
+ Collection<Parse> punct_1s = p0.getPreviousPunctuationSet();
+ Collection<Parse> punct1s = p0.getNextPunctuationSet();
+
+ Collection<Parse> punct2s = null;
if (p1 != null) {
- punct2s=p1.getNextPunctuationSet();
+ punct2s = p1.getNextPunctuationSet();
}
@@ -92,9 +89,10 @@ public class BuildContextGenerator extends AbstractContextGenerator {
rf = Parser.getRightFrontier(constituents[0], emptyPunctSet);
}
getFrontierNodes(rf,leftNodes);
- p_1 = leftNodes[0];
- p_2 = leftNodes[1];
+ Parse p_1 = leftNodes[0];
+ Parse p_2 = leftNodes[1];
+ Collection<Parse> punct_2s = null;
if (p_1 != null) {
punct_2s = p_1.getPreviousPunctuationSet();
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/CheckContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/CheckContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/CheckContextGenerator.java
index 199b4a2..694d65d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/CheckContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/CheckContextGenerator.java
@@ -59,8 +59,6 @@ public class CheckContextGenerator extends AbstractContextGenerator {
Parse p1 = null;
Parse p2 = null;
- Parse p_1 = null;
- Parse p_2 = null;
Collection<Parse> p1s = constituents[index].getNextPunctuationSet();
Collection<Parse> p2s = null;
Collection<Parse> p_1s = constituents[index].getPreviousPunctuationSet();
@@ -86,8 +84,8 @@ public class CheckContextGenerator extends AbstractContextGenerator {
}
getFrontierNodes(rf,leftNodes);
- p_1 = leftNodes[0];
- p_2 = leftNodes[1];
+ Parse p_1 = leftNodes[0];
+ Parse p_2 = leftNodes[1];
int ps = constituents.length;
if (p_1 != null) {
p_2s = p_1.getPreviousPunctuationSet();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorFactory.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorFactory.java b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorFactory.java
index c6d02cb..9ef3e78 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorFactory.java
@@ -190,7 +190,7 @@ public class SentenceDetectorFactory extends BaseToolFactory {
public SDContextGenerator getSDContextGenerator() {
Factory f = new Factory();
char[] eosChars = getEOSCharacters();
- Set<String> abbs = null;
+ Set<String> abbs;
Dictionary abbDict = getAbbreviationDictionary();
if (abbDict != null) {
abbs = abbDict.asStringSet();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
index 84021da..1a40dd5 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
@@ -130,7 +130,7 @@ public class TokenSample {
// and this token insert the separator chars
// otherwise insert a space
- String separator = "";
+ String separator;
if (lastEndIndex == token.getStart())
separator = separatorChars;
else
@@ -181,7 +181,7 @@ public class TokenSample {
boolean wasTokenReplaced = false;
int tokStart = 0;
- int tokEnd = -1;
+ int tokEnd;
while ((tokEnd = whitespaceToken.indexOf(separatorChars, tokStart)) > -1) {
String token = whitespaceToken.substring(tokStart, tokEnd);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerFactory.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerFactory.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerFactory.java
index e1095e3..4c67ce1 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerFactory.java
@@ -228,7 +228,7 @@ public class TokenizerFactory extends BaseToolFactory {
*/
public TokenContextGenerator getContextGenerator() {
Factory f = new Factory();
- Set<String> abbs = null;
+ Set<String> abbs;
Dictionary abbDict = getAbbreviationDictionary();
if (abbDict != null) {
abbs = abbDict.asStringSet();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java b/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java
index 1a61d87..c636378 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java
@@ -57,7 +57,7 @@ public abstract class AbstractEventStream<T> implements ObjectStream<Event> {
return events.next();
}
else {
- T sample = null;
+ T sample;
while (!events.hasNext() && (sample = samples.read()) != null) {
events = createEvents(sample);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/util/BaseToolFactory.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/BaseToolFactory.java b/opennlp-tools/src/main/java/opennlp/tools/util/BaseToolFactory.java
index 69f13dc..873c2c4 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/BaseToolFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/BaseToolFactory.java
@@ -101,7 +101,7 @@ public abstract class BaseToolFactory {
public static BaseToolFactory create(String subclassName,
ArtifactProvider artifactProvider) throws InvalidFormatException {
- BaseToolFactory theFactory = null;
+ BaseToolFactory theFactory;
try {
// load the ToolFactory using the default constructor
http://git-wip-us.apache.org/repos/asf/opennlp/blob/06371807/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java b/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java
index 771958f..9997a82 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/model/BaseModel.java
@@ -347,14 +347,11 @@ public abstract class BaseModel implements ArtifactProvider, Serializable {
}
protected ArtifactSerializer getArtifactSerializer(String resourceName) {
- String extension = null;
try {
- extension = getEntryExtension(resourceName);
+ return artifactSerializers.get(getEntryExtension(resourceName));
} catch (InvalidFormatException e) {
throw new IllegalStateException(e);
}
-
- return artifactSerializers.get(extension);
}
protected static Map<String, ArtifactSerializer> createArtifactSerializers() {
@@ -621,7 +618,7 @@ public abstract class BaseModel implements ArtifactProvider, Serializable {
ByteArrayOutputStream output = new ByteArrayOutputStream();
byte[] buffer = new byte[1024 * 4];
int count = 0;
- int n = 0;
+ int n;
while (-1 != (n = input.read(buffer))) {
output.write(buffer, 0, n);
count += n;