Author: rwesten
Date: Thu Mar 27 08:20:32 2014
New Revision: 1582214
URL: http://svn.apache.org/r1582214
Log:
fix for STANBOL-1302 in the trunk: renamed the method with the typo. Changed
also all calling components accordingly; getTokenizer does no longer call
getTokenizerModel(language) twice
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/OpenNLP.java
stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/TextAnalyzer.java
stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/OpenNLPTest.java
stanbol/trunk/enhancement-engines/opennlp/opennlp-pos/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/pos/services/OpenNlpPosTaggingEngine.java
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12:r1581830
Modified:
stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/OpenNLP.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/OpenNLP.java?rev=1582214&r1=1582213&r2=1582214&view=diff
==============================================================================
---
stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/OpenNLP.java
(original)
+++
stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/OpenNLP.java
Thu Mar 27 08:20:32 2014
@@ -189,7 +189,7 @@ public class OpenNLP {
try {
TokenizerModel model = getTokenizerModel(language);
if(model != null){
- tokenizer = new TokenizerME(getTokenizerModel(language));
+ tokenizer = new TokenizerME(model);
}
} catch (InvalidFormatException e) {
log.warn("Unable to load Tokenizer Model for "+language+": " +
@@ -216,7 +216,7 @@ public class OpenNLP {
* @throws InvalidFormatException in case the found model data are in the
wrong format
* @throws IOException on any error while reading the model data
*/
- public POSModel getPartOfSpeachModel(String language) throws IOException,
InvalidFormatException {
+ public POSModel getPartOfSpeechModel(String language) throws IOException,
InvalidFormatException {
//typically there are two versions
//we prefer the perceptron variant but if not available try to build
the other
IOException first = null;
@@ -252,7 +252,7 @@ public class OpenNLP {
* @throws IOException on any error while reading the model data
*/
public POSTagger getPartOfSpeechTagger(String language) throws IOException
{
- POSModel posModel = getPartOfSpeachModel(language);
+ POSModel posModel = getPartOfSpeechModel(language);
if(posModel != null){
return new POSTaggerME(posModel);
} else {
Modified:
stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/TextAnalyzer.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/TextAnalyzer.java?rev=1582214&r1=1582213&r2=1582214&view=diff
==============================================================================
---
stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/TextAnalyzer.java
(original)
+++
stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/TextAnalyzer.java
Thu Mar 27 08:20:32 2014
@@ -231,7 +231,7 @@ public class TextAnalyzer {
}
if(posTagger == null && !posTaggerNotAvailable){
try {
- POSModel posModel = openNLP.getPartOfSpeachModel(language);
+ POSModel posModel = openNLP.getPartOfSpeechModel(language);
if(posModel != null){
posTagger = new POSTaggerME(posModel);
} else {
Modified:
stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/OpenNLPTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/OpenNLPTest.java?rev=1582214&r1=1582213&r2=1582214&view=diff
==============================================================================
---
stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/OpenNLPTest.java
(original)
+++
stanbol/trunk/commons/opennlp/src/test/java/org/apache/commons/opennlp/OpenNLPTest.java
Thu Mar 27 08:20:32 2014
@@ -92,14 +92,14 @@ public class OpenNLPTest {
}
@Test
public void testLoadEnPOS() throws IOException{
- POSModel model = openNLP.getPartOfSpeachModel("en");
+ POSModel model = openNLP.getPartOfSpeechModel("en");
Assert.assertNotNull(model);
POSTagger posTagger = openNLP.getPartOfSpeechTagger("en");
Assert.assertNotNull(posTagger);
}
@Test
public void testLoadMissingPOS() throws IOException{
- POSModel model = openNLP.getPartOfSpeachModel("ru");
+ POSModel model = openNLP.getPartOfSpeechModel("ru");
Assert.assertNull(model);
POSTagger posTagger = openNLP.getPartOfSpeechTagger("ru");
Assert.assertNull(posTagger);
Modified:
stanbol/trunk/enhancement-engines/opennlp/opennlp-pos/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/pos/services/OpenNlpPosTaggingEngine.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/opennlp/opennlp-pos/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/pos/services/OpenNlpPosTaggingEngine.java?rev=1582214&r1=1582213&r2=1582214&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/opennlp/opennlp-pos/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/pos/services/OpenNlpPosTaggingEngine.java
(original)
+++
stanbol/trunk/enhancement-engines/opennlp/opennlp-pos/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/pos/services/OpenNlpPosTaggingEngine.java
Thu Mar 27 08:20:32 2014
@@ -426,7 +426,7 @@ public class OpenNlpPosTaggingEngine ext
try {
POSModel model;
if(modelName == null){ //use the default
- model = openNLP.getPartOfSpeachModel(language);
+ model = openNLP.getPartOfSpeechModel(language);
} else {
model = openNLP.getModel(POSModel.class, modelName, null);
}
