Author: rwesten
Date: Tue Apr 15 13:00:28 2014
New Revision: 1587566
URL: http://svn.apache.org/r1587566
Log:
applied patch for STANBOL-1316 to 0.12
Modified:
stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/impl/RdfProxyInvocationHandler.java
stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/rdfentities/RdfEntityFactoryTest.java
stanbol/branches/release-0.12/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java
stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
Modified:
stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/impl/RdfProxyInvocationHandler.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/impl/RdfProxyInvocationHandler.java?rev=1587566&r1=1587565&r2=1587566&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/impl/RdfProxyInvocationHandler.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/impl/RdfProxyInvocationHandler.java
Tue Apr 15 13:00:28 2014
@@ -71,10 +71,10 @@ public class RdfProxyInvocationHandler i
static {
try {
- getIDMethod = RdfEntity.class.getMethod("getId", new Class<?>[]{});
- toString = Object.class.getMethod("toString", new Class<?>[]{});
- equals = Object.class.getMethod("equals", new
Class<?>[]{Object.class});
- hashCode = Object.class.getMethod("hashCode", new Class<?>[]{});
+ getIDMethod = RdfEntity.class.getMethod("getId");
+ toString = Object.class.getMethod("toString");
+ equals = Object.class.getMethod("equals", Object.class);
+ hashCode = Object.class.getMethod("hashCode");
} catch (SecurityException e) {
throw new IllegalStateException("Unable to access getId Method in
the "+RdfEntity.class+" Interface",e);
} catch (NoSuchMethodException e) {
Modified:
stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/rdfentities/RdfEntityFactoryTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/rdfentities/RdfEntityFactoryTest.java?rev=1587566&r1=1587565&r2=1587566&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/rdfentities/RdfEntityFactoryTest.java
(original)
+++
stanbol/branches/release-0.12/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/rdfentities/RdfEntityFactoryTest.java
Tue Apr 15 13:00:28 2014
@@ -211,7 +211,7 @@ public class RdfEntityFactoryTest {
UriRef node2 = new UriRef(testUri2);
UriRef node3 = new UriRef(testUri3);
SubTestRdfEntity entity = factory.getProxy(node,
SubTestRdfEntity.class);
- TestRdfEntity entity2 = factory.getProxy(node2,
TestRdfEntity.class,new
Class<?>[]{SubTestRdfEntity.class,TestRdfEntity2.class});
+ TestRdfEntity entity2 = factory.getProxy(node2, TestRdfEntity.class,
SubTestRdfEntity.class, TestRdfEntity2.class);
TestRdfEntity entity3 = factory.getProxy(node3, TestRdfEntity.class);
//Start with checking the types for entity2
Modified:
stanbol/branches/release-0.12/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java?rev=1587566&r1=1587565&r2=1587566&view=diff
==============================================================================
---
stanbol/branches/release-0.12/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java
(original)
+++
stanbol/branches/release-0.12/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java
Tue Apr 15 13:00:28 2014
@@ -971,7 +971,7 @@ public abstract class RepresentationTest
Representation rep = initNaturalLanguageTest(field);
Set<String> textSet = new HashSet<String>(NL_TEST_all);
// remove a string value by parsing an empty list of languages
- rep.removeNaturalText(field, NL_TEST_string, new String[] {});
+ rep.removeNaturalText(field, NL_TEST_string);
textSet.addAll(Arrays.asList(NL_TEST_string, NL_TEST_noLang,
NL_TEST_en, NL_TEST_en2, NL_TEST_de,
NL_TEST_de_AT));
for (Iterator<Text> texts = rep.getText(field); texts.hasNext();
textSet.remove(texts.next()
@@ -1085,7 +1085,7 @@ public abstract class RepresentationTest
String testReference = "http://www.test.org/test";;
rep.addReference(field, testReference);
// test removal of all natural language values by parsing an empty
language array
- rep.removeAllNaturalText(field, new String[] {});
+ rep.removeAllNaturalText(field);
Iterator<Text> texts = rep.get(field, (String[]) null);
assertFalse(texts.hasNext());
assertTrue(rep.get(field).hasNext()); // text of the added reference
is still present
Modified:
stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java?rev=1587566&r1=1587565&r2=1587566&view=diff
==============================================================================
---
stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
(original)
+++
stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
Tue Apr 15 13:00:28 2014
@@ -647,8 +647,8 @@ public class OntoNetRootResource extends
formats = Collections.singletonList(format);
} else // The RESTful API has its own list of preferred formats
{
- formats = Arrays.asList(new String[]{RDF_XML, TURTLE,
X_TURTLE, N3, N_TRIPLE, OWL_XML,
- FUNCTIONAL_OWL, MANCHESTER_OWL, RDF_JSON});
+ formats = Arrays.asList(RDF_XML, TURTLE, X_TURTLE, N3,
N_TRIPLE, OWL_XML,
+ FUNCTIONAL_OWL, MANCHESTER_OWL, RDF_JSON);
}
int unsupported = 0, failed = 0;
Iterator<String> itf = formats.iterator();
Modified:
stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1587566&r1=1587565&r2=1587566&view=diff
==============================================================================
---
stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
(original)
+++
stanbol/branches/release-0.12/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
Tue Apr 15 13:00:28 2014
@@ -667,8 +667,8 @@ public class ScopeResource extends Abstr
List<String> formats;
if (format != null && !format.trim().isEmpty()) formats =
Collections.singletonList(format);
else // The RESTful API has its own list of preferred formats
- formats = Arrays.asList(new String[] {RDF_XML, TURTLE,
X_TURTLE, N3, N_TRIPLE, OWL_XML,
- FUNCTIONAL_OWL,
MANCHESTER_OWL, RDF_JSON});
+ formats = Arrays.asList(RDF_XML, TURTLE, X_TURTLE, N3,
N_TRIPLE, OWL_XML,
+ FUNCTIONAL_OWL, MANCHESTER_OWL, RDF_JSON);
int unsupported = 0, failed = 0;
Iterator<String> itf = formats.iterator();
if (!itf.hasNext()) throw new OntologyLoadingException("No
suitable format found or defined.");
