http://git-wip-us.apache.org/repos/asf/opennlp/blob/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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);
