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/1d8bcb67 Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/1d8bcb67 Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/1d8bcb67 Branch: refs/heads/parser_regression Commit: 1d8bcb67a69e618e61750051b1dd30e64e88fe69 Parents: dc91b25 Author: Peter Thygesen <[email protected]> Authored: Thu Feb 16 12:48:12 2017 +0100 Committer: Jörn Kottmann <[email protected]> Committed: Thu Apr 20 12:40:20 2017 +0200 ---------------------------------------------------------------------- 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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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/1d8bcb67/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++) {
