Author: rwesten
Date: Wed Apr 16 04:22:30 2014
New Revision: 1587797
URL: http://svn.apache.org/r1587797
Log:
applied patch for STANBOL-1313 with some modifications required for the 0.12
branch
Modified:
stanbol/branches/release-0.12/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonSerializer.java
stanbol/branches/release-0.12/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/ConversionTester.java
stanbol/branches/release-0.12/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
stanbol/branches/release-0.12/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/config/TextProcessingConfig.java
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
stanbol/branches/release-0.12/enhancement-engines/sentiment-summarization/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/summarize/SentimentSummarizationEngine.java
stanbol/branches/release-0.12/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/util/WordSentimentDictionary.java
stanbol/branches/release-0.12/enhancement-engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/Mapping.java
stanbol/branches/release-0.12/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextSerializerAndParserTest.java
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/DependencyRelationSupportTest.java
stanbol/branches/release-0.12/enhancer/generic/nlp/src/test/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextTest.java
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/impl/ContentSourceTest.java
stanbol/branches/release-0.12/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
stanbol/branches/release-0.12/entityhub/jersey/src/test/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtilsTest.java
stanbol/branches/release-0.12/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java
stanbol/branches/release-0.12/entityhub/model/sesame/src/test/java/org/apache/stanbol/entityhub/model/sesame/RdfRepresentationTest.java
stanbol/branches/release-0.12/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/GtEncoder.java
stanbol/branches/release-0.12/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/util/OntologyUtils.java
stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java
stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java
stanbol/branches/release-0.12/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java
stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/DifferentAtom.java
stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/TypedLiteralAtom.java
stanbol/branches/release-0.12/rules/adapters/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumberAtom.java
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/TokenMgrError.java
Modified:
stanbol/branches/release-0.12/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonSerializer.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonSerializer.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonSerializer.java
(original)
+++
stanbol/branches/release-0.12/commons/jsonld/src/main/java/org/apache/stanbol/commons/jsonld/JsonSerializer.java
Wed Apr 16 04:22:30 2014
@@ -179,7 +179,7 @@ public final class JsonSerializer {
default:
if (ch < ' ') {
String str = "000" + Integer.toHexString(ch);
- sb.append("\\u" + str.substring(str.length() - 4));
+ sb.append("\\u").append(str.substring(str.length() -
4));
} else {
sb.append(ch);
}
Modified:
stanbol/branches/release-0.12/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/ConversionTester.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/ConversionTester.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/ConversionTester.java
(original)
+++
stanbol/branches/release-0.12/commons/owl/src/test/java/org/apache/stanbol/commons/owl/transformation/ConversionTester.java
Wed Apr 16 04:22:30 2014
@@ -193,7 +193,7 @@ public class ConversionTester extends Te
if (wp == null) {
fail("Some errors occur");
} else {
- assertEquals(wp.getIRI().toURI().toString(),
jp.getURI().toString());
+ assertEquals(wp.getIRI().toURI().toString(), jp.getURI());
}
} catch (Exception e) {
e.printStackTrace();
@@ -214,7 +214,7 @@ public class ConversionTester extends Te
if (jp == null) {
fail("Some errors occur");
} else {
- assertEquals(wp.getIRI().toURI().toString(),
jp.getURI().toString());
+ assertEquals(wp.getIRI().toURI().toString(), jp.getURI());
}
} catch (Exception e) {
e.printStackTrace();
@@ -233,7 +233,7 @@ public class ConversionTester extends Te
wc = j2o.ClassJenaToOwl(jc, RDFXML);
if (wc == null) fail("Some problems accours");
else {
- assertEquals(wc.getIRI().toURI().toString(),
jc.getURI().toString());
+ assertEquals(wc.getIRI().toURI().toString(), jc.getURI());
}
} catch (Exception e) {
e.printStackTrace();
@@ -276,7 +276,7 @@ public class ConversionTester extends Te
if (wp == null) {
fail("Some problem accours");
} else {
- assertEquals(wp.getIRI().toURI().toString(),
jp.getURI().toString());
+ assertEquals(wp.getIRI().toURI().toString(), jp.getURI());
}
} catch (Exception e) {
e.printStackTrace();
@@ -440,7 +440,7 @@ public class ConversionTester extends Te
if (wp == null) {
fail("Some errors occurs");
} else {
- assertEquals(wp.getIRI().toURI().toString(),
jp.getURI().toString());
+ assertEquals(wp.getIRI().toURI().toString(), jp.getURI());
}
} catch (Exception e) {
e.printStackTrace();
@@ -503,7 +503,7 @@ public class ConversionTester extends Te
while (str.hasNext()) {
Statement stm = str.next();
Resource subject = stm.getSubject();
- if
(SUBJECT.toString().equals(subject.getURI().toString())) count++;
+ if (SUBJECT.toString().equals(subject.getURI())) count++;
}
if (count == owlaxiom.size()) {
Modified:
stanbol/branches/release-0.12/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
(original)
+++
stanbol/branches/release-0.12/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
Wed Apr 16 04:22:30 2014
@@ -366,11 +366,11 @@ public class UserResource {
continue;
}
if (userRoleNames.contains(role)) {
- html.append("<input class=\"role\" type=\"checkbox\" id=\"" +
role + "\" name=\"" + role + "\" value=\"" + role + "\" checked=\"checked\"
/>");
+ html.append("<input class=\"role\" type=\"checkbox\"
id=\"").append(role).append("\" name=\"").append(role).append("\"
value=\"").append(role).append("\" checked=\"checked\" />");
} else {
- html.append("<input class=\"role\" type=\"checkbox\" id=\"" +
role + "\" name=\"" + role + "\" value=\"" + role + "\" />");
+ html.append("<input class=\"role\" type=\"checkbox\"
id=\"").append(role).append("\" name=\"").append(role).append("\"
value=\"").append(role).append("\" />");
}
- html.append("<label for=\"" + role + "\">" + role + "</label>");
+ html.append("<label
for=\"").append(role).append("\">").append(role).append("</label>");
html.append("<br />");
}
return Response.ok(html.toString()).build();
Modified:
stanbol/branches/release-0.12/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/config/TextProcessingConfig.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/config/TextProcessingConfig.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/config/TextProcessingConfig.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/config/TextProcessingConfig.java
Wed Apr 16 04:22:30 2014
@@ -442,7 +442,7 @@ public class TextProcessingConfig {
private static Boolean parseState(Map<String,String> config, String param){
String value = config.get(param);
return value == null && config.containsKey(param) ? Boolean.TRUE :
- value != null ? new Boolean(value) : null;
+ value != null ? Boolean.valueOf(value) : null;
}
private static <T extends Number> T parseNumber(Map<String,String> config,
Modified:
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
Wed Apr 16 04:22:30 2014
@@ -388,7 +388,7 @@ public class FstLinkingEngineComponent {
if(value instanceof Boolean){
skipAltTokensConfig = ((Boolean)value);
} else if(value != null){
- skipAltTokensConfig = new Boolean(value.toString());
+ skipAltTokensConfig = Boolean.valueOf(value.toString());
} // else no config -> will use the default
//(4) init the FST configuration
Modified:
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
Wed Apr 16 04:22:30 2014
@@ -539,7 +539,7 @@ public abstract class NEREngineCore
CharSequence previousSentence = sentenceSpans[i -
1].getCoveredText(text);
contextElements.add(previousSentence.toString().trim());
}
- contextElements.add(sentence.toString().trim());
+ contextElements.add(sentence.trim());
if (i + 1 < sentenceSpans.length) {
CharSequence nextSentence = sentenceSpans[i +
1].getCoveredText(text);
contextElements.add(nextSentence.toString().trim());
Modified:
stanbol/branches/release-0.12/enhancement-engines/sentiment-summarization/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/summarize/SentimentSummarizationEngine.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/sentiment-summarization/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/summarize/SentimentSummarizationEngine.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/sentiment-summarization/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/summarize/SentimentSummarizationEngine.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/sentiment-summarization/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/summarize/SentimentSummarizationEngine.java
Wed Apr 16 04:22:30 2014
@@ -463,7 +463,7 @@ public class SentimentSummarizationEngin
if(floorConjunction != null && floorConjunction.compareTo(
Integer.valueOf(Math.max(verb.getKey()-conjuctionContext,sectionSpan[0]))) >=
0){
//search an other verb in the same direction
- floorVerb =
verbs.floorEntry(Integer.valueOf(floorConjunction));
+ floorVerb = verbs.floorEntry(floorConjunction);
if(floorVerb != null &&
floorVerb.getKey().compareTo(sectionSpan[0]) >= 0 &&
//do not step over an noun
(floorNoun == null ||
floorVerb.getKey().compareTo(floorNoun) >= 0)){
@@ -475,7 +475,7 @@ public class SentimentSummarizationEngin
if(ceilingConjunction != null &&
ceilingConjunction.compareTo(
Integer.valueOf(Math.min(verb.getKey()+conjuctionContext,sectionSpan[1]))) >=
0){
//search an other verb in the same direction
- ceilingVerb =
verbs.floorEntry(Integer.valueOf(ceilingConjunction));
+ ceilingVerb = verbs.floorEntry(ceilingConjunction);
if(ceilingVerb != null &&
ceilingVerb.getKey().compareTo(sectionSpan[1]) <= 0 &&
//do not step over an noun
(ceilingNoun == null ||
ceilingVerb.getKey().compareTo(ceilingNoun) <= 0)){
Modified:
stanbol/branches/release-0.12/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/util/WordSentimentDictionary.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/util/WordSentimentDictionary.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/util/WordSentimentDictionary.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/util/WordSentimentDictionary.java
Wed Apr 16 04:22:30 2014
@@ -111,7 +111,7 @@ public class WordSentimentDictionary {
}
} //else already processed by special case size == 1
} else {
- old = entry.put(cat, Double.valueOf(sentiment));
+ old = entry.put(cat, sentiment);
}
} //else entry == null and sentiment == null ... nothing to do
if(replace){ //we have changed the entry instance and need to put
the word
Modified:
stanbol/branches/release-0.12/enhancement-engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/Mapping.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/Mapping.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/Mapping.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/Mapping.java
Wed Apr 16 04:22:30 2014
@@ -93,7 +93,7 @@ public abstract class Mapping {
map.put(null,null);
//Typed Literal values
map.put(XSD.anyURI,URI.class);
- map.put(XSD.base64Binary,new byte[]{}.getClass());
+ map.put(XSD.base64Binary, byte[].class);
map.put(XSD.boolean_,Boolean.class);
map.put(XSD.byte_,Byte.class);
map.put(XSD.date,Date.class);
Modified:
stanbol/branches/release-0.12/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
Wed Apr 16 04:22:30 2014
@@ -934,7 +934,7 @@ public class TopicClassificationEngine e
// batch over all the indexed topics
if (offset != null) {
query.addFilterQuery(conceptUriField + ":["
- +
ClientUtils.escapeQueryChars(offset.toString()) + " TO *]");
+ +
ClientUtils.escapeQueryChars(offset) + " TO *]");
}
QueryResponse response = solrServer.query(query);
int count = 0;
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextSerializerAndParserTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextSerializerAndParserTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextSerializerAndParserTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/AnalyzedTextSerializerAndParserTest.java
Wed Apr 16 04:22:30 2014
@@ -133,7 +133,7 @@ public class AnalyzedTextSerializerAndPa
0.5));
//use index to create Tokens
- int enhancerStart = sent1.getSpan().toString().indexOf("enhancer");
+ int enhancerStart = sent1.getSpan().indexOf("enhancer");
Token enhancer =
sent1.addToken(enhancerStart,enhancerStart+"enhancer".length());
expectedTokens.put(enhancer, "enhancer");
enhancer.addAnnotation(NlpAnnotations.POS_ANNOTATION, Value.value(
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/CorefFeatureSupportTest.java
Wed Apr 16 04:22:30 2014
@@ -91,7 +91,7 @@ public class CorefFeatureSupportTest ext
Token obama = sentence1.addToken(0, "Obama".length());
Sentence sentence2 = at.addSentence(sentenceText1.indexOf(".") + 2,
sentenceText2.indexOf(".") + 1);
- int heStartIdx = sentence2.getSpan().toString().indexOf("He");
+ int heStartIdx = sentence2.getSpan().indexOf("He");
Token he = sentence2.addToken(heStartIdx, heStartIdx + "He".length());
Set<Span> obamaMentions = new HashSet<Span>();
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/DependencyRelationSupportTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/DependencyRelationSupportTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/DependencyRelationSupportTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp-json/src/test/java/org/apache/stanbol/enhancer/nlp/json/valuetype/DependencyRelationSupportTest.java
Wed Apr 16 04:22:30 2014
@@ -117,10 +117,10 @@ public class DependencyRelationSupportTe
Sentence sentence = at.addSentence(0, text.indexOf(".") + 1);
Token obama = sentence.addToken(0, "Obama".length());
- int visitedStartIdx = sentence.getSpan().toString().indexOf("visited");
+ int visitedStartIdx = sentence.getSpan().indexOf("visited");
Token visited = sentence.addToken(visitedStartIdx, visitedStartIdx +
"visited".length());
- int chinaStartIdx = sentence.getSpan().toString().indexOf("China");
+ int chinaStartIdx = sentence.getSpan().indexOf("China");
Token china = sentence.addToken(chinaStartIdx, chinaStartIdx +
"China".length());
GrammaticalRelationTag nSubjGrammRelTag = new GrammaticalRelationTag(
Modified:
stanbol/branches/release-0.12/enhancer/generic/nlp/src/test/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/nlp/src/test/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/nlp/src/test/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/nlp/src/test/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextTest.java
Wed Apr 16 04:22:30 2014
@@ -106,7 +106,7 @@ public class AnalysedTextTest {
Token stanbol = sent1.addToken(4,11);
expectedTokens.put(stanbol, "Stanbol");
//use index to create Tokens
- int enhancerStart = sent1.getSpan().toString().indexOf("enhancer");
+ int enhancerStart = sent1.getSpan().indexOf("enhancer");
Token enhancer =
sent1.addToken(enhancerStart,enhancerStart+"enhancer".length());
expectedTokens.put(enhancer, "enhancer");
@@ -114,11 +114,11 @@ public class AnalysedTextTest {
Chunk stanbolEnhancer =
analysedTextWithData.addChunk(stanbol.getStart(), enhancer.getEnd());
expectedChunks.put(stanbolEnhancer, "Stanbol enhancer");
- int parisStart = sent1.getSpan().toString().indexOf("Paris");
+ int parisStart = sent1.getSpan().indexOf("Paris");
Token paris = sent1.addToken(parisStart, parisStart+5);
expectedTokens.put(paris, "Paris");
- int bobMarleyStart = sent1.getSpan().toString().indexOf("Bob Marley");
+ int bobMarleyStart = sent1.getSpan().indexOf("Bob Marley");
Chunk bobMarley = sent1.addChunk(bobMarleyStart, bobMarleyStart+10);
expectedChunks.put(bobMarley, "Bob Marley");
Token bob = bobMarley.addToken(0, 3);
@@ -131,7 +131,7 @@ public class AnalysedTextTest {
Token disambiguation = sent2.addToken(5, 5+"disambiguation".length());
expectedTokens.put(disambiguation, "disambiguation");
- int comedianBobMarleyIndex =
sent2.getSpan().toString().indexOf("Comedian");
+ int comedianBobMarleyIndex = sent2.getSpan().indexOf("Comedian");
Chunk comedianBobMarley = sent2.addChunk(comedianBobMarleyIndex,
comedianBobMarleyIndex+"Comedian Bob Marley".length());
expectedChunks.put(comedianBobMarley, "Comedian Bob Marley");
@@ -142,7 +142,7 @@ public class AnalysedTextTest {
Token marleySent2 = comedianBobMarley.addToken(13,
13+"Marley".length());
expectedTokens.put(marleySent2, "Marley");
- int parisIndex = sent2.getSpan().toString().indexOf("Paris");
+ int parisIndex = sent2.getSpan().indexOf("Paris");
Chunk parisInTexas = sent2.addChunk(parisIndex, parisIndex+"Paris in
Texas".length());
expectedChunks.put(parisInTexas, "Paris in Texas");
Token parisSent2 = parisInTexas.addToken(0, "Paris".length());
@@ -151,8 +151,8 @@ public class AnalysedTextTest {
Token in = parisInTexas.addToken(inIndex,
inIndex+2);
expectedTokens.put(in, "in");
- Token texasSent2 =
parisInTexas.addToken(parisInTexas.getSpan().toString().indexOf("Texas"),
-
parisInTexas.getSpan().toString().indexOf("Texas")+"Texas".length());
+ Token texasSent2 =
parisInTexas.addToken(parisInTexas.getSpan().indexOf("Texas"),
+ parisInTexas.getSpan().indexOf("Texas")+"Texas".length());
expectedTokens.put(texasSent2, "Texas");
}
@@ -180,17 +180,17 @@ public class AnalysedTextTest {
for(Entry<Sentence,String> sentEntry : expectedSentences.entrySet()){
Sentence sent = sentences.next();
Assert.assertEquals(sentEntry.getKey(), sent);
- Assert.assertEquals(sentEntry.getValue(),
sent.getSpan().toString());
+ Assert.assertEquals(sentEntry.getValue(), sent.getSpan());
}
for(Entry<Chunk,String> chunkEntry : expectedChunks.entrySet()){
Chunk chunk = chunks.next();
Assert.assertEquals(chunkEntry.getKey(), chunk);
- Assert.assertEquals(chunkEntry.getValue(),
chunk.getSpan().toString());
+ Assert.assertEquals(chunkEntry.getValue(), chunk.getSpan());
}
for(Entry<Token,String> tokenEntry : expectedTokens.entrySet()){
Token token = tokens.next();
Assert.assertEquals(tokenEntry.getKey(), token);
- Assert.assertEquals(tokenEntry.getValue(),
token.getSpan().toString());
+ Assert.assertEquals(tokenEntry.getValue(), token.getSpan());
}
}
Modified:
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/impl/ContentSourceTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/impl/ContentSourceTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/impl/ContentSourceTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/impl/ContentSourceTest.java
Wed Apr 16 04:22:30 2014
@@ -55,7 +55,7 @@ public class ContentSourceTest {
HEADERS.put("Accept-Language", Arrays.asList("en","de"));
}
protected static final String MT_WITH_PARAM = "text/plain; charset=UTF-8";
- protected static final byte[] DATA = new
String(TEST_STRING).getBytes(UTF8);
+ protected static final byte[] DATA = TEST_STRING.getBytes(UTF8);
/*
* Tests ensuring the IllegalArgumentExceptions if null is parsed as stream
Modified:
stanbol/branches/release-0.12/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
(original)
+++
stanbol/branches/release-0.12/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
Wed Apr 16 04:22:30 2014
@@ -202,7 +202,7 @@ public final class FieldMappingUtils {
if(mappingString != null &&
!mappingString.isEmpty() && //not an empty line
!(mappingString.charAt(0) == FieldMapping.COMMENT_CHAR)){
//not an comment
- FieldMapping fieldMapping =
parseFieldMapping(mappingString.toString(),nps);
+ FieldMapping fieldMapping =
parseFieldMapping(mappingString,nps);
if(fieldMapping != null){
fieldMappings.add(fieldMapping);
} else {
Modified:
stanbol/branches/release-0.12/entityhub/jersey/src/test/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtilsTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/test/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtilsTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/entityhub/jersey/src/test/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtilsTest.java
(original)
+++
stanbol/branches/release-0.12/entityhub/jersey/src/test/java/org/apache/stanbol/entityhub/jersey/utils/JerseyUtilsTest.java
Wed Apr 16 04:22:30 2014
@@ -42,7 +42,7 @@ public class JerseyUtilsTest {
public void testType(){
Assert.assertTrue(JerseyUtils.testType(Map.class, HashMap.class));
Assert.assertFalse(JerseyUtils.testType(Map.class, HashSet.class));
- Assert.assertTrue(JerseyUtils.testType(Map.class, new
HashMap<String,String>().getClass()));
+ Assert.assertTrue(JerseyUtils.testType(Map.class, HashMap.class));
Map<String,Collection<? extends Number>> genericMapTest = new
TestMap();
Assert.assertTrue(JerseyUtils.testType(Map.class,
genericMapTest.getClass()));
Assert.assertFalse(JerseyUtils.testType(Set.class,
genericMapTest.getClass()));
Modified:
stanbol/branches/release-0.12/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java
(original)
+++
stanbol/branches/release-0.12/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java
Wed Apr 16 04:22:30 2014
@@ -66,7 +66,7 @@ public final class RdfResourceUtils {
Byte("byte",Integer.class),
//Float("float",Double.class),
Double("double",Double.class),
- Base64Binary("base64Binary",new byte[0].getClass()),
+ Base64Binary("base64Binary", byte[].class),
DateTime("dateTime",Date.class),
//Date("date"),
//Time("time"),
Modified:
stanbol/branches/release-0.12/entityhub/model/sesame/src/test/java/org/apache/stanbol/entityhub/model/sesame/RdfRepresentationTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/model/sesame/src/test/java/org/apache/stanbol/entityhub/model/sesame/RdfRepresentationTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/entityhub/model/sesame/src/test/java/org/apache/stanbol/entityhub/model/sesame/RdfRepresentationTest.java
(original)
+++
stanbol/branches/release-0.12/entityhub/model/sesame/src/test/java/org/apache/stanbol/entityhub/model/sesame/RdfRepresentationTest.java
Wed Apr 16 04:22:30 2014
@@ -107,7 +107,7 @@ public class RdfRepresentationTest exten
assertTrue(enLangaugeTexts.hasNext());
Text enLangageText = enLangaugeTexts.next();
assertEquals(enLiteral.getLabel(), enLangageText.getText());
- assertEquals(enLiteral.getLanguage().toString(),
enLangageText.getLanguage());
+ assertEquals(enLiteral.getLanguage(), enLangageText.getLanguage());
assertFalse(enLangaugeTexts.hasNext());//only a single result
//3) test to get all natural language values
Set<String> stringValues = new HashSet<String>();
Modified:
stanbol/branches/release-0.12/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/GtEncoder.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/GtEncoder.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/GtEncoder.java
(original)
+++
stanbol/branches/release-0.12/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/GtEncoder.java
Wed Apr 16 04:22:30 2014
@@ -57,7 +57,7 @@ public class GtEncoder implements IndexC
}
String geConstraint = String.format("{%s ",
indexValue != null && indexValue.getValue() != null
- && !indexValue.getValue().toString().isEmpty() ?
indexValue.getValue() : DEFAULT);
+ && !indexValue.getValue().isEmpty() ?
indexValue.getValue() : DEFAULT);
constraint.addEncoded(POS, geConstraint);
}
Modified:
stanbol/branches/release-0.12/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/util/OntologyUtils.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/util/OntologyUtils.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/util/OntologyUtils.java
(original)
+++
stanbol/branches/release-0.12/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/util/OntologyUtils.java
Wed Apr 16 04:22:30 2014
@@ -28,6 +28,7 @@ import static org.apache.stanbol.commons
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import org.apache.stanbol.commons.owl.util.URIUtils;
@@ -96,8 +97,7 @@ public final class OntologyUtils {
public static List<String> getPreferredFormats() {
List<String> result = new ArrayList<String>();
- for (String f : preferredFormats)
- result.add(f);
+ Collections.addAll(result, preferredFormats);
return result;
}
Modified:
stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java
(original)
+++
stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java
Wed Apr 16 04:22:30 2014
@@ -313,7 +313,7 @@ public class SessionImpl extends Abstrac
@Override
public String toString() {
- return getID().toString();
+ return getID();
}
}
Modified:
stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java
(original)
+++
stanbol/branches/release-0.12/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java
Wed Apr 16 04:22:30 2014
@@ -289,7 +289,7 @@ public class SessionManagerImpl implemen
* Throw the duplicate ID exception first, in case developers decide
to reuse the existing session
* before creating a new one.
*/
- if (sessionsByID.containsKey(sessionID)) throw new
DuplicateSessionIDException(sessionID.toString());
+ if (sessionsByID.containsKey(sessionID)) throw new
DuplicateSessionIDException(sessionID);
checkSessionLimit();
IRI ns = IRI.create(getDefaultNamespace() + getID() + "/");
Session session = new SessionImpl(sessionID, ns, ontologyProvider);
Modified:
stanbol/branches/release-0.12/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java
(original)
+++
stanbol/branches/release-0.12/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java
Wed Apr 16 04:22:30 2014
@@ -165,7 +165,7 @@ public class ClerezzaAdpterTest {
String query = "CONSTRUCT { ?x
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://kres.iks-project.eu/ontology.owl#OldPerson> . } WHERE { ?x
<http://kres.iks-project.eu/ontology.owl#age> ?age . ?x
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
<http://kres.iks-project.eu/ontology.owl#Person> . FILTER
<http://www.w3.org/2005/xpath-functions#ends-with>(?t,\"string\") . FILTER
((?age) > (((\"70\"^^<http://www.w3.org/2001/XMLSchema#string>) - (?k)) +
(?z))) }";
- QueryParser.getInstance().parse(query.toString());
+ QueryParser.getInstance().parse(query);
Assert.assertTrue(true);
} catch (ParseException e) {
Modified:
stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/DifferentAtom.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/DifferentAtom.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/DifferentAtom.java
(original)
+++
stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/DifferentAtom.java
Wed Apr 16 04:22:30 2014
@@ -50,8 +50,8 @@ public class DifferentAtom extends Abstr
String argument1 = sparqlArgument1.getObject();
String argument2 = sparqlArgument2.getObject();
- argument1 = argument1.toString().replace(Symbols.variablesPrefix, "");
- argument2 = argument2.toString().replace(Symbols.variablesPrefix, "");
+ argument1 = argument1.replace(Symbols.variablesPrefix, "");
+ argument2 = argument2.replace(Symbols.variablesPrefix, "");
StringBuilder sb = new StringBuilder();
sb.append("(");
Modified:
stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/TypedLiteralAtom.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/TypedLiteralAtom.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/TypedLiteralAtom.java
(original)
+++
stanbol/branches/release-0.12/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/atoms/TypedLiteralAtom.java
Wed Apr 16 04:22:30 2014
@@ -61,7 +61,7 @@ public class TypedLiteralAtom extends Ab
String xsdType = "<" + xsdTypeResource.getURI().toString() + ">";
- return (T) new SPARQLFunction(value + "^^" + xsdType.toString());
+ return (T) new SPARQLFunction(value + "^^" + xsdType);
}
}
Modified:
stanbol/branches/release-0.12/rules/adapters/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/adapters/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/rules/adapters/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java
(original)
+++
stanbol/branches/release-0.12/rules/adapters/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java
Wed Apr 16 04:22:30 2014
@@ -130,7 +130,7 @@ public class SPARQLAdpterTest {
List<String> rules = (List<String>)
ruleAdapter.adaptTo(recipeGood, List.class);
for (String rule : rules) {
- log.debug(rule.toString());
+ log.debug(rule);
Assert.fail("The adapter for SPARQL should not accept " +
List.class.getCanonicalName()
+ " objects.");
}
Modified:
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumberAtom.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumberAtom.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumberAtom.java
(original)
+++
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/atoms/NumberAtom.java
Wed Apr 16 04:22:30 2014
@@ -31,7 +31,7 @@ public class NumberAtom extends NumericF
@Override
public String toString() {
- return numberString.toString();
+ return numberString;
}
@Override
Modified:
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java
(original)
+++
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/ParseException.java
Wed Apr 16 04:22:30 2014
@@ -173,7 +173,7 @@ public class ParseException extends Exce
default:
if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
String s = "0000" + Integer.toString(ch, 16);
- retval.append("\\u" + s.substring(s.length() - 4,
s.length()));
+ retval.append("\\u").append(s.substring(s.length() - 4,
s.length()));
} else {
retval.append(ch);
}
Modified:
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
(original)
+++
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
Wed Apr 16 04:22:30 2014
@@ -461,7 +461,7 @@ public class RuleParserImpl implements R
final public StringAtom stringAtom() throws ParseException {
String obj;
obj = getStringValue();
- {if (true) return new
StringAtom(obj.toString());}
+ {if (true) return new StringAtom(obj);}
throw new Error("Missing return statement in function");
}
Modified:
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/TokenMgrError.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/TokenMgrError.java?rev=1587797&r1=1587796&r2=1587797&view=diff
==============================================================================
---
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/TokenMgrError.java
(original)
+++
stanbol/branches/release-0.12/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/TokenMgrError.java
Wed Apr 16 04:22:30 2014
@@ -82,7 +82,7 @@ public class TokenMgrError extends Error
default:
if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
String s = "0000" + Integer.toString(ch, 16);
- retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+ retval.append("\\u").append(s.substring(s.length() - 4,
s.length()));
} else {
retval.append(ch);
}
