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 2017/02/16 12:05:51 UTC
[1/2] opennlp git commit: OPENNLP-990 Fix all array style violations
and add a checkstyle rule
Repository: opennlp
Updated Branches:
refs/heads/master b7d3abce5 -> bbd6d3fc4
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java
index 1e90ecc..259d9f4 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java
@@ -37,8 +37,8 @@ public class PosSampleStream extends FilterObjectStream<Parse, POSSample> {
Parse[] nodes = parse.getTagNodes();
- String toks[] = new String[nodes.length];
- String preds[] = new String[nodes.length];
+ String[] toks = new String[nodes.length];
+ String[] preds = new String[nodes.length];
for (int ti = 0; ti < nodes.length; ti++) {
Parse tok = nodes[ti];
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/postag/POSDictionary.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/postag/POSDictionary.java b/opennlp-tools/src/main/java/opennlp/tools/postag/POSDictionary.java
index f103450..5f5eb25 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/postag/POSDictionary.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/postag/POSDictionary.java
@@ -99,7 +99,7 @@ public class POSDictionary implements Iterable<String>, MutableTagDictionary {
return dictionary.keySet().iterator();
}
- private static String tagsToString(String tags[]) {
+ private static String tagsToString(String[] tags) {
StringBuilder tagString = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java b/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java
index 26cb79c..eaf6baf 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java
@@ -57,8 +57,8 @@ public class POSEvaluator extends Evaluator<POSSample> {
@Override
protected POSSample processSample(POSSample reference) {
- String predictedTags[] = tagger.tag(reference.getSentence(), reference.getAddictionalContext());
- String referenceTags[] = reference.getTags();
+ String[] predictedTags = tagger.tag(reference.getSentence(), reference.getAddictionalContext());
+ String[] referenceTags = reference.getTags();
for (int i = 0; i < referenceTags.length; i++) {
if (referenceTags[i].equals(predictedTags[i])) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/postag/POSSample.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/postag/POSSample.java b/opennlp-tools/src/main/java/opennlp/tools/postag/POSSample.java
index b1b2d32..9512e38 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/postag/POSSample.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/postag/POSSample.java
@@ -37,7 +37,7 @@ public class POSSample {
private final String[][] additionalContext;
- public POSSample(String sentence[], String tags[]) {
+ public POSSample(String[] sentence, String[] tags) {
this(sentence, tags, null);
}
@@ -66,7 +66,7 @@ public class POSSample {
this.additionalContext = ac;
}
- public POSSample(String sentence[], String tags[],
+ public POSSample(String[] sentence, String[] tags,
String[][] additionalContext) {
this(Arrays.asList(sentence), Arrays.asList(tags), additionalContext);
}
@@ -120,10 +120,10 @@ public class POSSample {
public static POSSample parse(String sentenceString) throws InvalidFormatException {
- String tokenTags[] = WhitespaceTokenizer.INSTANCE.tokenize(sentenceString);
+ String[] tokenTags = WhitespaceTokenizer.INSTANCE.tokenize(sentenceString);
- String sentence[] = new String[tokenTags.length];
- String tags[] = new String[tokenTags.length];
+ String[] sentence = new String[tokenTags.length];
+ String[] tags = new String[tokenTags.length];
for (int i = 0; i < tokenTags.length; i++) {
int split = tokenTags[i].lastIndexOf("_");
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java b/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java
index 4dd31e0..aa3c99d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java
@@ -63,9 +63,9 @@ public class POSSampleEventStream extends AbstractEventStream<POSSample> {
@Override
protected Iterator<Event> createEvents(POSSample sample) {
- String sentence[] = sample.getSentence();
- String tags[] = sample.getTags();
- Object ac[] = sample.getAddictionalContext();
+ String[] sentence = sample.getSentence();
+ String[] tags = sample.getTags();
+ Object[] ac = sample.getAddictionalContext();
List<Event> events = generateEvents(sentence, tags, ac, cg);
return events.iterator();
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java b/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java
index b81fc48..9942d67 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java
@@ -59,8 +59,8 @@ public class POSSampleSequenceStream implements SequenceStream {
POSSample sample = psi.read();
if (sample != null) {
- String sentence[] = sample.getSentence();
- String tags[] = sample.getTags();
+ String[] sentence = sample.getSentence();
+ String[] tags = sample.getTags();
Event[] events = new Event[sentence.length];
for (int i = 0; i < sentence.length; i++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java
index 91bda34..75d0ec0 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java
@@ -28,14 +28,14 @@ import java.util.List;
*/
public class DefaultEndOfSentenceScanner implements EndOfSentenceScanner {
- private char eosCharacters[];
+ private char[] eosCharacters;
/**
* Initializes the current instance.
*
* @param eosCharacters
*/
- public DefaultEndOfSentenceScanner(char eosCharacters[]) {
+ public DefaultEndOfSentenceScanner(char[] eosCharacters) {
this.eosCharacters = eosCharacters;
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java
index b246327..3effda8 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java
@@ -51,8 +51,8 @@ public class SentenceDetectorEvaluator extends Evaluator<SentenceSample> {
this.sentenceDetector = sentenceDetector;
}
- private Span[] trimSpans(String document, Span spans[]) {
- Span trimedSpans[] = new Span[spans.length];
+ private Span[] trimSpans(String document, Span[] spans) {
+ Span[] trimedSpans = new Span[spans.length];
for (int i = 0; i < spans.length; i++) {
trimedSpans[i] = spans[i].trim(document);
@@ -63,7 +63,7 @@ public class SentenceDetectorEvaluator extends Evaluator<SentenceSample> {
@Override
protected SentenceSample processSample(SentenceSample sample) {
- Span predictions[] =
+ Span[] predictions =
trimSpans(sample.getDocument(), sentenceDetector.sentPosDetect(sample.getDocument()));
Span[] references = trimSpans(sample.getDocument(), sample.getSentences());
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java
index 2f3fd6c..b5ad804 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java
@@ -128,7 +128,7 @@ public class SentenceDetectorME implements SentenceDetector {
*/
public String[] sentDetect(String s) {
Span[] spans = sentPosDetect(s);
- String sentences[];
+ String[] sentences;
if (spans.length != 0) {
sentences = new String[spans.length];
for (int si = 0; si < spans.length; si++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceSample.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceSample.java b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceSample.java
index 1f1b79a..dbbd193 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceSample.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceSample.java
@@ -53,7 +53,7 @@ public class SentenceSample {
StringBuilder documentBuilder = new StringBuilder();
- for (String sentenceTokens[] : sentences) {
+ for (String[] sentenceTokens : sentences) {
String sampleSentence = detokenizer.detokenize(sentenceTokens, null);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/tokenize/DetokenizationDictionary.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/DetokenizationDictionary.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/DetokenizationDictionary.java
index 9ffe649..55eca1c 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/DetokenizationDictionary.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/DetokenizationDictionary.java
@@ -87,8 +87,8 @@ public class DetokenizationDictionary {
* @param operations an array of operations which specifies which operation
* should be used for the provided tokens
*/
- public DetokenizationDictionary(String tokens[],
- DetokenizationDictionary.Operation operations[]) {
+ public DetokenizationDictionary(String[] tokens,
+ DetokenizationDictionary.Operation[] operations) {
if (tokens.length != operations.length)
throw new IllegalArgumentException("tokens and ops must have the same length: tokens=" +
tokens.length + ", operations=" + operations.length + "!");
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/tokenize/Detokenizer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/Detokenizer.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/Detokenizer.java
index 3af8597..acb9f45 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/Detokenizer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/Detokenizer.java
@@ -57,7 +57,7 @@ public interface Detokenizer {
* @param tokens the tokens to detokenize.
* @return the merge operations to detokenize the input tokens.
*/
- DetokenizationOperation[] detokenize(String tokens[]);
+ DetokenizationOperation[] detokenize(String[] tokens);
/**
* Detokenize the input tokens into a String. Tokens which
@@ -69,5 +69,5 @@ public interface Detokenizer {
*
* @return the concatenated tokens
*/
- String detokenize(String tokens[], String splitMarker);
+ String detokenize(String[] tokens, String splitMarker);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/tokenize/DictionaryDetokenizer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/DictionaryDetokenizer.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/DictionaryDetokenizer.java
index 33eab9e..d53eefa 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/DictionaryDetokenizer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/DictionaryDetokenizer.java
@@ -37,7 +37,7 @@ public class DictionaryDetokenizer implements Detokenizer {
public DetokenizationOperation[] detokenize(String[] tokens) {
- DetokenizationOperation operations[] = new DetokenizationOperation[tokens.length];
+ DetokenizationOperation[] operations = new DetokenizationOperation[tokens.length];
Set<String> matchingTokens = new HashSet<>();
@@ -79,9 +79,9 @@ public class DictionaryDetokenizer implements Detokenizer {
return operations;
}
- public String detokenize(String tokens[], String splitMarker) {
+ public String detokenize(String[] tokens, String splitMarker) {
- DetokenizationOperation operations[] = detokenize(tokens);
+ DetokenizationOperation[] operations = detokenize(tokens);
if (tokens.length != operations.length)
throw new IllegalArgumentException("tokens and operations array must have same length: tokens=" +
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
index dd9745e..39b8a80 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
@@ -99,7 +99,7 @@ public class TokSpanEventStream extends AbstractEventStream<TokenSample> {
List<Event> events = new ArrayList<>(50);
- Span tokens[] = tokenSample.getTokenSpans();
+ Span[] tokens = tokenSample.getTokenSpans();
String text = tokenSample.getText();
if (tokens.length > 0) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/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 f895e7d..3ec3b8d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenSample.java
@@ -45,7 +45,7 @@ public class TokenSample {
* @param text the text which contains the tokens.
* @param tokenSpans the spans which mark the begin and end of the tokens.
*/
- public TokenSample(String text, Span tokenSpans[]) {
+ public TokenSample(String text, Span[] tokenSpans) {
Objects.requireNonNull(tokenSpans, "tokenSpans must not be null");
this.text = Objects.requireNonNull(text, "text must not be null");
@@ -60,7 +60,7 @@ public class TokenSample {
}
}
- public TokenSample(Detokenizer detokenizer, String tokens[]) {
+ public TokenSample(Detokenizer detokenizer, String[] tokens) {
StringBuilder sentence = new StringBuilder();
@@ -159,7 +159,7 @@ public class TokenSample {
Objects.requireNonNull(sampleString, "sampleString must not be null");
Objects.requireNonNull(separatorChars, "separatorChars must not be null");
- Span whitespaceTokenSpans[] = WhitespaceTokenizer.INSTANCE.tokenizePos(sampleString);
+ Span[] whitespaceTokenSpans = WhitespaceTokenizer.INSTANCE.tokenizePos(sampleString);
// Pre-allocate 20% for newly created tokens
List<Span> realTokenSpans = new ArrayList<>((int) (whitespaceTokenSpans.length * 1.2d));
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java
index b70898a..fa4d35b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java
@@ -55,7 +55,7 @@ public class TokenizerEvaluator extends Evaluator<TokenSample> {
@Override
protected TokenSample processSample(TokenSample reference) {
- Span predictions[] = tokenizer.tokenizePos(reference.getText());
+ Span[] predictions = tokenizer.tokenizePos(reference.getText());
fmeasure.updateScores(reference.getTokenSpans(), predictions);
return new TokenSample(reference.getText(), predictions);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerStream.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerStream.java
index 2feb26d..bfb87c5 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerStream.java
@@ -41,7 +41,7 @@ public class TokenizerStream implements ObjectStream<TokenSample> {
String inputString = input.read();
if (inputString != null) {
- Span tokens[] = tokenizer.tokenizePos(inputString);
+ Span[] tokens = tokenizer.tokenizePos(inputString);
return new TokenSample(inputString, tokens);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/util/SequenceCodec.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/SequenceCodec.java b/opennlp-tools/src/main/java/opennlp/tools/util/SequenceCodec.java
index 934cbac..c6c474d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/SequenceCodec.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/SequenceCodec.java
@@ -38,7 +38,7 @@ public interface SequenceCodec<T> {
*
* @return
*/
- T[] encode(Span names[], int length);
+ T[] encode(Span[] names, int length);
/**
* Creates a sequence validator which can validate a sequence of outcomes.
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java b/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java
index 5736cf4..e589c93 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java
@@ -27,7 +27,7 @@ import java.util.Objects;
*/
public class StringList implements Iterable<String> {
- private String tokens[];
+ private String[] tokens;
/**
* Initializes the current instance.
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java b/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java
index 6682ec0..3ed769b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java
@@ -73,7 +73,7 @@ public class StringUtil {
* @return lower cased String
*/
public static String toLowerCase(CharSequence string) {
- char lowerCaseChars[] = new char[string.length()];
+ char[] lowerCaseChars = new char[string.length()];
for (int i = 0; i < string.length(); i++) {
lowerCaseChars[i] = Character.toLowerCase(string.charAt(i));
@@ -91,7 +91,7 @@ public class StringUtil {
* @return upper cased String
*/
public static String toUpperCase(CharSequence string) {
- char upperCaseChars[] = new char[string.length()];
+ char[] upperCaseChars = new char[string.length()];
for (int i = 0; i < string.length(); i++) {
upperCaseChars[i] = Character.toUpperCase(string.charAt(i));
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java
index efcfce4..e7cf25c 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/DocumentBeginFeatureGenerator.java
@@ -21,7 +21,7 @@ import java.util.List;
public class DocumentBeginFeatureGenerator implements AdaptiveFeatureGenerator {
- private String firstSentence[];
+ private String[] firstSentence;
public void createFeatures(List<String> features, String[] tokens, int index,
String[] previousOutcomes) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
index 8cee38e..da67204 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/InSpanGenerator.java
@@ -33,9 +33,9 @@ public class InSpanGenerator implements AdaptiveFeatureGenerator {
private final TokenNameFinder finder;
- private String currentSentence[];
+ private String[] currentSentence;
- private Span currentNames[];
+ private Span[] currentNames;
/**
* Initializes the current instance.
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterDictionary.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterDictionary.java b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterDictionary.java
index 11b5f97..93b2122 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterDictionary.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/featuregen/WordClusterDictionary.java
@@ -56,7 +56,7 @@ public class WordClusterDictionary implements SerializableArtifact {
BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
String line;
while ((line = reader.readLine()) != null) {
- String parts[] = line.split(" ");
+ String[] parts = line.split(" ");
if (parts.length == 3) {
tokenToClusterMap.put(parts[0], parts[1].intern());
} else if (parts.length == 2) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java b/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java
index 85f6e12..bcba6ea 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java
@@ -116,7 +116,7 @@ public final class ModelUtil {
ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream();
int length;
- byte buffer[] = new byte[1024];
+ byte[] buffer = new byte[1024];
while ((length = in.read(buffer)) > 0) {
byteArrayOut.write(buffer, 0, length);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java
index c939442..51112df 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java
@@ -85,7 +85,7 @@ public class ChunkerMETest {
@Test
public void testChunkAsArray() throws Exception {
- String preds[] = chunker.chunk(toks1, tags1);
+ String[] preds = chunker.chunk(toks1, tags1);
Assert.assertArrayEquals(expect1, preds);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java b/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java
index c4b0516..b214b26 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java
@@ -120,7 +120,7 @@ public class ArgumentParserTest {
@Test
public void testSimpleArgumentsUsage() {
- String arguments[] = new String[] {"-encoding charset",
+ String[] arguments = new String[] {"-encoding charset",
"[-iterations num]",
"[-alphaNumOpt true|false]"};
@@ -144,7 +144,7 @@ public class ArgumentParserTest {
@Test
public void testDefaultEncodingParameter() {
- String args[] = "-something aValue".split(" ");
+ String[] args = "-something aValue".split(" ");
Assert.assertTrue(ArgumentParser.validateArguments(args, ExtendsEncodingParameter.class));
ExtendsEncodingParameter params = ArgumentParser.parse(args, ExtendsEncodingParameter.class);
@@ -162,7 +162,7 @@ public class ArgumentParserTest {
}
}
- String args[] = ("-something aValue -encoding " + notTheDefaultCharset).split(" ");
+ String[] args = ("-something aValue -encoding " + notTheDefaultCharset).split(" ");
Assert.assertTrue(ArgumentParser.validateArguments(args, ExtendsEncodingParameter.class));
ExtendsEncodingParameter params = ArgumentParser.parse(args, ExtendsEncodingParameter.class);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java
index d569e74..6389530 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java
@@ -50,10 +50,10 @@ public class DocumentCategorizerMETest {
DocumentCategorizer doccat = new DocumentCategorizerME(model);
- double aProbs[] = doccat.categorize("a");
+ double[] aProbs = doccat.categorize("a");
Assert.assertEquals("1", doccat.getBestCategory(aProbs));
- double bProbs[] = doccat.categorize("x");
+ double[] bProbs = doccat.categorize("x");
Assert.assertEquals("0", doccat.getBestCategory(bProbs));
//test to make sure sorted map's last key is cat 1 because it has the highest score.
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java
index ae97840..de3f098 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java
@@ -53,10 +53,10 @@ public class DocumentCategorizerNBTest {
DocumentCategorizer doccat = new DocumentCategorizerME(model);
- double aProbs[] = doccat.categorize("a");
+ double[] aProbs = doccat.categorize("a");
Assert.assertEquals("1", doccat.getBestCategory(aProbs));
- double bProbs[] = doccat.categorize("x");
+ double[] bProbs = doccat.categorize("x");
Assert.assertEquals("0", doccat.getBestCategory(bProbs));
//test to make sure sorted map's last key is cat 1 because it has the highest score.
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/formats/ConllXPOSSampleStreamTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/formats/ConllXPOSSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/formats/ConllXPOSSampleStreamTest.java
index 2382375..809d785 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/formats/ConllXPOSSampleStreamTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/formats/ConllXPOSSampleStreamTest.java
@@ -41,8 +41,8 @@ public class ConllXPOSSampleStreamTest {
POSSample a = sampleStream.read();
- String aSentence[] = a.getSentence();
- String aTags[] = a.getTags();
+ String[] aSentence = a.getSentence();
+ String[] aTags = a.getTags();
assertEquals(22, aSentence.length);
assertEquals(22, aTags.length);
@@ -115,8 +115,8 @@ public class ConllXPOSSampleStreamTest {
POSSample b = sampleStream.read();
- String bSentence[] = b.getSentence();
- String bTags[] = b.getTags();
+ String[] bSentence = b.getSentence();
+ String[] bTags = b.getTags();
assertEquals(12, bSentence.length);
assertEquals(12, bTags.length);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStreamTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStreamTest.java
index fbda898..8fa31be 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStreamTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/formats/frenchtreebank/ConstitParseSampleStreamTest.java
@@ -30,7 +30,7 @@ import opennlp.tools.util.ObjectStreamUtils;
public class ConstitParseSampleStreamTest {
- private String sample1Tokens[] = new String[]{
+ private String[] sample1Tokens = new String[]{
"L'",
"autonomie",
"de",
@@ -88,7 +88,7 @@ public class ConstitParseSampleStreamTest {
private static byte[] getSample1() throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
- byte buffer[] = new byte[1024];
+ byte[] buffer = new byte[1024];
int length;
try (InputStream sampleIn =
ConstitParseSampleStreamTest.class.getResourceAsStream("sample1.xml")) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/ml/BeamSearchTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/ml/BeamSearchTest.java b/opennlp-tools/src/test/java/opennlp/tools/ml/BeamSearchTest.java
index 92528e7..46d0440 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/ml/BeamSearchTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/ml/BeamSearchTest.java
@@ -33,7 +33,7 @@ public class BeamSearchTest {
private String[] outcomeSequence;
- IdentityFeatureGenerator(String outcomeSequence[]) {
+ IdentityFeatureGenerator(String[] outcomeSequence) {
this.outcomeSequence = outcomeSequence;
}
@@ -53,7 +53,7 @@ public class BeamSearchTest {
private double bestOutcomeProb = 0.8d;
private double otherOutcomeProb;
- IdentityModel(String outcomes[]) {
+ IdentityModel(String[] outcomes) {
this.outcomes = outcomes;
for (int i = 0; i < outcomes.length; i++) {
@@ -65,7 +65,7 @@ public class BeamSearchTest {
public double[] eval(String[] context) {
- double probs[] = new double[outcomes.length];
+ double[] probs = new double[outcomes.length];
for (int i = 0; i < probs.length; i++) {
if (outcomes[i].equals(context[0])) {
@@ -118,10 +118,10 @@ public class BeamSearchTest {
@Test
public void testBestSequenceZeroLengthInput() {
- String sequence[] = new String[0];
+ String[] sequence = new String[0];
BeamSearchContextGenerator<String> cg = new IdentityFeatureGenerator(sequence);
- String outcomes[] = new String[] {"1", "2", "3"};
+ String[] outcomes = new String[] {"1", "2", "3"};
MaxentModel model = new IdentityModel(outcomes);
BeamSearch<String> bs = new BeamSearch<>(3, model);
@@ -138,10 +138,10 @@ public class BeamSearchTest {
*/
@Test
public void testBestSequenceOneElementInput() {
- String sequence[] = {"1"};
+ String[] sequence = {"1"};
BeamSearchContextGenerator<String> cg = new IdentityFeatureGenerator(sequence);
- String outcomes[] = new String[] {"1", "2", "3"};
+ String[] outcomes = new String[] {"1", "2", "3"};
MaxentModel model = new IdentityModel(outcomes);
BeamSearch<String> bs = new BeamSearch<>(3, model);
@@ -160,10 +160,10 @@ public class BeamSearchTest {
*/
@Test
public void testBestSequence() {
- String sequence[] = {"1", "2", "3", "2", "1"};
+ String[] sequence = {"1", "2", "3", "2", "1"};
BeamSearchContextGenerator<String> cg = new IdentityFeatureGenerator(sequence);
- String outcomes[] = new String[] {"1", "2", "3"};
+ String[] outcomes = new String[] {"1", "2", "3"};
MaxentModel model = new IdentityModel(outcomes);
BeamSearch<String> bs = new BeamSearch<>(2, model);
@@ -186,10 +186,10 @@ public class BeamSearchTest {
*/
@Test
public void testBestSequenceWithValidator() {
- String sequence[] = {"1", "2", "3", "2", "1"};
+ String[] sequence = {"1", "2", "3", "2", "1"};
BeamSearchContextGenerator<String> cg = new IdentityFeatureGenerator(sequence);
- String outcomes[] = new String[] {"1", "2", "3"};
+ String[] outcomes = new String[] {"1", "2", "3"};
MaxentModel model = new IdentityModel(outcomes);
BeamSearch<String> bs = new BeamSearch<>(2, model, 0);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java b/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java
index 7599551..08d0f97 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java
@@ -59,8 +59,8 @@ public class DictionaryNameFinderTest {
public void testSingleTokeNameAtSentenceStart() {
String sentence = "Max a b c d";
SimpleTokenizer tokenizer = SimpleTokenizer.INSTANCE;
- String tokens[] = tokenizer.tokenize(sentence);
- Span names[] = mNameFinder.find(tokens);
+ String[] tokens = tokenizer.tokenize(sentence);
+ Span[] names = mNameFinder.find(tokens);
Assert.assertTrue(names.length == 1);
Assert.assertTrue(names[0].getStart() == 0 && names[0].getEnd() == 1);
}
@@ -69,8 +69,8 @@ public class DictionaryNameFinderTest {
public void testSingleTokeNameInsideSentence() {
String sentence = "a b Max c d";
SimpleTokenizer tokenizer = SimpleTokenizer.INSTANCE;
- String tokens[] = tokenizer.tokenize(sentence);
- Span names[] = mNameFinder.find(tokens);
+ String[] tokens = tokenizer.tokenize(sentence);
+ Span[] names = mNameFinder.find(tokens);
Assert.assertTrue(names.length == 1);
Assert.assertTrue(names[0].getStart() == 2 && names[0].getEnd() == 3);
}
@@ -80,40 +80,40 @@ public class DictionaryNameFinderTest {
String sentence = "a b c Max";
SimpleTokenizer tokenizer = SimpleTokenizer.INSTANCE;
- String tokens[] = tokenizer.tokenize(sentence);
- Span names[] = mNameFinder.find(tokens);
+ String[] tokens = tokenizer.tokenize(sentence);
+ Span[] names = mNameFinder.find(tokens);
Assert.assertTrue(names.length == 1);
Assert.assertTrue(names[0].getStart() == 3 && names[0].getEnd() == 4);
}
@Test
public void testLastMatchingTokenNameIsChoosen() {
- String sentence[] = {"a", "b", "c", "Vanessa"};
- Span names[] = mNameFinder.find(sentence);
+ String[] sentence = {"a", "b", "c", "Vanessa"};
+ Span[] names = mNameFinder.find(sentence);
Assert.assertTrue(names.length == 1);
Assert.assertTrue(names[0].getStart() == 3 && names[0].getEnd() == 4);
}
@Test
public void testLongerTokenNameIsPreferred() {
- String sentence[] = {"a", "b", "c", "Vanessa", "Williams"};
- Span names[] = mNameFinder.find(sentence);
+ String[] sentence = {"a", "b", "c", "Vanessa", "Williams"};
+ Span[] names = mNameFinder.find(sentence);
Assert.assertTrue(names.length == 1);
Assert.assertTrue(names[0].getStart() == 3 && names[0].getEnd() == 5);
}
@Test
public void testCaseSensitivity() {
- String sentence[] = {"a", "b", "c", "vanessa", "williams"};
- Span names[] = mNameFinder.find(sentence);
+ String[] sentence = {"a", "b", "c", "vanessa", "williams"};
+ Span[] names = mNameFinder.find(sentence);
Assert.assertTrue(names.length == 1);
Assert.assertTrue(names[0].getStart() == 3 && names[0].getEnd() == 5);
}
@Test
public void testCaseLongerEntry() {
- String sentence[] = {"a", "b", "michael", "jordan"};
- Span names[] = mNameFinder.find(sentence);
+ String[] sentence = {"a", "b", "michael", "jordan"};
+ Span[] names = mNameFinder.find(sentence);
Assert.assertTrue(names.length == 1);
Assert.assertTrue(names[0].length() == 2);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java b/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java
index 494af62..c258d07 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java
@@ -78,7 +78,7 @@ public class NameFinderMETest {
// now test if it can detect the sample sentences
- String sentence[] = {"Alisa",
+ String[] sentence = {"Alisa",
"appreciated",
"the",
"hint",
@@ -89,7 +89,7 @@ public class NameFinderMETest {
"traditional",
"meal."};
- Span names[] = nameFinder.find(sentence);
+ Span[] names = nameFinder.find(sentence);
Assert.assertEquals(1, names.length);
Assert.assertEquals(new Span(0, 1, DEFAULT), names[0]);
@@ -150,10 +150,10 @@ public class NameFinderMETest {
Assert.assertEquals("person", names2[0].getType());
Assert.assertEquals("person", names2[1].getType());
- String sentence[] = { "Alisa", "appreciated", "the", "hint", "and",
+ String[] sentence = { "Alisa", "appreciated", "the", "hint", "and",
"enjoyed", "a", "delicious", "traditional", "meal." };
- Span names[] = nameFinder.find(sentence);
+ Span[] names = nameFinder.find(sentence);
Assert.assertEquals(1, names.length);
Assert.assertEquals(new Span(0, 1, "person"), names[0]);
@@ -319,8 +319,8 @@ public class NameFinderMETest {
@Test
public void testDropOverlappingSpans() {
- Span spans[] = new Span[] {new Span(1, 10), new Span(1,11), new Span(1,11), new Span(5, 15)};
- Span remainingSpan[] = NameFinderME.dropOverlappingSpans(spans);
+ Span[] spans = new Span[] {new Span(1, 10), new Span(1,11), new Span(1,11), new Span(5, 15)};
+ Span[] remainingSpan = NameFinderME.dropOverlappingSpans(spans);
Assert.assertEquals(new Span(1, 11), remainingSpan[0]);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java b/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java
index cf533f4..911f998 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java
@@ -101,7 +101,7 @@ public class NameSampleTest {
@Test
public void testNameAtEnd() {
- String sentence[] = new String[] {
+ String[] sentence = new String[] {
"My",
"name",
"is",
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java b/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java
index 0b3fe2a..c0f2fea 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java
@@ -35,7 +35,7 @@ public class RegexNameFinderTest {
public void testFindSingleTokenPattern() {
Pattern testPattern = Pattern.compile("test");
- String sentence[] = new String[]{"a", "test", "b", "c"};
+ String[] sentence = new String[]{"a", "test", "b", "c"};
Pattern[] patterns = new Pattern[]{testPattern};
@@ -59,7 +59,7 @@ public class RegexNameFinderTest {
public void testFindTokenizdPattern() {
Pattern testPattern = Pattern.compile("[0-9]+ year");
- String sentence[] = new String[]{"a", "80", "year", "b", "c"};
+ String[] sentence = new String[]{"a", "80", "year", "b", "c"};
Pattern[] patterns = new Pattern[]{testPattern};
Map<String, Pattern[]> regexMap = new HashMap<>();
@@ -83,7 +83,7 @@ public class RegexNameFinderTest {
public void testFindMatchingPatternWithoutMatchingTokenBounds() {
Pattern testPattern = Pattern.compile("[0-8] year"); // does match "0 year"
- String sentence[] = new String[]{"a", "80", "year", "c"};
+ String[] sentence = new String[]{"a", "80", "year", "c"};
Pattern[] patterns = new Pattern[]{testPattern};
Map<String, Pattern[]> regexMap = new HashMap<>();
String type = "testtype";
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java b/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java
index f8220c6..5d594ed 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java
@@ -102,7 +102,7 @@ public class ParseTest {
public void testGetTagNodes() {
Parse p = Parse.parseParse(PARSE_STRING);
- Parse tags[] = p.getTagNodes();
+ Parse[] tags = p.getTagNodes();
for (Parse node : tags) {
Assert.assertTrue(node.isPosTag());
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/postag/POSTaggerMETest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/postag/POSTaggerMETest.java b/opennlp-tools/src/test/java/opennlp/tools/postag/POSTaggerMETest.java
index 2e616b5..51cae2c 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/postag/POSTaggerMETest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/postag/POSTaggerMETest.java
@@ -63,7 +63,7 @@ public class POSTaggerMETest {
POSTagger tagger = new POSTaggerME(posModel);
- String tags[] = tagger.tag(new String[] {
+ String[] tags = tagger.tag(new String[] {
"The",
"driver",
"got",
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java
index 2b9e984..01b96fc 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java
@@ -41,7 +41,7 @@ public class WordTagSampleStreamTest {
new WordTagSampleStream(new CollectionObjectStream<>(sampleString));
POSSample sample = stream.read();
- String words[] = sample.getSentence();
+ String[] words = sample.getSentence();
Assert.assertEquals("This", words[0]);
Assert.assertEquals("is", words[1]);
@@ -50,7 +50,7 @@ public class WordTagSampleStreamTest {
Assert.assertEquals("sentence", words[4]);
Assert.assertEquals(".", words[5]);
- String tags[] = sample.getTags();
+ String[] tags = sample.getTags();
Assert.assertEquals("x1", tags[0]);
Assert.assertEquals("x2", tags[1]);
Assert.assertEquals("x3", tags[2]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java
index c700f3c..6e226bb 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java
@@ -29,7 +29,7 @@ public class NewlineSentenceDetectorTest {
private static void testSentenceValues(String sentences) {
NewlineSentenceDetector sd = new NewlineSentenceDetector();
- String results[] = sd.sentDetect(sentences);
+ String[] results = sd.sentDetect(sentences);
Assert.assertEquals(3, results.length);
Assert.assertEquals("one.", results[0]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorMETest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorMETest.java b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorMETest.java
index 78d41cc..43d5829 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorMETest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorMETest.java
@@ -124,7 +124,7 @@ public class SentenceDetectorMETest {
Assert.assertEquals(sents[0],"This is a test");
// Test that sentPosDetect also works
- Span pos[] = sentDetect.sentPosDetect(sampleSentences2);
+ Span[] pos = sentDetect.sentPosDetect(sampleSentences2);
Assert.assertEquals(pos.length,2);
probs = sentDetect.getSentenceProbabilities();
Assert.assertEquals(probs.length,2);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/tokenize/DictionaryDetokenizerTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/tokenize/DictionaryDetokenizerTest.java b/opennlp-tools/src/test/java/opennlp/tools/tokenize/DictionaryDetokenizerTest.java
index fa04457..d6ad672 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/tokenize/DictionaryDetokenizerTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/tokenize/DictionaryDetokenizerTest.java
@@ -31,9 +31,9 @@ public class DictionaryDetokenizerTest {
@Test
public void testDetokenizer() {
- String tokens[] = new String[]{".", "!", "(", ")", "\"", "-"};
+ String[] tokens = new String[]{".", "!", "(", ")", "\"", "-"};
- Operation operations[] = new Operation[]{
+ Operation[] operations = new Operation[]{
Operation.MOVE_LEFT,
Operation.MOVE_LEFT,
Operation.MOVE_RIGHT,
@@ -44,7 +44,7 @@ public class DictionaryDetokenizerTest {
DetokenizationDictionary dict = new DetokenizationDictionary(tokens, operations);
Detokenizer detokenizer = new DictionaryDetokenizer(dict);
- DetokenizationOperation detokenizeOperations[] =
+ DetokenizationOperation[] detokenizeOperations =
detokenizer.detokenize(new String[]{"Simple", "test", ".", "co", "-", "worker"});
Assert.assertEquals(DetokenizationOperation.NO_OPERATION, detokenizeOperations[0]);
@@ -71,7 +71,7 @@ public class DictionaryDetokenizerTest {
Detokenizer detokenizer = createLatinDetokenizer();
- String tokens[] = new String[]{"A", "test", ",", "(", "string", ")", "."};
+ String[] tokens = new String[]{"A", "test", ",", "(", "string", ")", "."};
String sentence = detokenizer.detokenize(tokens, null);
@@ -83,7 +83,7 @@ public class DictionaryDetokenizerTest {
Detokenizer detokenizer = createLatinDetokenizer();
- String tokens[] = new String[]{"A", "co", "-", "worker", "helped", "."};
+ String[] tokens = new String[]{"A", "co", "-", "worker", "helped", "."};
String sentence = detokenizer.detokenize(tokens, null);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java
index 9ea82bb..84f5f10 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java
@@ -45,7 +45,7 @@ public class TokenSampleStreamTest {
TokenSample tokenSample = sampleTokenStream.read();
- Span tokenSpans[] = tokenSample.getTokenSpans();
+ Span[] tokenSpans = tokenSample.getTokenSpans();
Assert.assertEquals(4, tokenSpans.length);
@@ -69,7 +69,7 @@ public class TokenSampleStreamTest {
TokenSample tokenSample = sampleTokenStream.read();
- Span tokenSpans[] = tokenSample.getTokenSpans();
+ Span[] tokenSpans = tokenSample.getTokenSpans();
Assert.assertEquals(4, tokenSpans.length);
@@ -101,7 +101,7 @@ public class TokenSampleStreamTest {
TokenSample tokenSample = sampleTokenStream.read();
- Span tokenSpans[] = tokenSample.getTokenSpans();
+ Span[] tokenSpans = tokenSample.getTokenSpans();
Assert.assertEquals(5, tokenSpans.length);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java
index 81f3507..1c329bc 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java
@@ -45,7 +45,7 @@ public class TokenSampleTest {
Detokenizer detokenizer = DictionaryDetokenizerTest.createLatinDetokenizer();
- String tokens[] = new String[]{
+ String[] tokens = new String[]{
"start",
"(", // move right
")", // move left
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerMETest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerMETest.java b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerMETest.java
index 9acb2e8..5a7a811 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerMETest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerMETest.java
@@ -40,7 +40,7 @@ public class TokenizerMETest {
TokenizerME tokenizer = new TokenizerME(model);
- String tokens[] = tokenizer.tokenize("test,");
+ String[] tokens = tokenizer.tokenize("test,");
Assert.assertEquals(2, tokens.length);
Assert.assertEquals("test", tokens[0]);
@@ -52,7 +52,7 @@ public class TokenizerMETest {
TokenizerModel model = TokenizerTestUtil.createMaxentTokenModel();
TokenizerME tokenizer = new TokenizerME(model);
- String tokens[] = tokenizer.tokenize("Sounds like it's not properly thought through!");
+ String[] tokens = tokenizer.tokenize("Sounds like it's not properly thought through!");
Assert.assertEquals(9, tokens.length);
Assert.assertEquals("Sounds", tokens[0]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/util/eval/FMeasureTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/eval/FMeasureTest.java b/opennlp-tools/src/test/java/opennlp/tools/util/eval/FMeasureTest.java
index b57b0ec..09e2f44 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/eval/FMeasureTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/eval/FMeasureTest.java
@@ -29,7 +29,7 @@ public class FMeasureTest {
private static final double DELTA = 1.0E-9d;
- private Span gold[] = {
+ private Span[] gold = {
new Span(8, 9),
new Span(9, 10),
new Span(10, 12),
@@ -38,7 +38,7 @@ public class FMeasureTest {
new Span(15, 16)
};
- private Span predicted[] = {
+ private Span[] predicted = {
new Span(14, 15),
new Span(15, 16),
new Span(100, 120),
@@ -46,7 +46,7 @@ public class FMeasureTest {
new Span(220, 230)
};
- private Span predictedCompletelyDistinct[] = {
+ private Span[] predictedCompletelyDistinct = {
new Span(100, 120),
new Span(210, 220),
new Span(211, 220),
@@ -54,7 +54,7 @@ public class FMeasureTest {
new Span(220, 230)
};
- private Span goldToMerge[] = {
+ private Span[] goldToMerge = {
new Span(8, 9),
new Span(9, 10),
new Span(11, 11),
@@ -64,7 +64,7 @@ public class FMeasureTest {
new Span(18, 19),
};
- private Span predictedToMerge[] = {
+ private Span[] predictedToMerge = {
new Span(8, 9),
new Span(14, 15),
new Span(15, 16),
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/CachedFeatureGeneratorTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/CachedFeatureGeneratorTest.java b/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/CachedFeatureGeneratorTest.java
index 01b1d95..66471ff 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/CachedFeatureGeneratorTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/CachedFeatureGeneratorTest.java
@@ -29,12 +29,12 @@ import org.junit.Test;
*/
public class CachedFeatureGeneratorTest {
- private AdaptiveFeatureGenerator identityGenerator[] = new AdaptiveFeatureGenerator[] {
+ private AdaptiveFeatureGenerator[] identityGenerator = new AdaptiveFeatureGenerator[] {
new IdentityFeatureGenerator()};
- private String testSentence1[];
+ private String[] testSentence1;
- private String testSentence2[];
+ private String[] testSentence2;
private List<String> features;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/PreviousMapFeatureGeneratorTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/PreviousMapFeatureGeneratorTest.java b/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/PreviousMapFeatureGeneratorTest.java
index c9da178..ca23589 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/PreviousMapFeatureGeneratorTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/featuregen/PreviousMapFeatureGeneratorTest.java
@@ -33,7 +33,7 @@ public class PreviousMapFeatureGeneratorTest {
AdaptiveFeatureGenerator fg = new PreviousMapFeatureGenerator();
- String sentence[] = new String[] {"a", "b", "c"};
+ String[] sentence = new String[] {"a", "b", "c"};
List<String> features = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/chunker/Chunker.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/chunker/Chunker.java b/opennlp-uima/src/main/java/opennlp/uima/chunker/Chunker.java
index a60ac9b..2edaba7 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/chunker/Chunker.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/chunker/Chunker.java
@@ -150,7 +150,7 @@ public final class Chunker extends CasAnnotator_ImplBase {
context, mTokenType, UimaUtil.POS_FEATURE_PARAMETER, CAS.TYPE_NAME_STRING);
}
- private void addChunkAnnotation(CAS tcas, AnnotationFS tokenAnnotations[],
+ private void addChunkAnnotation(CAS tcas, AnnotationFS[] tokenAnnotations,
String tag, int start, int end) {
AnnotationFS chunk = tcas.createAnnotation(mChunkType,
tokenAnnotations[start].getBegin(), tokenAnnotations[end - 1].getEnd());
@@ -167,9 +167,9 @@ public final class Chunker extends CasAnnotator_ImplBase {
FSIndex<AnnotationFS> tokenAnnotationIndex = tcas.getAnnotationIndex(mTokenType);
- String tokens[] = new String[tokenAnnotationIndex.size()];
- String pos[] = new String[tokenAnnotationIndex.size()];
- AnnotationFS tokenAnnotations[] = new AnnotationFS[tokenAnnotationIndex
+ String[] tokens = new String[tokenAnnotationIndex.size()];
+ String[] pos = new String[tokenAnnotationIndex.size()];
+ AnnotationFS[] tokenAnnotations = new AnnotationFS[tokenAnnotationIndex
.size()];
int index = 0;
@@ -184,7 +184,7 @@ public final class Chunker extends CasAnnotator_ImplBase {
mPosFeature);
}
- String result[] = mChunker.chunk(tokens, pos);
+ String[] result = mChunker.chunk(tokens, pos);
int start = -1;
int end = -1;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/doccat/AbstractDocumentCategorizer.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/doccat/AbstractDocumentCategorizer.java b/opennlp-uima/src/main/java/opennlp/uima/doccat/AbstractDocumentCategorizer.java
index 6d76c8f..db9c075 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/doccat/AbstractDocumentCategorizer.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/doccat/AbstractDocumentCategorizer.java
@@ -82,7 +82,7 @@ abstract class AbstractDocumentCategorizer extends CasAnnotator_ImplBase {
public void process(CAS cas) {
- double result[];
+ double[] result;
if (mTokenType != null) {
// TODO:
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java b/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java
index 793da86..67efb55 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/namefind/AbstractNameFinder.java
@@ -134,7 +134,7 @@ abstract class AbstractNameFinder extends CasAnnotator_ImplBase {
}
}
- protected void postProcessAnnotations(Span detectedNames[],
+ protected void postProcessAnnotations(Span[] detectedNames,
AnnotationFS[] nameAnnotations) {
}
@@ -186,7 +186,7 @@ abstract class AbstractNameFinder extends CasAnnotator_ImplBase {
Span[] names = find(cas,
sentenceTokenList.toArray(new String[sentenceTokenList.size()]));
- AnnotationFS nameAnnotations[] = new AnnotationFS[names.length];
+ AnnotationFS[] nameAnnotations = new AnnotationFS[names.length];
for (int i = 0; i < names.length; i++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/namefind/NameFinder.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/namefind/NameFinder.java b/opennlp-uima/src/main/java/opennlp/uima/namefind/NameFinder.java
index e89d2d6..2a844cf 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/namefind/NameFinder.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/namefind/NameFinder.java
@@ -154,9 +154,9 @@ public final class NameFinder extends AbstractNameFinder {
protected Span[] find(CAS cas, String[] tokens) {
- Span names[] = mNameFinder.find(tokens);
+ Span[] names = mNameFinder.find(tokens);
- double probs[] = mNameFinder.probs();
+ double[] probs = mNameFinder.probs();
for (double prob : probs) {
documentConfidence.add(prob);
@@ -165,7 +165,7 @@ public final class NameFinder extends AbstractNameFinder {
return names;
}
- protected void postProcessAnnotations(Span detectedNames[],
+ protected void postProcessAnnotations(Span[] detectedNames,
AnnotationFS[] nameAnnotations) {
if (probabilityFeature != null) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java b/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java
index 8e8920f..e3544b1 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/normalizer/NumberUtil.java
@@ -36,7 +36,7 @@ public final class NumberUtil {
public static boolean isLanguageSupported(String languageCode) {
Locale locale = new Locale(languageCode);
- Locale possibleLocales[] = NumberFormat.getAvailableLocales();
+ Locale[] possibleLocales = NumberFormat.getAvailableLocales();
boolean isLocaleSupported = false;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java b/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java
index 01c25c3..d147259 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/parser/Parser.java
@@ -199,8 +199,8 @@ public class Parser extends CasAnnotator_ImplBase {
protected AnnotationFS createAnnotation(CAS cas, int offset, Parse parse) {
- Parse parseChildren[] = parse.getChildren();
- AnnotationFS parseChildAnnotations[] = new AnnotationFS[parseChildren.length];
+ Parse[] parseChildren = parse.getChildren();
+ AnnotationFS[] parseChildAnnotations = new AnnotationFS[parseChildren.length];
// do this for all children
for (int i = 0; i < parseChildren.length; i++) {
@@ -244,13 +244,13 @@ public class Parser extends CasAnnotator_ImplBase {
* @param sentence
* @param tokens
*/
- public ParseConverter(String sentence, Span tokens[]) {
+ public ParseConverter(String sentence, Span[] tokens) {
mSentence = sentence;
StringBuilder sentenceStringBuilder = new StringBuilder();
- String tokenList[] = new String[tokens.length];
+ String[] tokenList = new String[tokens.length];
for (int i = 0; i < tokens.length; i++) {
String tokenString = tokens[i].getCoveredText(sentence).toString();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/postag/POSTagger.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/postag/POSTagger.java b/opennlp-uima/src/main/java/opennlp/uima/postag/POSTagger.java
index d26c64a..db0f66d 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/postag/POSTagger.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/postag/POSTagger.java
@@ -180,7 +180,7 @@ public final class POSTagger extends CasAnnotator_ImplBase {
final List<String> posTags = Arrays.asList(this.posTagger.tag(
sentenceTokenList.toArray(new String[sentenceTokenList.size()])));
- double posProbabilities[] = null;
+ double[] posProbabilities = null;
if (this.probabilityFeature != null) {
posProbabilities = this.posTagger.probs();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/sentdetect/AbstractSentenceDetector.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/sentdetect/AbstractSentenceDetector.java b/opennlp-uima/src/main/java/opennlp/uima/sentdetect/AbstractSentenceDetector.java
index a905199..ab9095a 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/sentdetect/AbstractSentenceDetector.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/sentdetect/AbstractSentenceDetector.java
@@ -87,7 +87,7 @@ public abstract class AbstractSentenceDetector extends CasAnnotator_ImplBase {
protected abstract Span[] detectSentences(String text);
- protected void postProcessAnnotations(AnnotationFS sentences[]) {
+ protected void postProcessAnnotations(AnnotationFS[] sentences) {
}
@Override
@@ -106,7 +106,7 @@ public abstract class AbstractSentenceDetector extends CasAnnotator_ImplBase {
Span[] sentPositions = detectSentences(text);
- AnnotationFS sentences[] = new AnnotationFS[sentPositions.length];
+ AnnotationFS[] sentences = new AnnotationFS[sentPositions.length];
for (int i = 0; i < sentPositions.length; i++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/sentdetect/SentenceDetector.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/sentdetect/SentenceDetector.java b/opennlp-uima/src/main/java/opennlp/uima/sentdetect/SentenceDetector.java
index fdb434d..acb5c6b 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/sentdetect/SentenceDetector.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/sentdetect/SentenceDetector.java
@@ -114,10 +114,10 @@ public final class SentenceDetector extends AbstractSentenceDetector {
}
@Override
- protected void postProcessAnnotations(AnnotationFS sentences[]) {
+ protected void postProcessAnnotations(AnnotationFS[] sentences) {
if (probabilityFeature != null) {
- double sentenceProbabilities[] = sentenceDetector.getSentenceProbabilities();
+ double[] sentenceProbabilities = sentenceDetector.getSentenceProbabilities();
for (int i = 0; i < sentences.length; i++) {
sentences[i].setDoubleValue(probabilityFeature, sentenceProbabilities[i]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/tokenize/AbstractTokenizer.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/tokenize/AbstractTokenizer.java b/opennlp-uima/src/main/java/opennlp/uima/tokenize/AbstractTokenizer.java
index ee02dc9..b1f7abc 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/tokenize/AbstractTokenizer.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/tokenize/AbstractTokenizer.java
@@ -91,8 +91,8 @@ public abstract class AbstractTokenizer extends CasAnnotator_ImplBase {
UimaUtil.TOKEN_TYPE_PARAMETER);
}
- protected void postProcessAnnotations(Span tokens[],
- AnnotationFS tokenAnnotations[]) {
+ protected void postProcessAnnotations(Span[] tokens,
+ AnnotationFS[] tokenAnnotations) {
}
protected abstract Span[] tokenize(CAS cas, AnnotationFS sentence);
@@ -107,13 +107,13 @@ public abstract class AbstractTokenizer extends CasAnnotator_ImplBase {
UimaUtil.removeAnnotations(cas, sentence, tokenType);
}
- Span tokenSpans[] = tokenize(cas, sentence);
+ Span[] tokenSpans = tokenize(cas, sentence);
int sentenceOffset = sentence.getBegin();
StringBuilder tokeninzedSentenceLog = new StringBuilder();
- AnnotationFS tokenAnnotations[] = new AnnotationFS[tokenSpans.length];
+ AnnotationFS[] tokenAnnotations = new AnnotationFS[tokenSpans.length];
for (int i = 0; i < tokenSpans.length; i++) {
tokenAnnotations[i] = cas
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/tokenize/Tokenizer.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/tokenize/Tokenizer.java b/opennlp-uima/src/main/java/opennlp/uima/tokenize/Tokenizer.java
index 9f72f92..b558241 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/tokenize/Tokenizer.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/tokenize/Tokenizer.java
@@ -123,7 +123,7 @@ public final class Tokenizer extends AbstractTokenizer {
AnnotationFS[] tokenAnnotations) {
// if interest
if (probabilityFeature != null) {
- double tokenProbabilties[] = tokenizer.getTokenProbabilities();
+ double[] tokenProbabilties = tokenizer.getTokenProbabilities();
for (int i = 0; i < tokenAnnotations.length; i++) {
tokenAnnotations[i].setDoubleValue(probabilityFeature,
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java
----------------------------------------------------------------------
diff --git a/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java b/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java
index 338dfec..ecec498 100644
--- a/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java
+++ b/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java
@@ -61,7 +61,7 @@ final public class OpennlpUtil {
try (InputStream in = new FileInputStream(inFile)) {
- byte buffer[] = new byte[1024];
+ byte[] buffer = new byte[1024];
int len;
while ((len = in.read(buffer)) > 0) {
bytes.write(buffer, 0, len);
[2/2] opennlp git commit: OPENNLP-990 Fix all array style violations
and add a checkstyle rule
Posted by jo...@apache.org.
OPENNLP-990 Fix all array style violations and add a checkstyle rule
This closes #127
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/bbd6d3fc
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/bbd6d3fc
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/bbd6d3fc
Branch: refs/heads/master
Commit: bbd6d3fc4178d9209e3e53868ce4ec9b74679f3b
Parents: b7d3abc
Author: Peter Thygesen <pe...@gmail.com>
Authored: Thu Feb 16 12:48:12 2017 +0100
Committer: J�rn Kottmann <jo...@apache.org>
Committed: Thu Feb 16 13:03:36 2017 +0100
----------------------------------------------------------------------
checkstyle.xml | 1 +
.../opennlp/bratann/NameFinderAnnService.java | 2 +-
.../opennlp/bratann/NameFinderResource.java | 6 ++---
.../java/opennlp/morfologik/cmdline/CLI.java | 2 +-
.../chunker/ChunkSampleSequenceStream.java | 4 +--
.../java/opennlp/tools/chunker/Chunker.java | 4 +--
.../tools/cmdline/AbstractConverterTool.java | 2 +-
.../opennlp/tools/cmdline/ArgumentParser.java | 16 +++++------
.../opennlp/tools/cmdline/BasicCmdLineTool.java | 2 +-
.../main/java/opennlp/tools/cmdline/CLI.java | 2 +-
.../java/opennlp/tools/cmdline/CmdLineUtil.java | 10 +++----
.../tools/cmdline/EvaluationErrorPrinter.java | 10 +++----
.../cmdline/FineGrainedReportListener.java | 2 +-
.../tools/cmdline/ObjectStreamFactory.java | 2 +-
.../opennlp/tools/cmdline/TypedCmdLineTool.java | 2 +-
.../tools/cmdline/doccat/DoccatTool.java | 2 +-
.../cmdline/entitylinker/EntityLinkerTool.java | 2 +-
.../TokenNameFinderCrossValidatorTool.java | 4 +--
.../namefind/TokenNameFinderEvaluatorTool.java | 2 +-
.../cmdline/namefind/TokenNameFinderTool.java | 6 ++---
.../namefind/TokenNameFinderTrainerTool.java | 8 +++---
.../tools/cmdline/postag/POSTaggerTool.java | 2 +-
.../tokenizer/DictionaryDetokenizerTool.java | 2 +-
.../opennlp/tools/dictionary/Dictionary.java | 2 +-
.../tools/doccat/DocumentCategorizer.java | 6 ++---
.../DocumentCategorizerContextGenerator.java | 2 +-
.../doccat/DocumentCategorizerEvaluator.java | 4 +--
.../tools/doccat/DocumentCategorizerME.java | 4 +--
.../opennlp/tools/doccat/DocumentSample.java | 4 +--
.../tools/doccat/DocumentSampleStream.java | 4 +--
.../formats/BioNLP2004NameSampleStream.java | 2 +-
.../tools/formats/Conll02NameSampleStream.java | 2 +-
.../tools/formats/Conll03NameSampleStream.java | 2 +-
.../tools/formats/ConllXPOSSampleStream.java | 2 +-
.../tools/formats/DirectorySampleStream.java | 4 +--
.../tools/formats/EvalitaNameSampleStream.java | 2 +-
.../formats/LeipzigDoccatSampleStream.java | 2 +-
.../LeipzigDocumentSampleStreamFactory.java | 4 +--
.../formats/brat/BratAnnotationStream.java | 10 +++----
.../tools/formats/brat/BratDocument.java | 2 +-
.../formats/brat/BratNameSampleStream.java | 2 +-
.../convert/FileToByteArraySampleStream.java | 2 +-
.../convert/FileToStringSampleStream.java | 2 +-
.../formats/muc/MucNameContentHandler.java | 2 +-
.../ontonotes/OntoNotesNameSampleStream.java | 2 +-
.../lemmatizer/LemmaSampleSequenceStream.java | 6 ++---
.../opennlp/tools/lemmatizer/Lemmatizer.java | 2 +-
.../main/java/opennlp/tools/ml/BeamSearch.java | 4 +--
.../java/opennlp/tools/ml/maxent/GISModel.java | 2 +-
.../opennlp/tools/ml/model/MaxentModel.java | 2 +-
.../SimplePerceptronSequenceTrainer.java | 4 +--
.../java/opennlp/tools/namefind/BioCodec.java | 2 +-
.../namefind/DefaultNameContextGenerator.java | 4 +--
.../tools/namefind/DictionaryNameFinder.java | 2 +-
.../tools/namefind/NameFinderEventStream.java | 2 +-
.../opennlp/tools/namefind/NameFinderME.java | 2 +-
.../java/opennlp/tools/namefind/NameSample.java | 2 +-
.../namefind/NameSampleSequenceStream.java | 4 +--
.../opennlp/tools/namefind/RegexNameFinder.java | 8 +++---
.../opennlp/tools/namefind/TokenNameFinder.java | 2 +-
.../namefind/TokenNameFinderCrossValidator.java | 4 +--
.../namefind/TokenNameFinderEvaluator.java | 4 +--
.../tools/namefind/TokenNameFinderFactory.java | 2 +-
.../tools/namefind/TokenNameFinderModel.java | 2 +-
.../tools/parser/AbstractBottomUpParser.java | 6 ++---
.../tools/parser/ChunkContextGenerator.java | 2 +-
.../tools/parser/ParserChunkerFactory.java | 2 +-
.../parser/ParserChunkerSequenceValidator.java | 2 +-
.../opennlp/tools/parser/PosSampleStream.java | 4 +--
.../opennlp/tools/postag/POSDictionary.java | 2 +-
.../java/opennlp/tools/postag/POSEvaluator.java | 4 +--
.../java/opennlp/tools/postag/POSSample.java | 10 +++----
.../tools/postag/POSSampleEventStream.java | 6 ++---
.../tools/postag/POSSampleSequenceStream.java | 4 +--
.../sentdetect/DefaultEndOfSentenceScanner.java | 4 +--
.../sentdetect/SentenceDetectorEvaluator.java | 6 ++---
.../tools/sentdetect/SentenceDetectorME.java | 2 +-
.../tools/sentdetect/SentenceSample.java | 2 +-
.../tokenize/DetokenizationDictionary.java | 4 +--
.../opennlp/tools/tokenize/Detokenizer.java | 4 +--
.../tools/tokenize/DictionaryDetokenizer.java | 6 ++---
.../tools/tokenize/TokSpanEventStream.java | 2 +-
.../opennlp/tools/tokenize/TokenSample.java | 6 ++---
.../tools/tokenize/TokenizerEvaluator.java | 2 +-
.../opennlp/tools/tokenize/TokenizerStream.java | 2 +-
.../java/opennlp/tools/util/SequenceCodec.java | 2 +-
.../java/opennlp/tools/util/StringList.java | 2 +-
.../java/opennlp/tools/util/StringUtil.java | 4 +--
.../DocumentBeginFeatureGenerator.java | 2 +-
.../tools/util/featuregen/InSpanGenerator.java | 4 +--
.../util/featuregen/WordClusterDictionary.java | 2 +-
.../opennlp/tools/util/model/ModelUtil.java | 2 +-
.../opennlp/tools/chunker/ChunkerMETest.java | 2 +-
.../tools/cmdline/ArgumentParserTest.java | 6 ++---
.../tools/doccat/DocumentCategorizerMETest.java | 4 +--
.../tools/doccat/DocumentCategorizerNBTest.java | 4 +--
.../formats/ConllXPOSSampleStreamTest.java | 8 +++---
.../ConstitParseSampleStreamTest.java | 4 +--
.../java/opennlp/tools/ml/BeamSearchTest.java | 22 +++++++--------
.../namefind/DictionaryNameFinderTest.java | 28 ++++++++++----------
.../tools/namefind/NameFinderMETest.java | 12 ++++-----
.../opennlp/tools/namefind/NameSampleTest.java | 2 +-
.../tools/namefind/RegexNameFinderTest.java | 6 ++---
.../java/opennlp/tools/parser/ParseTest.java | 2 +-
.../opennlp/tools/postag/POSTaggerMETest.java | 2 +-
.../tools/postag/WordTagSampleStreamTest.java | 4 +--
.../sentdetect/NewlineSentenceDetectorTest.java | 2 +-
.../sentdetect/SentenceDetectorMETest.java | 2 +-
.../tokenize/DictionaryDetokenizerTest.java | 10 +++----
.../tools/tokenize/TokenSampleStreamTest.java | 6 ++---
.../opennlp/tools/tokenize/TokenSampleTest.java | 2 +-
.../opennlp/tools/tokenize/TokenizerMETest.java | 4 +--
.../opennlp/tools/util/eval/FMeasureTest.java | 10 +++----
.../featuregen/CachedFeatureGeneratorTest.java | 6 ++---
.../PreviousMapFeatureGeneratorTest.java | 2 +-
.../main/java/opennlp/uima/chunker/Chunker.java | 10 +++----
.../doccat/AbstractDocumentCategorizer.java | 2 +-
.../uima/namefind/AbstractNameFinder.java | 4 +--
.../java/opennlp/uima/namefind/NameFinder.java | 6 ++---
.../opennlp/uima/normalizer/NumberUtil.java | 2 +-
.../main/java/opennlp/uima/parser/Parser.java | 8 +++---
.../java/opennlp/uima/postag/POSTagger.java | 2 +-
.../sentdetect/AbstractSentenceDetector.java | 4 +--
.../uima/sentdetect/SentenceDetector.java | 4 +--
.../uima/tokenize/AbstractTokenizer.java | 8 +++---
.../java/opennlp/uima/tokenize/Tokenizer.java | 2 +-
.../java/opennlp/uima/util/OpennlpUtil.java | 2 +-
127 files changed, 264 insertions(+), 263 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle.xml b/checkstyle.xml
index ab65feb..1bfe788 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -126,5 +126,6 @@
value="STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STATIC"/>
</module>
<module name="EqualsHashCode"/>
+ <module name="ArrayTypeStyle"/>
</module>
</module>
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java
----------------------------------------------------------------------
diff --git a/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java b/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java
index 5519866..a6085e7 100644
--- a/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java
+++ b/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderAnnService.java
@@ -44,7 +44,7 @@ public class NameFinderAnnService {
public static SentenceDetector sentenceDetector = new NewlineSentenceDetector();
public static Tokenizer tokenizer = WhitespaceTokenizer.INSTANCE;
- public static TokenNameFinder nameFinders[];
+ public static TokenNameFinder[] nameFinders;
public static void main(String[] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderResource.java
----------------------------------------------------------------------
diff --git a/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderResource.java b/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderResource.java
index bd19bca..468f898 100644
--- a/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderResource.java
+++ b/opennlp-brat-annotator/src/main/java/opennlp/bratann/NameFinderResource.java
@@ -39,7 +39,7 @@ public class NameFinderResource {
private SentenceDetector sentDetect = NameFinderAnnService.sentenceDetector;
private Tokenizer tokenizer = NameFinderAnnService.tokenizer;
- private TokenNameFinder nameFinders[] = NameFinderAnnService.nameFinders;
+ private TokenNameFinder[] nameFinders = NameFinderAnnService.nameFinders;
private static int findNextNonWhitespaceChar(CharSequence s, int beginOffset, int endOffset) {
for (int i = beginOffset; i < endOffset; i++) {
@@ -66,10 +66,10 @@ public class NameFinderResource {
// offset of sentence gets lost here!
Span[] tokenSpans = tokenizer.tokenizePos(sentenceText);
- String tokens[] = Span.spansToStrings(tokenSpans, sentenceText);
+ String[] tokens = Span.spansToStrings(tokenSpans, sentenceText);
for (TokenNameFinder nameFinder : nameFinders) {
- Span names[] = nameFinder.find(tokens);
+ Span[] names = nameFinder.find(tokens);
for (Span name : names) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-morfologik-addon/src/main/java/opennlp/morfologik/cmdline/CLI.java
----------------------------------------------------------------------
diff --git a/opennlp-morfologik-addon/src/main/java/opennlp/morfologik/cmdline/CLI.java b/opennlp-morfologik-addon/src/main/java/opennlp/morfologik/cmdline/CLI.java
index d659435..664c03a 100644
--- a/opennlp-morfologik-addon/src/main/java/opennlp/morfologik/cmdline/CLI.java
+++ b/opennlp-morfologik-addon/src/main/java/opennlp/morfologik/cmdline/CLI.java
@@ -101,7 +101,7 @@ public final class CLI {
System.exit(0);
}
- String toolArguments[] = new String[args.length - 1];
+ String[] toolArguments = new String[args.length - 1];
System.arraycopy(args, 1, toolArguments, 0, toolArguments.length);
String toolName = args[0];
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleSequenceStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleSequenceStream.java b/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleSequenceStream.java
index 9898bd4..eb42aa9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleSequenceStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkSampleSequenceStream.java
@@ -41,8 +41,8 @@ public class ChunkSampleSequenceStream implements SequenceStream {
ChunkSample sample = samples.read();
if (sample != null) {
- String sentence[] = sample.getSentence();
- String tags[] = sample.getTags();
+ String[] sentence = sample.getSentence();
+ String[] tags = sample.getTags();
Event[] events = new Event[sentence.length];
for (int i = 0; i < sentence.length; i++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/chunker/Chunker.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/chunker/Chunker.java b/opennlp-tools/src/main/java/opennlp/tools/chunker/Chunker.java
index c496d12..5bdec75 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/chunker/Chunker.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/chunker/Chunker.java
@@ -33,7 +33,7 @@ public interface Chunker {
*
* @return an array of chunk tags for each token in the sequence.
*/
- String[] chunk(String[] toks, String tags[]);
+ String[] chunk(String[] toks, String[] tags);
/**
* Generates tagged chunk spans for the given sequence returning the result in a span array.
@@ -43,7 +43,7 @@ public interface Chunker {
*
* @return an array of spans with chunk tags for each chunk in the sequence.
*/
- Span[] chunkAsSpans(String[] toks, String tags[]);
+ Span[] chunkAsSpans(String[] toks, String[] tags);
/**
* Returns the top k chunk sequences for the specified sentence with the specified pos-tags
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
index a6b81ea..4c95b75 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/AbstractConverterTool.java
@@ -89,7 +89,7 @@ public abstract class AbstractConverterTool<T> extends TypedCmdLineTool<T> {
format = args[0];
ObjectStreamFactory<T> streamFactory = getStreamFactory(format);
- String formatArgs[] = new String[args.length - 1];
+ String[] formatArgs = new String[args.length - 1];
System.arraycopy(args, 1, formatArgs, 0, formatArgs.length);
String helpString = createHelpString(format, ArgumentParser.createUsage(streamFactory.getParameters()));
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
index 631bc34..8243560 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/ArgumentParser.java
@@ -169,7 +169,7 @@ public class ArgumentParser {
// all checks should also be performed for super interfaces
- Method methods[] = proxyInterface.getMethods();
+ Method[] methods = proxyInterface.getMethods();
if (methods.length == 0)
throw new IllegalArgumentException("proxy interface must at least declare one method!");
@@ -204,7 +204,7 @@ public class ArgumentParser {
private static String methodNameToParameter(String methodName) {
// remove get from method name
- char parameterNameChars[] = methodName.toCharArray();
+ char[] parameterNameChars = methodName.toCharArray();
// name length is checked to be at least 4 prior
parameterNameChars[3] = Character.toLowerCase(parameterNameChars[3]);
@@ -385,7 +385,7 @@ public class ArgumentParser {
* @return true, if arguments are valid
*/
@SuppressWarnings({"unchecked"})
- public static <T> boolean validateArguments(String args[], Class<T> argProxyInterface) {
+ public static <T> boolean validateArguments(String[] args, Class<T> argProxyInterface) {
return validateArguments(args, new Class[]{argProxyInterface});
}
@@ -398,7 +398,7 @@ public class ArgumentParser {
* @param argProxyInterfaces interfaces with parameters description
* @return true, if arguments are valid
*/
- public static boolean validateArguments(String args[], Class<?>... argProxyInterfaces) {
+ public static boolean validateArguments(String[] args, Class<?>... argProxyInterfaces) {
return null == validateArgumentsLoudly(args, argProxyInterfaces);
}
@@ -409,7 +409,7 @@ public class ArgumentParser {
* @param argProxyInterface interface with parameters description
* @return null, if arguments are valid or error message otherwise
*/
- public static String validateArgumentsLoudly(String args[], Class<?> argProxyInterface) {
+ public static String validateArgumentsLoudly(String[] args, Class<?> argProxyInterface) {
return validateArgumentsLoudly(args, new Class[]{argProxyInterface});
}
@@ -420,7 +420,7 @@ public class ArgumentParser {
* @param argProxyInterfaces interfaces with parameters description
* @return null, if arguments are valid or error message otherwise
*/
- public static String validateArgumentsLoudly(String args[], Class<?>... argProxyInterfaces) {
+ public static String validateArgumentsLoudly(String[] args, Class<?>... argProxyInterfaces) {
// number of parameters must be always be even
if (args.length % 2 != 0) {
return "Number of parameters must be always be even";
@@ -478,7 +478,7 @@ public class ArgumentParser {
* if the proxy interface is not compatible.
*/
@SuppressWarnings("unchecked")
- public static <T> T parse(String args[], Class<T> argProxyInterface) {
+ public static <T> T parse(String[] args, Class<T> argProxyInterface) {
checkProxyInterfaces(argProxyInterface);
@@ -533,7 +533,7 @@ public class ArgumentParser {
* @param <T> T
* @return arguments pertaining to argProxyInterface
*/
- public static <T> String[] filter(String args[], Class<T> argProxyInterface) {
+ public static <T> String[] filter(String[] args, Class<T> argProxyInterface) {
ArrayList<String> parameters = new ArrayList<>(args.length);
for (Method method : argProxyInterface.getMethods()) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCmdLineTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCmdLineTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCmdLineTool.java
index abe73b4..f320986 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCmdLineTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/BasicCmdLineTool.java
@@ -29,5 +29,5 @@ public abstract class BasicCmdLineTool extends CmdLineTool {
*
* @param args arguments
*/
- public abstract void run(String args[]);
+ public abstract void run(String[] args);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java
index 9385a18..b575f71 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/CLI.java
@@ -210,7 +210,7 @@ public final class CLI {
}
final long startTime = System.currentTimeMillis();
- String toolArguments[] = new String[args.length - 1];
+ String[] toolArguments = new String[args.length - 1];
System.arraycopy(args, 1, toolArguments, 0, toolArguments.length);
String toolName = args[0];
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
index 7ea2a0b..1dfd7bd 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
@@ -204,7 +204,7 @@ public final class CmdLineUtil {
* @param args arguments
* @return the index of the parameter in the arguments, or -1 if the parameter is not found
*/
- public static int getParameterIndex(String param, String args[]) {
+ public static int getParameterIndex(String param, String[] args) {
for (int i = 0; i < args.length; i++) {
if (args[i].startsWith("-") && args[i].equals(param)) {
return i;
@@ -221,7 +221,7 @@ public final class CmdLineUtil {
* @param args arguments
* @return parameter value
*/
- public static String getParameter(String param, String args[]) {
+ public static String getParameter(String param, String[] args) {
int i = getParameterIndex(param, args);
if (-1 < i) {
i++;
@@ -240,7 +240,7 @@ public final class CmdLineUtil {
* @param args arguments
* @return parameter value
*/
- public static Integer getIntParameter(String param, String args[]) {
+ public static Integer getIntParameter(String param, String[] args) {
String value = getParameter(param, args);
try {
@@ -261,7 +261,7 @@ public final class CmdLineUtil {
* @param args arguments
* @return parameter value
*/
- public static Double getDoubleParameter(String param, String args[]) {
+ public static Double getDoubleParameter(String param, String[] args) {
String value = getParameter(param, args);
try {
@@ -286,7 +286,7 @@ public final class CmdLineUtil {
}
}
- public static boolean containsParam(String param, String args[]) {
+ public static boolean containsParam(String param, String[] args) {
for (String arg : args) {
if (arg.equals(param)) {
return true;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/EvaluationErrorPrinter.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/EvaluationErrorPrinter.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/EvaluationErrorPrinter.java
index f8a0d91..8ae25e6 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/EvaluationErrorPrinter.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/EvaluationErrorPrinter.java
@@ -38,7 +38,7 @@ public abstract class EvaluationErrorPrinter<T> implements EvaluationMonitor<T>
}
// for the sentence detector
- protected void printError(Span references[], Span predictions[],
+ protected void printError(Span[] references, Span[] predictions,
T referenceSample, T predictedSample, String sentence) {
List<Span> falseNegatives = new ArrayList<>();
List<Span> falsePositives = new ArrayList<>();
@@ -55,7 +55,7 @@ public abstract class EvaluationErrorPrinter<T> implements EvaluationMonitor<T>
}
// for namefinder, chunker...
- protected void printError(String id, Span references[], Span predictions[],
+ protected void printError(String id, Span[] references, Span[] predictions,
T referenceSample, T predictedSample, String[] sentenceTokens) {
List<Span> falseNegatives = new ArrayList<>();
List<Span> falsePositives = new ArrayList<>();
@@ -75,13 +75,13 @@ public abstract class EvaluationErrorPrinter<T> implements EvaluationMonitor<T>
}
}
- protected void printError(Span references[], Span predictions[],
+ protected void printError(Span[] references, Span[] predictions,
T referenceSample, T predictedSample, String[] sentenceTokens) {
printError(null, references, predictions, referenceSample, predictedSample, sentenceTokens);
}
// for pos tagger
- protected void printError(String references[], String predictions[],
+ protected void printError(String[] references, String[] predictions,
T referenceSample, T predictedSample, String[] sentenceTokens) {
List<String> filteredDoc = new ArrayList<>();
List<String> filteredRefs = new ArrayList<>();
@@ -213,7 +213,7 @@ public abstract class EvaluationErrorPrinter<T> implements EvaluationMonitor<T>
* @param falsePositives
* [out] the false positives list
*/
- private void findErrors(Span references[], Span predictions[],
+ private void findErrors(Span[] references, Span[] predictions,
List<Span> falseNegatives, List<Span> falsePositives) {
falseNegatives.addAll(Arrays.asList(references));
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/FineGrainedReportListener.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/FineGrainedReportListener.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/FineGrainedReportListener.java
index 03ce489..714561a 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/FineGrainedReportListener.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/FineGrainedReportListener.java
@@ -60,7 +60,7 @@ public abstract class FineGrainedReportListener {
private static String generateAlphaLabel(int index) {
- char labelChars[] = new char[3];
+ char[] labelChars = new char[3];
int i;
for (i = 2; i >= 0; i--) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java
index 8bc6b95..4f48bbf 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/ObjectStreamFactory.java
@@ -36,5 +36,5 @@ public interface ObjectStreamFactory<T> {
* @param args arguments
* @return ObjectStream instance
*/
- ObjectStream<T> create(String args[]);
+ ObjectStream<T> create(String[] args);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/TypedCmdLineTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/TypedCmdLineTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/TypedCmdLineTool.java
index bf4b381..85ab2cb 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/TypedCmdLineTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/TypedCmdLineTool.java
@@ -116,7 +116,7 @@ public abstract class TypedCmdLineTool<T>
* @param format format to work with
* @param args command line arguments
*/
- public abstract void run(String format, String args[]);
+ public abstract void run(String format, String[] args);
/**
* Retrieves a description on how to use the tool.
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java
index 49a55d3..a01d354 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/doccat/DoccatTool.java
@@ -70,7 +70,7 @@ public class DoccatTool extends BasicCmdLineTool {
while ((document = documentStream.read()) != null) {
String[] tokens = model.getFactory().getTokenizer().tokenize(document);
- double prob[] = doccat.categorize(tokens);
+ double[] prob = doccat.categorize(tokens);
String category = doccat.getBestCategory(prob);
DocumentSample sample = new DocumentSample(category, tokens);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/entitylinker/EntityLinkerTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/entitylinker/EntityLinkerTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/entitylinker/EntityLinkerTool.java
index f248a2c..7f2d334 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/entitylinker/EntityLinkerTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/entitylinker/EntityLinkerTool.java
@@ -93,7 +93,7 @@ public class EntityLinkerTool extends BasicCmdLineTool {
// Run entity linker ... and output result ...
StringBuilder text = new StringBuilder();
- Span sentences[] = new Span[document.size()];
+ Span[] sentences = new Span[document.size()];
Span[][] tokensBySentence = new Span[document.size()][];
Span[][] namesBySentence = new Span[document.size()][];
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
index 153d6f7..0ee3738 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
@@ -68,14 +68,14 @@ public final class TokenNameFinderCrossValidatorTool
mlParams = new TrainingParameters();
}
- byte featureGeneratorBytes[] =
+ byte[] featureGeneratorBytes =
TokenNameFinderTrainerTool.openFeatureGeneratorBytes(params.getFeaturegen());
Map<String, Object> resources =
TokenNameFinderTrainerTool.loadResources(params.getResources(), params.getFeaturegen());
if (params.getNameTypes() != null) {
- String nameTypes[] = params.getNameTypes().split(",");
+ String[] nameTypes = params.getNameTypes().split(",");
sampleStream = new NameSampleTypeFilter(nameTypes, sampleStream);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
index d00e254..b3d5bba 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
@@ -96,7 +96,7 @@ public final class TokenNameFinderEvaluatorTool
}
if (params.getNameTypes() != null) {
- String nameTypes[] = params.getNameTypes().split(",");
+ String[] nameTypes = params.getNameTypes().split(",");
sampleStream = new NameSampleTypeFilter(nameTypes, sampleStream);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java
index 2476005..59b2f3a 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTool.java
@@ -53,7 +53,7 @@ public final class TokenNameFinderTool extends BasicCmdLineTool {
System.out.println(getHelp());
} else {
- NameFinderME nameFinders[] = new NameFinderME[args.length];
+ NameFinderME[] nameFinders = new NameFinderME[args.length];
for (int i = 0; i < nameFinders.length; i++) {
TokenNameFinderModel model = new TokenNameFinderModelLoader().load(new File(args[i]));
@@ -71,7 +71,7 @@ public final class TokenNameFinderTool extends BasicCmdLineTool {
new SystemInputStreamFactory(), SystemInputStreamFactory.encoding());
String line;
while ((line = untokenizedLineStream.read()) != null) {
- String whitespaceTokenizerLine[] = WhitespaceTokenizer.INSTANCE.tokenize(line);
+ String[] whitespaceTokenizerLine = WhitespaceTokenizer.INSTANCE.tokenize(line);
// A new line indicates a new document,
// adaptive data must be cleared for a new document
@@ -90,7 +90,7 @@ public final class TokenNameFinderTool extends BasicCmdLineTool {
// Simple way to drop intersecting spans, otherwise the
// NameSample is invalid
- Span reducedNames[] = NameFinderME.dropOverlappingSpans(
+ Span[] reducedNames = NameFinderME.dropOverlappingSpans(
names.toArray(new Span[names.size()]));
NameSample nameSample = new NameSample(whitespaceTokenizerLine,
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java
index fb73506..5bb18d2 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderTrainerTool.java
@@ -68,7 +68,7 @@ public final class TokenNameFinderTrainerTool
}
static byte[] openFeatureGeneratorBytes(File featureGenDescriptorFile) {
- byte featureGeneratorBytes[] = null;
+ byte[] featureGeneratorBytes = null;
// load descriptor file into memory
if (featureGenDescriptorFile != null) {
@@ -118,7 +118,7 @@ public final class TokenNameFinderTrainerTool
}
}
- File resourceFiles[] = resourcePath.listFiles();
+ File[] resourceFiles = resourcePath.listFiles();
for (File resourceFile : resourceFiles) {
String resourceName = resourceFile.getName();
@@ -172,7 +172,7 @@ public final class TokenNameFinderTrainerTool
File modelOutFile = params.getModel();
- byte featureGeneratorBytes[] = openFeatureGeneratorBytes(params.getFeaturegen());
+ byte[] featureGeneratorBytes = openFeatureGeneratorBytes(params.getFeaturegen());
// TODO: Support Custom resources:
@@ -184,7 +184,7 @@ public final class TokenNameFinderTrainerTool
CmdLineUtil.checkOutputFile("name finder model", modelOutFile);
if (params.getNameTypes() != null) {
- String nameTypes[] = params.getNameTypes().split(",");
+ String[] nameTypes = params.getNameTypes().split(",");
sampleStream = new NameSampleTypeFilter(nameTypes, sampleStream);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java
index dc93226..3f1959e 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTool.java
@@ -63,7 +63,7 @@ public final class POSTaggerTool extends BasicCmdLineTool {
String line;
while ((line = lineStream.read()) != null) {
- String whitespaceTokenizerLine[] = WhitespaceTokenizer.INSTANCE.tokenize(line);
+ String[] whitespaceTokenizerLine = WhitespaceTokenizer.INSTANCE.tokenize(line);
String[] tags = tagger.tag(whitespaceTokenizerLine);
POSSample sample = new POSSample(whitespaceTokenizerLine, tags);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/DictionaryDetokenizerTool.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/DictionaryDetokenizerTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/DictionaryDetokenizerTool.java
index 57176ae..30f408b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/DictionaryDetokenizerTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/DictionaryDetokenizerTool.java
@@ -58,7 +58,7 @@ public final class DictionaryDetokenizerTool extends BasicCmdLineTool {
while ((tokenizedLine = tokenizedLineStream.read()) != null) {
// white space tokenize line
- String tokens[] = WhitespaceTokenizer.INSTANCE.tokenize(tokenizedLine);
+ String[] tokens = WhitespaceTokenizer.INSTANCE.tokenize(tokenizedLine);
System.out.println(detokenizer.detokenize(tokens, null));
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java b/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java
index 3fd8986..10b9f37 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java
@@ -275,7 +275,7 @@ public class Dictionary implements Iterable<StringList>, SerializableArtifact {
while ((line = lineReader.readLine()) != null) {
StringTokenizer whiteSpaceTokenizer = new StringTokenizer(line, " ");
- String tokens[] = new String[whiteSpaceTokenizer.countTokens()];
+ String[] tokens = new String[whiteSpaceTokenizer.countTokens()];
if (tokens.length > 0) {
int tokenIndex = 0;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizer.java b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizer.java
index c8ad3c3..88bf8f9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizer.java
@@ -32,7 +32,7 @@ public interface DocumentCategorizer {
* @param text the tokens of text to categorize
* @return per category probabilities
*/
- double[] categorize(String text[]);
+ double[] categorize(String[] text);
/**
* Categorizes the given text, provided in separate tokens.
@@ -43,7 +43,7 @@ public interface DocumentCategorizer {
* @deprecated will be removed after 1.7.1 release. Don't use it.
*/
@Deprecated
- double[] categorize(String text[], Map<String, Object> extraInformation);
+ double[] categorize(String[] text, Map<String, Object> extraInformation);
/**
* get the best category from previously generated outcome probabilities
@@ -101,7 +101,7 @@ public interface DocumentCategorizer {
* @param results the probabilities of each category
* @return the name of the outcome
*/
- String getAllResults(double results[]);
+ String getAllResults(double[] results);
/**
* Returns a map in which the key is the category name and the value is the score
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerContextGenerator.java
index b1da3e3..e12f16b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerContextGenerator.java
@@ -32,7 +32,7 @@ class DocumentCategorizerContextGenerator {
mFeatureGenerators = featureGenerators;
}
- public String[] getContext(String text[], Map<String, Object> extraInformation) {
+ public String[] getContext(String[] text, Map<String, Object> extraInformation) {
Collection<String> context = new LinkedList<>();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEvaluator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEvaluator.java b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEvaluator.java
index d2307e3..63e0768 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEvaluator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEvaluator.java
@@ -57,9 +57,9 @@ public class DocumentCategorizerEvaluator extends Evaluator<DocumentSample> {
*/
public DocumentSample processSample(DocumentSample sample) {
- String document[] = sample.getText();
+ String[] document = sample.getText();
- double probs[] = categorizer.categorize(document, sample.getExtraInformation());
+ double[] probs = categorizer.categorize(document, sample.getExtraInformation());
String cat = categorizer.getBestCategory(probs);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java
index 33151d9..e743b9d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java
@@ -85,7 +85,7 @@ public class DocumentCategorizerME implements DocumentCategorizer {
* Categorizes the given text.
* @param text the text to categorize
*/
- public double[] categorize(String text[]) {
+ public double[] categorize(String[] text) {
return this.categorize(text, Collections.emptyMap());
}
@@ -225,7 +225,7 @@ public class DocumentCategorizerME implements DocumentCategorizer {
return model.getMaxentModel().getNumOutcomes();
}
- public String getAllResults(double results[]) {
+ public String getAllResults(double[] results) {
return model.getMaxentModel().getAllOutcomes(results);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSample.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSample.java b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSample.java
index f521738..3d107fa 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSample.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSample.java
@@ -39,11 +39,11 @@ public class DocumentSample {
this(category, WhitespaceTokenizer.INSTANCE.tokenize(text));
}
- public DocumentSample(String category, String text[]) {
+ public DocumentSample(String category, String[] text) {
this(category, text, null);
}
- public DocumentSample(String category, String text[], Map<String, Object> extraInformation) {
+ public DocumentSample(String category, String[] text, Map<String, Object> extraInformation) {
Objects.requireNonNull(text, "text must not be null");
this.category = Objects.requireNonNull(category, "category must not be null");
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java
index 13d9184..9054eb7 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentSampleStream.java
@@ -45,13 +45,13 @@ public class DocumentSampleStream extends FilterObjectStream<String, DocumentSam
if (sampleString != null) {
// Whitespace tokenize entire string
- String tokens[] = WhitespaceTokenizer.INSTANCE.tokenize(sampleString);
+ String[] tokens = WhitespaceTokenizer.INSTANCE.tokenize(sampleString);
DocumentSample sample;
if (tokens.length > 1) {
String category = tokens[0];
- String docTokens[] = new String[tokens.length - 1];
+ String[] docTokens = new String[tokens.length - 1];
System.arraycopy(tokens, 1, docTokens, 0, tokens.length - 1);
sample = new DocumentSample(category, docTokens);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStream.java
index b3ac623..ff4ad34 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/BioNLP2004NameSampleStream.java
@@ -87,7 +87,7 @@ public class BioNLP2004NameSampleStream implements ObjectStream<NameSample> {
if (line.contains("ABSTRACT TRUNCATED"))
continue;
- String fields[] = line.split("\t");
+ String[] fields = line.split("\t");
if (fields.length == 2) {
sentence.add(fields[0]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStream.java
index cd68148..f3c2a81 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/Conll02NameSampleStream.java
@@ -125,7 +125,7 @@ public class Conll02NameSampleStream implements ObjectStream<NameSample> {
continue;
}
- String fields[] = line.split(" ");
+ String[] fields = line.split(" ");
if (fields.length == 3) {
sentence.add(fields[0]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStream.java
index 6892605..5f1c082 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/Conll03NameSampleStream.java
@@ -93,7 +93,7 @@ public class Conll03NameSampleStream implements ObjectStream<NameSample> {
continue;
}
- String fields[] = line.split(" ");
+ String[] fields = line.split(" ");
// For English: WORD POS-TAG SC-TAG NE-TAG
if (LANGUAGE.EN.equals(lang) && fields.length == 4) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStream.java
index 74ae62a..9525ab6 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/ConllXPOSSampleStream.java
@@ -76,7 +76,7 @@ public class ConllXPOSSampleStream extends FilterObjectStream<String, POSSample>
final int minNumberOfFields = 5;
- String parts[] = line.split("\t");
+ String[] parts = line.split("\t");
if (parts.length >= minNumberOfFields) {
tokens.add(parts[1]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
index 931cb55..3a5621a 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/DirectorySampleStream.java
@@ -43,7 +43,7 @@ public class DirectorySampleStream implements ObjectStream<File> {
private Stack<File> textFiles = new Stack<>();
- public DirectorySampleStream(File dirs[], FileFilter fileFilter, boolean recursive) {
+ public DirectorySampleStream(File[] dirs, FileFilter fileFilter, boolean recursive) {
this.fileFilter = fileFilter;
isRecursiveScan = recursive;
@@ -73,7 +73,7 @@ public class DirectorySampleStream implements ObjectStream<File> {
while (textFiles.isEmpty() && !directories.isEmpty()) {
File dir = directories.pop();
- File files[];
+ File[] files;
if (fileFilter != null) {
files = dir.listFiles(fileFilter);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/EvalitaNameSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/EvalitaNameSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/EvalitaNameSampleStream.java
index d09c0b3..531a50f 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/EvalitaNameSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/EvalitaNameSampleStream.java
@@ -138,7 +138,7 @@ public class EvalitaNameSampleStream implements ObjectStream<NameSample> {
continue;
}
- String fields[] = line.split(" ");
+ String[] fields = line.split(" ");
// For Italian: WORD POS-TAG SC-TAG NE-TAG
if (LANGUAGE.IT.equals(lang) && fields.length == 4) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDoccatSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDoccatSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDoccatSampleStream.java
index 321f7c4..1ca0484 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDoccatSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDoccatSampleStream.java
@@ -87,7 +87,7 @@ public class LeipzigDoccatSampleStream extends
String line;
while (count < sentencesPerDocument && (line = samples.read()) != null) {
- String tokens[] = tokenizer.tokenize(line);
+ String[] tokens = tokenizer.tokenize(line);
if (tokens.length == 0) {
throw new IOException("Empty lines are not allowed!");
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java b/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java
index f0aea5e..bd2453b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/LeipzigDocumentSampleStreamFactory.java
@@ -51,7 +51,7 @@ public class LeipzigDocumentSampleStreamFactory
Parameters params = ArgumentParser.parse(args, Parameters.class);
File sentencesFileDir = params.getSentencesDir();
- File sentencesFiles[] = sentencesFileDir.listFiles(new FilenameFilter() {
+ File[] sentencesFiles = sentencesFileDir.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.contains("sentences") && name.endsWith(".txt");
@@ -59,7 +59,7 @@ public class LeipzigDocumentSampleStreamFactory
});
@SuppressWarnings("unchecked")
- ObjectStream<DocumentSample> sampleStreams[] =
+ ObjectStream<DocumentSample>[] sampleStreams =
new ObjectStream[sentencesFiles.length];
for (int i = 0; i < sentencesFiles.length; i++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratAnnotationStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratAnnotationStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratAnnotationStream.java
index 76e3d0f..efeddba 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratAnnotationStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratAnnotationStream.java
@@ -40,7 +40,7 @@ public class BratAnnotationStream implements ObjectStream<BratAnnotation> {
static final int ID_OFFSET = 0;
static final int TYPE_OFFSET = 1;
- BratAnnotation parse(Span tokens[], CharSequence line) throws IOException {
+ BratAnnotation parse(Span[] tokens, CharSequence line) throws IOException {
return null;
}
@@ -60,7 +60,7 @@ public class BratAnnotationStream implements ObjectStream<BratAnnotation> {
private static final int END_OFFSET = 3;
@Override
- BratAnnotation parse(Span values[], CharSequence line) throws IOException {
+ BratAnnotation parse(Span[] values, CharSequence line) throws IOException {
if (values.length > 4) {
String type = values[BratAnnotationParser.TYPE_OFFSET].getCoveredText(line).toString();
@@ -111,7 +111,7 @@ public class BratAnnotationStream implements ObjectStream<BratAnnotation> {
}
@Override
- BratAnnotation parse(Span tokens[], CharSequence line) throws IOException {
+ BratAnnotation parse(Span[] tokens, CharSequence line) throws IOException {
return new RelationAnnotation(tokens[BratAnnotationParser.ID_OFFSET].getCoveredText(line).toString(),
tokens[BratAnnotationParser.TYPE_OFFSET].getCoveredText(line).toString(),
parseArg(tokens[ARG1_OFFSET].getCoveredText(line).toString()),
@@ -122,7 +122,7 @@ public class BratAnnotationStream implements ObjectStream<BratAnnotation> {
static class EventAnnotationParser extends BratAnnotationParser {
@Override
- BratAnnotation parse(Span tokens[], CharSequence line) throws IOException {
+ BratAnnotation parse(Span[] tokens, CharSequence line) throws IOException {
String[] typeParts = tokens[TYPE_OFFSET].getCoveredText(line).toString().split(":");
@@ -194,7 +194,7 @@ public class BratAnnotationStream implements ObjectStream<BratAnnotation> {
String line = reader.readLine();
if (line != null) {
- Span tokens[] = WhitespaceTokenizer.INSTANCE.tokenizePos(line);
+ Span[] tokens = WhitespaceTokenizer.INSTANCE.tokenizePos(line);
if (tokens.length > 2) {
String annId = tokens[BratAnnotationParser.ID_OFFSET].getCoveredText(line).toString();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocument.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocument.java b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocument.java
index 16c9deb..1b9aee2 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocument.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratDocument.java
@@ -78,7 +78,7 @@ public class BratDocument {
StringBuilder text = new StringBuilder();
- char cbuf[] = new char[1024];
+ char[] cbuf = new char[1024];
int len;
while ((len = txtReader.read(cbuf)) > 0) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratNameSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratNameSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratNameSampleStream.java
index a569992..5a96d2d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratNameSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/brat/BratNameSampleStream.java
@@ -111,7 +111,7 @@ public class BratNameSampleStream extends SegmenterObjectStream<BratDocument, Na
String sentenceText = sentence.getCoveredText(
sample.getText()).toString();
- Span tokens[] = tokenizer.tokenizePos(sentenceText);
+ Span[] tokens = tokenizer.tokenizePos(sentenceText);
// Note:
// A begin and end token index can be identical, but map to different
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToByteArraySampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToByteArraySampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToByteArraySampleStream.java
index 0367b95..b7dedbb 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToByteArraySampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToByteArraySampleStream.java
@@ -38,7 +38,7 @@ public class FileToByteArraySampleStream extends FilterObjectStream<File, byte[]
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
try (InputStream in = new BufferedInputStream(new FileInputStream(file))) {
- byte buffer[] = new byte[1024];
+ byte[] buffer = new byte[1024];
int length;
while ((length = in.read(buffer, 0, buffer.length)) > 0) {
bytes.write(buffer, 0, length);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToStringSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToStringSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToStringSampleStream.java
index 3ca641c..3b0476a 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToStringSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/convert/FileToStringSampleStream.java
@@ -45,7 +45,7 @@ public class FileToStringSampleStream extends FilterObjectStream<File, String> {
StringBuilder text = new StringBuilder();
try {
- char buffer[] = new char[1024];
+ char[] buffer = new char[1024];
int length;
while ((length = in.read(buffer, 0, buffer.length)) > 0) {
text.append(buffer, 0, length);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/muc/MucNameContentHandler.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/muc/MucNameContentHandler.java b/opennlp-tools/src/main/java/opennlp/tools/formats/muc/MucNameContentHandler.java
index 4d6d3a4..e25d674 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/muc/MucNameContentHandler.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/muc/MucNameContentHandler.java
@@ -106,7 +106,7 @@ public class MucNameContentHandler extends SgmlParser.ContentHandler {
@Override
public void characters(CharSequence chars) {
if (isInsideContentElement) {
- String tokens [] = tokenizer.tokenize(chars.toString());
+ String[] tokens = tokenizer.tokenize(chars.toString());
text.addAll(Arrays.asList(tokens));
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/formats/ontonotes/OntoNotesNameSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/formats/ontonotes/OntoNotesNameSampleStream.java b/opennlp-tools/src/main/java/opennlp/tools/formats/ontonotes/OntoNotesNameSampleStream.java
index 41e5aa9..af2b5c8 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/formats/ontonotes/OntoNotesNameSampleStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/formats/ontonotes/OntoNotesNameSampleStream.java
@@ -105,7 +105,7 @@ public class OntoNotesNameSampleStream extends
break;
}
- String tokens[] = WhitespaceTokenizer.INSTANCE.tokenize(line);
+ String[] tokens = WhitespaceTokenizer.INSTANCE.tokenize(line);
List<Span> entities = new LinkedList<>();
List<String> cleanedTokens = new ArrayList<>(tokens.length);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmaSampleSequenceStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmaSampleSequenceStream.java b/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmaSampleSequenceStream.java
index 7056538..a4d5c8c 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmaSampleSequenceStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/LemmaSampleSequenceStream.java
@@ -41,9 +41,9 @@ public class LemmaSampleSequenceStream implements SequenceStream {
LemmaSample sample = samples.read();
if (sample != null) {
- String sentence[] = sample.getTokens();
- String tags[] = sample.getTags();
- String preds[] = sample.getLemmas();
+ String[] sentence = sample.getTokens();
+ String[] tags = sample.getTags();
+ String[] preds = sample.getLemmas();
Event[] events = new Event[sentence.length];
for (int i = 0; i < sentence.length; i++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/Lemmatizer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/Lemmatizer.java b/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/Lemmatizer.java
index ddcaa6a..f21f9e3 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/Lemmatizer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/lemmatizer/Lemmatizer.java
@@ -30,6 +30,6 @@ public interface Lemmatizer {
*
* @return an array of lemma classes for each token in the sequence.
*/
- String[] lemmatize(String[] toks, String tags[]);
+ String[] lemmatize(String[] toks, String[] tags);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/ml/BeamSearch.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/BeamSearch.java b/opennlp-tools/src/main/java/opennlp/tools/ml/BeamSearch.java
index 4ce8b7e..949a408 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/BeamSearch.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/BeamSearch.java
@@ -171,7 +171,7 @@ public class BeamSearch<T> implements SequenceClassificationModel<T> {
public Sequence bestSequence(T[] sequence, Object[] additionalContext,
BeamSearchContextGenerator<T> cg, SequenceValidator<T> validator) {
- Sequence sequences[] = bestSequences(1, sequence, additionalContext, cg, validator);
+ Sequence[] sequences = bestSequences(1, sequence, additionalContext, cg, validator);
if (sequences.length > 0)
return sequences[0];
@@ -181,7 +181,7 @@ public class BeamSearch<T> implements SequenceClassificationModel<T> {
@Override
public String[] getOutcomes() {
- String outcomes[] = new String[model.getNumOutcomes()];
+ String[] outcomes = new String[model.getNumOutcomes()];
for (int i = 0; i < model.getNumOutcomes(); i++) {
outcomes[i] = model.getOutcome(i);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
index 14c7fa3..b8b830e 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
@@ -156,7 +156,7 @@ public final class GISModel extends AbstractModel {
public static double[] eval(int[] context, float[] values, double[] prior,
EvalParameters model) {
Context[] params = model.getParams();
- int numfeats[] = new int[model.getNumOutcomes()];
+ int[] numfeats = new int[model.getNumOutcomes()];
int[] activeOutcomes;
double[] activeParameters;
double value = 1;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java b/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java
index ea26781..c0c8b1d 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java
@@ -42,7 +42,7 @@ public interface MaxentModel {
* outcomes, all of which sum to 1.
* @return an array of the probabilities for each of the different outcomes, all of which sum to 1.
**/
- double[] eval(String[] context, double probs[]);
+ double[] eval(String[] context, double[] probs);
/**
* Evaluates a contexts with the specified context values.
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
index 3e4cef1..7a50055 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
@@ -250,7 +250,7 @@ public class SimplePerceptronSequenceTrainer extends AbstractEventModelSequenceT
//training feature count computation
for (int ei = 0; ei < events.length; ei++, oei++) {
String[] contextStrings = events[ei].getContext();
- float values[] = events[ei].getValues();
+ float[] values = events[ei].getValues();
int oi = omap.get(events[ei].getOutcome());
for (int ci = 0; ci < contextStrings.length; ci++) {
float value = 1;
@@ -272,7 +272,7 @@ public class SimplePerceptronSequenceTrainer extends AbstractEventModelSequenceT
// {System.err.print(" "+taggerEvents[ei].getOutcome());} System.err.println();
for (Event taggerEvent : taggerEvents) {
String[] contextStrings = taggerEvent.getContext();
- float values[] = taggerEvent.getValues();
+ float[] values = taggerEvent.getValues();
int oi = omap.get(taggerEvent.getOutcome());
for (int ci = 0; ci < contextStrings.length; ci++) {
float value = 1;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java
index 284ae87..2218021 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/BioCodec.java
@@ -76,7 +76,7 @@ public class BioCodec implements SequenceCodec<String> {
return spans.toArray(new Span[spans.size()]);
}
- public String[] encode(Span names[], int length) {
+ public String[] encode(Span[] names, int length) {
String[] outcomes = new String[length];
for (int i = 0; i < outcomes.length; i++) {
outcomes[i] = BioCodec.OTHER;
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java
index 7f913f9..83318e4 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java
@@ -36,7 +36,7 @@ import opennlp.tools.util.featuregen.WindowFeatureGenerator;
*/
public class DefaultNameContextGenerator implements NameContextGenerator {
- private AdaptiveFeatureGenerator featureGenerators[];
+ private AdaptiveFeatureGenerator[] featureGenerators;
@Deprecated
private static AdaptiveFeatureGenerator windowFeatures = new CachedFeatureGenerator(
@@ -73,7 +73,7 @@ public class DefaultNameContextGenerator implements NameContextGenerator {
}
public void addFeatureGenerator(AdaptiveFeatureGenerator generator) {
- AdaptiveFeatureGenerator generators[] = featureGenerators;
+ AdaptiveFeatureGenerator[] generators = featureGenerators;
featureGenerators = new AdaptiveFeatureGenerator[featureGenerators.length + 1];
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/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 8b655eb..d186ef9 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/DictionaryNameFinder.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/DictionaryNameFinder.java
@@ -62,7 +62,7 @@ public class DictionaryNameFinder implements TokenNameFinder {
for (int offsetFrom = 0; offsetFrom < textTokenized.length; offsetFrom++) {
Span nameFound = null;
- String tokensSearching[];
+ 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/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java
index 0afd3c1..f67163c 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java
@@ -132,7 +132,7 @@ public class NameFinderEventStream extends opennlp.tools.util.AbstractEventStrea
overrideType(names);
}
- String outcomes[] = codec.encode(names, sample.getSentence().length);
+ String[] outcomes = codec.encode(names, sample.getSentence().length);
// String outcomes[] = generateOutcomes(sample.getNames(), type, sample.getSentence().length);
additionalContextFeatureGenerator.setCurrentContext(sample.getAdditionalContext());
String[] tokens = new String[sample.getSentence().length];
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
index 5a16f34..1d52473 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
@@ -302,7 +302,7 @@ public class NameFinderME implements TokenNameFinder {
*
* @return non-overlapping spans
*/
- public static Span[] dropOverlappingSpans(Span spans[]) {
+ public static Span[] dropOverlappingSpans(Span[] spans) {
List<Span> sortedSpans = new ArrayList<>(spans.length);
Collections.addAll(sortedSpans, spans);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSample.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSample.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSample.java
index f2f4578..8858ceb 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSample.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSample.java
@@ -179,7 +179,7 @@ public class NameSample {
return result.toString();
}
- private static String errorTokenWithContext(String sentence[], int index) {
+ private static String errorTokenWithContext(String[] sentence, int index) {
StringBuilder errorString = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java
index cf19bf2..8064d6b 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java
@@ -86,8 +86,8 @@ public class NameSampleSequenceStream implements SequenceStream {
public Sequence read() throws IOException {
NameSample sample = psi.read();
if (sample != null) {
- String sentence[] = sample.getSentence();
- String tags[] = seqCodec.encode(sample.getNames(), sentence.length);
+ String[] sentence = sample.getSentence();
+ String[] tags = seqCodec.encode(sample.getNames(), sentence.length);
Event[] events = new Event[sentence.length];
for (int i = 0; i < sentence.length; i++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/RegexNameFinder.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/RegexNameFinder.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/RegexNameFinder.java
index 5d9847d..7d7c6bd 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/RegexNameFinder.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/RegexNameFinder.java
@@ -32,7 +32,7 @@ import opennlp.tools.util.Span;
*/
public final class RegexNameFinder implements TokenNameFinder {
- private Pattern mPatterns[];
+ private Pattern[] mPatterns;
private String sType;
private Map<String, Pattern[]> regexMap;
@@ -40,7 +40,7 @@ public final class RegexNameFinder implements TokenNameFinder {
this.regexMap = Objects.requireNonNull(regexMap, "regexMap must not be null");
}
- public RegexNameFinder(Pattern patterns[], String type) {
+ public RegexNameFinder(Pattern[] patterns, String type) {
if (patterns == null || patterns.length == 0) {
throw new IllegalArgumentException("patterns must not be null or empty!");
}
@@ -55,7 +55,7 @@ public final class RegexNameFinder implements TokenNameFinder {
* {@link #RegexNameFinder(Map)}
*/
@Deprecated
- public RegexNameFinder(Pattern patterns[]) {
+ public RegexNameFinder(Pattern[] patterns) {
if (patterns == null || patterns.length == 0) {
throw new IllegalArgumentException("patterns must not be null or empty!");
}
@@ -65,7 +65,7 @@ public final class RegexNameFinder implements TokenNameFinder {
}
@Override
- public Span[] find(String tokens[]) {
+ public Span[] find(String[] tokens) {
Map<Integer, Integer> sentencePosTokenMap = new HashMap<>();
StringBuilder sentenceString = new StringBuilder(tokens.length * 10);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinder.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinder.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinder.java
index 3b5162e..c9de988 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinder.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinder.java
@@ -30,7 +30,7 @@ public interface TokenNameFinder {
* @param tokens an array of the tokens or words of the sequence, typically a sentence.
* @return an array of spans for each of the names identified.
*/
- Span[] find(String tokens[]);
+ Span[] find(String[] tokens);
/**
* Forgets all adaptive data which was collected during previous
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java
index 6a68b86..df8866f 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java
@@ -36,9 +36,9 @@ public class TokenNameFinderCrossValidator {
private class DocumentSample {
- private NameSample samples[];
+ private NameSample[] samples;
- DocumentSample(NameSample samples[]) {
+ DocumentSample(NameSample[] samples) {
this.samples = samples;
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java
index d58527b..a84ebb8 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java
@@ -73,8 +73,8 @@ public class TokenNameFinderEvaluator extends Evaluator<NameSample> {
nameFinder.clearAdaptiveData();
}
- Span predictedNames[] = nameFinder.find(reference.getSentence());
- Span references[] = reference.getNames();
+ Span[] predictedNames = nameFinder.find(reference.getSentence());
+ Span[] references = reference.getNames();
// OPENNLP-396 When evaluating with a file in the old format
// the type of the span is null, but must be set to default to match
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/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 e7f0190..f570be3 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderFactory.java
@@ -80,7 +80,7 @@ public class TokenNameFinderFactory extends BaseToolFactory {
throw new IllegalStateException("Classpath must contain ner-default-features.xml file!");
}
- byte buf[] = new byte[1024];
+ byte[] buf = new byte[1024];
int len;
while ((len = in.read(buf)) > 0) {
bytes.write(buf, 0, len);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
index 09eefc5..5b72449 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
@@ -211,7 +211,7 @@ public class TokenNameFinderModel extends BaseModel {
private boolean isModelValid(MaxentModel model) {
- String outcomes[] = new String[model.getNumOutcomes()];
+ String[] outcomes = new String[model.getNumOutcomes()];
for (int i = 0; i < model.getNumOutcomes(); i++) {
outcomes[i] = model.getOutcome(i);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/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 b0fc3e4..a553328 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
@@ -388,9 +388,9 @@ public abstract class AbstractBottomUpParser implements Parser {
protected Parse[] advanceChunks(final Parse p, double minChunkScore) {
// chunk
Parse[] children = p.getChildren();
- String words[] = new String[children.length];
- String ptags[] = new String[words.length];
- double probs[] = new double[words.length];
+ String[] words = new String[children.length];
+ String[] ptags = new String[words.length];
+ double[] probs = new double[words.length];
for (int i = 0, il = children.length; i < il; i++) {
Parse sp = children[i];
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkContextGenerator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkContextGenerator.java b/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkContextGenerator.java
index b9733b6..7d37fcb 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkContextGenerator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkContextGenerator.java
@@ -160,7 +160,7 @@ public class ChunkContextGenerator implements ChunkerContextGenerator {
features.add(ctbo0 + "," + ct1);
features.add(ct0 + "," + ctbo1);
features.add(ctbo0 + "," + ctbo1);
- String contexts[] = features.toArray(new String[features.size()]);
+ String[] contexts = features.toArray(new String[features.size()]);
if (contextsCache != null) {
contextsCache.put(cacheKey,contexts);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerFactory.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerFactory.java b/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerFactory.java
index b19d480..7d3c8f7 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerFactory.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerFactory.java
@@ -35,7 +35,7 @@ public class ParserChunkerFactory extends ChunkerFactory {
MaxentModel model = artifactProvider.getArtifact("chunker.model");
- String outcomes[] = new String[model.getNumOutcomes()];
+ String[] outcomes = new String[model.getNumOutcomes()];
for (int i = 0; i < outcomes.length; i++) {
outcomes[i] = model.getOutcome(i);
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/bbd6d3fc/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerSequenceValidator.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerSequenceValidator.java b/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerSequenceValidator.java
index 6b748a6..ef15bf5 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerSequenceValidator.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/ParserChunkerSequenceValidator.java
@@ -27,7 +27,7 @@ public class ParserChunkerSequenceValidator implements SequenceValidator<String>
private Map<String, String> continueStartMap;
- public ParserChunkerSequenceValidator(String outcomes[]) {
+ public ParserChunkerSequenceValidator(String[] outcomes) {
continueStartMap = new HashMap<>(outcomes.length);
for (int oi = 0, on = outcomes.length; oi < on; oi++) {