Author: rwesten
Date: Tue Oct 22 06:11:29 2013
New Revision: 1534507
URL: http://svn.apache.org/r1534507
Log:
STANBOL-1132: re-add dependency additions to the trunk. Those got somehow lost
in the new trunk (STANBOL-1094)
Added:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefTagSupport.java
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyFeaturesSupport.java
Modified:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextParser.java
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParser.java
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/MorphoFeaturesSupport.java
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/NerTagSupport.java
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PhraseTagSupport.java
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PosTagSupport.java
Modified:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextParser.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextParser.java?rev=1534507&r1=1534506&r2=1534507&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextParser.java
(original)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextParser.java
Tue Oct 22 06:11:29 2013
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Map.Entry;
import javax.swing.JPanel;
Modified:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParser.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParser.java?rev=1534507&r1=1534506&r2=1534507&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParser.java
(original)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParser.java
Tue Oct 22 06:11:29 2013
@@ -16,6 +16,7 @@
*/
package org.apache.stanbol.enhancer.nlp.json.valuetype;
+import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.codehaus.jackson.node.ObjectNode;
/**
* Interface allowing to extend how Classes used as generic type for
@@ -34,6 +35,6 @@ public interface ValueTypeParser<T> {
Class<T> getType();
- T parse(ObjectNode jAnnotation);
+ T parse(ObjectNode jAnnotation, AnalysedText at);
}
Modified:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java?rev=1534507&r1=1534506&r2=1534507&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java
(original)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeParserRegistry.java
Tue Oct 22 06:11:29 2013
@@ -134,13 +134,26 @@ public class ValueTypeParserRegistry {
valueTypeParsers = new HashMap<Class<?>,ValueTypeParser<?>>();
ServiceLoader<ValueTypeParser> loader =
ServiceLoader.load(ValueTypeParser.class);
for(Iterator<ValueTypeParser> it =
loader.iterator();it.hasNext();){
- ValueTypeParser vts = it.next();
- ValueTypeParser<?> serializer =
valueTypeParsers.get(vts.getType());
- if(serializer != null){
- log.warn("Multiple Parsers for type {} (keep: {},
ignoreing: {}",
- new Object[]{vts.getType(),serializer,vts});
- } else {
- valueTypeParsers.put(vts.getType(), vts);
+ try {
+ ValueTypeParser vts = it.next();
+ ValueTypeParser<?> serializer =
valueTypeParsers.get(vts.getType());
+ if(serializer != null){
+ log.warn("Multiple Parsers for type {} (keep: {},
ignoreing: {}",
+ new Object[]{vts.getType(),serializer,vts});
+ } else {
+ valueTypeParsers.put(vts.getType(), vts);
+ }
+ } catch (NoClassDefFoundError e) {
+ //ignore services that can not be loaded
+ //e.g. when mixing different version of the
stanbol.enhancer.nlp
+ //and the stanbol.enhancer.nlp-json module
+ //It is better to throw an exception if an Node for
the failed
+ //ValueTypeParser appears in the JSON as when loading
all
+ //registered services
+ log.warn("Unable to load a ValueTypeParser service
because class '"
+ +e.getMessage()+" could not be loaded! This may
happen if the "
+ + "classpath mixes different versions of
o.a.stanbol.enhancer.nlp* "
+ + "modules!");
}
}
}
Added:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefTagSupport.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefTagSupport.java?rev=1534507&view=auto
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefTagSupport.java
(added)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/CorefTagSupport.java
Tue Oct 22 06:11:29 2013
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */package org.apache.stanbol.enhancer.nlp.json.valuetype.impl;
+
+import java.util.Set;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.enhancer.nlp.coref.CorefTag;
+import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser;
+import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer;
+import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
+import org.apache.stanbol.enhancer.nlp.model.Span;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.node.ArrayNode;
+import org.codehaus.jackson.node.ObjectNode;
+
+@Component(immediate=true,policy=ConfigurationPolicy.IGNORE)
+@Service(value={ValueTypeParser.class,ValueTypeSerializer.class})
+@Property(name=ValueTypeParser.PROPERTY_TYPE, value=CorefTagSupport.TYPE_VALUE)
+public class CorefTagSupport implements ValueTypeParser<CorefTag>,
ValueTypeSerializer<CorefTag> {
+
+ public static final String TYPE_VALUE =
"org.apache.stanbol.enhancer.nlp.coref.CorefTag";
+
+ private static final String IS_REPRESENTATIVE_TAG = "isRepresentative";
+ private static final String MENTIONS_TAG = "mentions";
+ private static final String MENTION_TYPE_TAG = "type";
+ private static final String MENTION_START_TAG = "start";
+ private static final String MENTION_END_TAG = "end";
+
+ @Override
+ public ObjectNode serialize(ObjectMapper mapper, CorefTag coref) {
+ ObjectNode jCoref = mapper.createObjectNode();
+
+ jCoref.put(IS_REPRESENTATIVE_TAG, coref.isRepresentative());
+
+ Set<Span> mentions = coref.getMentions();
+
+ if(!mentions.isEmpty()) {
+ ArrayNode jMentions = mapper.createArrayNode();
+
+ for(Span mention : mentions) {
+ ObjectNode jMention = mapper.createObjectNode();
+
+ jMention.put(MENTION_TYPE_TAG, mention.getType().toString());
+ jMention.put(MENTION_START_TAG, mention.getStart());
+ jMention.put(MENTION_END_TAG, mention.getEnd());
+
+ jMentions.add(jMention);
+ }
+
+ jCoref.put(MENTIONS_TAG, jMentions);
+ }
+
+ return jCoref;
+ }
+
+ @Override
+ public Class<CorefTag> getType() {
+ return CorefTag.class;
+ }
+
+ @Override
+ public CorefTag parse(ObjectNode jCoref, AnalysedText at) {
+ JsonNode jIsRepresentative = jCoref.path(IS_REPRESENTATIVE_TAG);
+
+ if (!jIsRepresentative.isBoolean()) {
+ throw new IllegalStateException("Field
'isRepresentative' must have a true/false format");
+ }
+
+ CorefTag corefTag = new CorefTag(jIsRepresentative.asBoolean());
+
+ JsonNode node = jCoref.path(MENTIONS_TAG);
+
+ if(node.isArray()) {
+ ArrayNode jMentions = (ArrayNode)node;
+
+ for(int i=0;i<jMentions.size();i++) {
+ JsonNode member = jMentions.get(i);
+
+ if(member.isObject()) {
+ ObjectNode jMention = (ObjectNode)member;
+ SpanTypeEnum spanType =
SpanTypeEnum.valueOf(jMention.path(MENTION_TYPE_TAG).getTextValue());
+ int spanStart = jMention.path(MENTION_START_TAG).asInt();
+ int spanEnd = jMention.path(MENTION_END_TAG).asInt();
+ Span mentionedSpan = null;
+
+ switch (spanType) {
+ case Chunk:
+ mentionedSpan =
at.addChunk(spanStart, spanEnd);
+ break;
+ case Sentence:
+ case Text:
+ case TextSection:
+ break;
+ case Token:
+ mentionedSpan =
at.addToken(spanStart, spanEnd);
+ break;
+
+ }
+
+ corefTag.addMention(mentionedSpan);
+ }
+ }
+ }
+
+ return corefTag;
+ }
+}
\ No newline at end of file
Added:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyFeaturesSupport.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyFeaturesSupport.java?rev=1534507&view=auto
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyFeaturesSupport.java
(added)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/DependencyFeaturesSupport.java
Tue Oct 22 06:11:29 2013
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */package org.apache.stanbol.enhancer.nlp.json.valuetype.impl;
+
+import java.util.Set;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.enhancer.nlp.dependency.DependencyFeatures;
+import org.apache.stanbol.enhancer.nlp.dependency.DependencyRelation;
+import org.apache.stanbol.enhancer.nlp.dependency.GrammaticalRelation;
+import org.apache.stanbol.enhancer.nlp.dependency.GrammaticalRelationTag;
+import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser;
+import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer;
+import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
+import org.apache.stanbol.enhancer.nlp.model.Span;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.node.ArrayNode;
+import org.codehaus.jackson.node.ObjectNode;
+
+@Component(immediate=true,policy=ConfigurationPolicy.IGNORE)
+@Service(value={ValueTypeParser.class,ValueTypeSerializer.class})
+@Property(name=ValueTypeParser.PROPERTY_TYPE,
value=DependencyFeaturesSupport.TYPE_VALUE)
+public class DependencyFeaturesSupport implements
ValueTypeParser<DependencyFeatures>, ValueTypeSerializer<DependencyFeatures> {
+
+ public static final String TYPE_VALUE =
"org.apache.stanbol.enhancer.nlp.dependency.DependencyFeatures";
+
+ private static final String RELATION_TYPE_TAG = "tag";
+ private static final String RELATION_STANBOL_TYPE_TAG = "relationType";
+ private static final String RELATION_IS_DEPENDEE_TAG = "isDependent";
+ private static final String RELATION_PARTNER_TYPE_TAG = "type";
+ private static final String RELATION_PARTNER_START_TAG = "start";
+ private static final String RELATION_PARTNER_END_TAG = "end";
+ private static final String RELATIONS_TAG = "relations";
+ private static final String ROOT_TAG = "ROOT";
+
+ @Override
+ public ObjectNode serialize(ObjectMapper mapper, DependencyFeatures
value) {
+ ObjectNode jDependencyFeature = mapper.createObjectNode();
+
+ Set<DependencyRelation> relations = value.getRelations();
+
+ if(!relations.isEmpty()) {
+ ArrayNode jRelations = mapper.createArrayNode();
+
+ for(DependencyRelation relation : relations) {
+ ObjectNode jRelation = mapper.createObjectNode();
+
+ GrammaticalRelationTag gramRelTag =
relation.getGrammaticalRelationTag();
+ jRelation.put(RELATION_TYPE_TAG, gramRelTag.getTag());
+ jRelation.put(RELATION_STANBOL_TYPE_TAG,
gramRelTag.getGrammaticalRelation().ordinal());
+ jRelation.put(RELATION_IS_DEPENDEE_TAG,
(relation.isDependent() ? "true" : "false"));
+
+ Span partner = relation.getPartner();
+ if (partner != null) {
+ jRelation.put(RELATION_PARTNER_TYPE_TAG,
partner.getType().toString());
+ jRelation.put(RELATION_PARTNER_START_TAG,
partner.getStart());
+ jRelation.put(RELATION_PARTNER_END_TAG,
partner.getEnd());
+ } else {
+ jRelation.put(RELATION_PARTNER_TYPE_TAG, "ROOT");
+ jRelation.put(RELATION_PARTNER_START_TAG, 0);
+ jRelation.put(RELATION_PARTNER_END_TAG, 0);
+ }
+
+ jRelations.add(jRelation);
+ }
+
+ jDependencyFeature.put(RELATIONS_TAG, jRelations);
+ }
+
+ return jDependencyFeature;
+ }
+
+ @Override
+ public Class<DependencyFeatures> getType() {
+ return DependencyFeatures.class;
+ }
+
+ @Override
+ public DependencyFeatures parse(ObjectNode jDependencyFeature,
AnalysedText at) {
+ DependencyFeatures dependencyFeature = new DependencyFeatures();
+
+ JsonNode node = jDependencyFeature.path(RELATIONS_TAG);
+
+ if(node.isArray()) {
+ ArrayNode jRelations = (ArrayNode)node;
+
+ for(int i=0;i<jRelations.size();i++) {
+ JsonNode member = jRelations.get(i);
+
+ if(member.isObject()) {
+ ObjectNode jRelation = (ObjectNode)member;
+
+ JsonNode tag = jRelation.path(RELATION_TYPE_TAG);
+
+ if(!tag.isTextual()){
+ throw new IllegalStateException("Unable to parse
GrammaticalRelationTag. The value of the "
+ +"'tag' field MUST have a textual value (json:
" + jDependencyFeature + ")");
+ }
+
+ GrammaticalRelation grammaticalRelation =
GrammaticalRelation.class.getEnumConstants()[jRelation.path(RELATION_STANBOL_TYPE_TAG).asInt()];
+ GrammaticalRelationTag gramRelTag = new
GrammaticalRelationTag(tag.getTextValue(), grammaticalRelation);
+
+ JsonNode isDependent =
jRelation.path(RELATION_IS_DEPENDEE_TAG);
+
+ if (!isDependent.isBoolean()) {
+ throw new IllegalStateException("Field 'isDependent'
must have a true/false format");
+ }
+
+ Span partnerSpan = null;
+ String typeString =
jRelation.path(RELATION_PARTNER_TYPE_TAG).getTextValue();
+
+ if (!typeString.equals(ROOT_TAG)) {
+ SpanTypeEnum spanType =
SpanTypeEnum.valueOf(jRelation.path(RELATION_PARTNER_TYPE_TAG).getTextValue());
+ int spanStart =
jRelation.path(RELATION_PARTNER_START_TAG).asInt();
+ int spanEnd =
jRelation.path(RELATION_PARTNER_END_TAG).asInt();
+
+
+ switch (spanType) {
+ case Chunk:
+ partnerSpan =
at.addChunk(spanStart, spanEnd);
+ break;
+ case Sentence:
+ case Text:
+ case TextSection:
+ break;
+ case Token:
+ partnerSpan =
at.addToken(spanStart, spanEnd);
+ break;
+ }
+ }
+
+ DependencyRelation relation = new
DependencyRelation(gramRelTag, isDependent.asBoolean(), partnerSpan);
+ dependencyFeature.addRelation(relation);
+ }
+ }
+ }
+
+ return dependencyFeature;
+ }
+}
Modified:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/MorphoFeaturesSupport.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/MorphoFeaturesSupport.java?rev=1534507&r1=1534506&r2=1534507&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/MorphoFeaturesSupport.java
(original)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/MorphoFeaturesSupport.java
Tue Oct 22 06:11:29 2013
@@ -29,6 +29,7 @@ import org.apache.stanbol.enhancer.nlp.j
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParserRegistry;
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer;
import
org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializerRegistry;
+import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.morpho.Case;
import org.apache.stanbol.enhancer.nlp.morpho.CaseTag;
import org.apache.stanbol.enhancer.nlp.morpho.Definitness;
@@ -190,7 +191,7 @@ public class MorphoFeaturesSupport imple
@Override
- public MorphoFeatures parse(ObjectNode jMorpho) {
+ public MorphoFeatures parse(ObjectNode jMorpho, AnalysedText at) {
JsonNode jLemma = jMorpho.path("lemma");
if(!jLemma.isTextual()){
throw new IllegalStateException("Field 'lemma' MUST provide a
String value (parsed JSON: "
@@ -298,7 +299,7 @@ public class MorphoFeaturesSupport imple
JsonNode member = jPosTags.get(i);
if(member.isObject()){
ObjectNode jPosTag = (ObjectNode)member;
- morpho.addPos(getPosTagParser().parse(jPosTag));
+ morpho.addPos(getPosTagParser().parse(jPosTag, at));
} else {
log.warn("Unable to parse PosTag from "+member.toString());
}
Modified:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/NerTagSupport.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/NerTagSupport.java?rev=1534507&r1=1534506&r2=1534507&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/NerTagSupport.java
(original)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/NerTagSupport.java
Tue Oct 22 06:11:29 2013
@@ -23,6 +23,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser;
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer;
+import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.ner.NerTag;
import org.apache.stanbol.enhancer.nlp.pos.PosTag;
import org.codehaus.jackson.JsonNode;
@@ -41,7 +42,7 @@ public class NerTagSupport implements Va
return NerTag.class;
}
@Override
- public NerTag parse(ObjectNode jValue) {
+ public NerTag parse(ObjectNode jValue, AnalysedText at) {
JsonNode tag = jValue.path("tag");
if(!tag.isTextual()){
throw new IllegalStateException("Unable to parse NerTag. The value
of the "
Modified:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PhraseTagSupport.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PhraseTagSupport.java?rev=1534507&r1=1534506&r2=1534507&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PhraseTagSupport.java
(original)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PhraseTagSupport.java
Tue Oct 22 06:11:29 2013
@@ -22,6 +22,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser;
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer;
+import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.phrase.PhraseTag;
import org.apache.stanbol.enhancer.nlp.pos.LexicalCategory;
import org.codehaus.jackson.JsonNode;
@@ -57,7 +58,7 @@ public class PhraseTagSupport implements
@Override
- public PhraseTag parse(ObjectNode jValue) {
+ public PhraseTag parse(ObjectNode jValue, AnalysedText at) {
JsonNode tag = jValue.path("tag");
if(!tag.isTextual()){
throw new IllegalStateException("Unable to parse PhraseTag. The
value of the "
Modified:
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PosTagSupport.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PosTagSupport.java?rev=1534507&r1=1534506&r2=1534507&view=diff
==============================================================================
---
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PosTagSupport.java
(original)
+++
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/impl/PosTagSupport.java
Tue Oct 22 06:11:29 2013
@@ -28,6 +28,7 @@ import org.apache.felix.scr.annotations.
import org.apache.stanbol.enhancer.nlp.json.JsonUtils;
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser;
import org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer;
+import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.pos.LexicalCategory;
import org.apache.stanbol.enhancer.nlp.pos.Pos;
import org.apache.stanbol.enhancer.nlp.pos.PosTag;
@@ -58,7 +59,7 @@ public class PosTagSupport implements Va
return PosTag.class;
}
@Override
- public PosTag parse(ObjectNode jValue) {
+ public PosTag parse(ObjectNode jValue, AnalysedText at) {
PosTagInfo tagInfo = new PosTagInfo();
JsonNode tag = jValue.path("tag");
if(!tag.isTextual()){
