You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2014/04/16 07:22:43 UTC
svn commit: r1587805 - in /stanbol/trunk:
commons/caslight/src/main/java/org/apache/stanbol/commons/caslight/
commons/owl/src/main/java/org/apache/stanbol/commons/owl/
commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/
commons/owl...
Author: rwesten
Date: Wed Apr 16 05:22:42 2014
New Revision: 1587805
URL: http://svn.apache.org/r1587805
Log:
applied patch for STANBOL-1310 with some additional changes (see issue for details)
Modified:
stanbol/trunk/commons/caslight/src/main/java/org/apache/stanbol/commons/caslight/FeatureStructureListHolder.java
stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/RunSingleSPARQL.java
stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java
stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java
stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/RunSingleSPARQLTest.java
stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java
stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractionRegistry.java
stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractor.java
stanbol/trunk/enhancement-engines/langdetect/src/main/java/org/apache/stanbol/enhancer/engines/langdetect/LanguageIdentifier.java
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/impl/ContentItemImpl.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java
stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java
Modified: stanbol/trunk/commons/caslight/src/main/java/org/apache/stanbol/commons/caslight/FeatureStructureListHolder.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/caslight/src/main/java/org/apache/stanbol/commons/caslight/FeatureStructureListHolder.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/commons/caslight/src/main/java/org/apache/stanbol/commons/caslight/FeatureStructureListHolder.java (original)
+++ stanbol/trunk/commons/caslight/src/main/java/org/apache/stanbol/commons/caslight/FeatureStructureListHolder.java Wed Apr 16 05:22:42 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.commons.casli
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -26,7 +27,7 @@ import java.util.Set;
*/
public class FeatureStructureListHolder {
- private HashMap<String,List<FeatureStructure>> holder = new HashMap<String,List<FeatureStructure>>();
+ private Map<String,List<FeatureStructure>> holder = new HashMap<String,List<FeatureStructure>>();
/**
* Adds a new FeatureStructure List to this holder.
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/RunSingleSPARQL.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/RunSingleSPARQL.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/RunSingleSPARQL.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/RunSingleSPARQL.java Wed Apr 16 05:22:42 2014
@@ -42,7 +42,7 @@ public class RunSingleSPARQL {
private OWLOntology owlmodel;
private OntModel jenamodel;
- private HashMap<String,String> sparqlprefix;
+ private Map<String,String> sparqlprefix;
/**
* Constructor to create an OWLOntology object where run the SPARQL query.
@@ -57,7 +57,7 @@ public class RunSingleSPARQL {
this.jenamodel = j2o.ModelOwlToJenaConvert(owlmodel,"RDF/XML");
Iterator<String> iter = jenamodel.getNsPrefixMap().keySet().iterator();
Map<String, String> map = jenamodel.getNsPrefixMap();
- this.sparqlprefix = (HashMap<String, String>) map;
+ this.sparqlprefix = map;
while(iter.hasNext()){
String k = iter.next();
@@ -83,7 +83,7 @@ public class RunSingleSPARQL {
* @param owl {The OWLOntology to be querying}
* @param prefix {The map where the keys are the prefix label and the value the IRI of the prefix on the form: http://www.w3.org/2000/01/rdf-schema#.}
*/
- public RunSingleSPARQL(OWLOntology owl, HashMap<String,String> prefix){
+ public RunSingleSPARQL(OWLOntology owl, Map<String,String> prefix){
this.owlmodel = owl;
JenaToOwlConvert j2o = new JenaToOwlConvert();
this.jenamodel = j2o.ModelOwlToJenaConvert(owlmodel,"RDF/XML");
@@ -105,7 +105,7 @@ public class RunSingleSPARQL {
*
* @return {Return a prefix mapping.}
*/
- public HashMap<String,String> getSPARQLprefix(){
+ public Map<String,String> getSPARQLprefix(){
return this.sparqlprefix;
}
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/JenaToClerezzaConverter.java Wed Apr 16 05:22:42 2014
@@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.Triple;
@@ -63,7 +64,7 @@ public final class JenaToClerezzaConvert
* @param model {@link Model}
* @return an {@link ArrayList} that contains the generated Clerezza triples (see {@link Triple})
*/
- public static ArrayList<Triple> jenaModelToClerezzaTriples(Model model){
+ public static List<Triple> jenaModelToClerezzaTriples(Model model){
ArrayList<Triple> clerezzaTriples = new ArrayList<Triple>();
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/transformation/OWLAPIToClerezzaConverter.java Wed Apr 16 05:22:42 2014
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.Triple;
@@ -79,7 +80,7 @@ public final class OWLAPIToClerezzaConve
* {@link OWLOntology}
* @return an {@link ArrayList} that contains the generated Clerezza triples (see {@link Triple})
*/
- public static ArrayList<Triple> owlOntologyToClerezzaTriples(OWLOntology ontology) {
+ public static List<Triple> owlOntologyToClerezzaTriples(OWLOntology ontology) {
ArrayList<Triple> clerezzaTriples = new ArrayList<Triple>();
TripleCollection mGraph = owlOntologyToClerezzaMGraph(ontology);
Iterator<Triple> tripleIterator = mGraph.iterator();
Modified: stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/RunSingleSPARQLTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/RunSingleSPARQLTest.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/RunSingleSPARQLTest.java (original)
+++ stanbol/trunk/commons/owl/src/test/java/org/apache/stanbol/commons/owl/RunSingleSPARQLTest.java Wed Apr 16 05:22:42 2014
@@ -25,6 +25,7 @@ import static org.junit.Assert.*;
import java.io.File;
import java.util.HashMap;
+import java.util.Map;
import org.apache.stanbol.commons.owl.RunSingleSPARQL;
import org.junit.After;
@@ -76,7 +77,7 @@ public class RunSingleSPARQLTest {
@Test
public void testGetSPARQLprefix() {
- HashMap<String,String> map = new HashMap();
+ Map<String,String> map = new HashMap<String,String>();
map.put("rdfs","<http://www.w3.org/2000/01/rdf-schema#>");
map.put("xsd","<http://www.w3.org/2000/01/rdf-schema#>");
map.put("owl","<http://www.w3.org/2000/01/rdf-schema#>");
@@ -84,8 +85,8 @@ public class RunSingleSPARQLTest {
map.put("ex","<http://www.w3.org/1999/02/22-rdf-syntax-ns#>");
RunSingleSPARQL instance = new RunSingleSPARQL(owl,map);
- HashMap expResult = map;
- HashMap result = instance.getSPARQLprefix();
+ Map<String,String> expResult = map;
+ Map<String,String> result = instance.getSPARQLprefix();
if(!result.isEmpty()){
assertEquals(expResult, result);
}else{
@@ -102,7 +103,7 @@ public class RunSingleSPARQLTest {
String label = "mylabel";
String prefix = "<http://prova.mylabel.org#>";
- HashMap<String,String> map = new HashMap();
+ Map<String,String> map = new HashMap<String,String>();
map.put("rdfs","http://www.w3.org/2000/01/rdf-schema#");
map.put("xsd","<http://www.w3.org/2000/01/rdf-schema#>");
map.put("owl","<http://www.w3.org/2000/01/rdf-schema#>");
@@ -112,7 +113,7 @@ public class RunSingleSPARQLTest {
RunSingleSPARQL instance = new RunSingleSPARQL(owl,map);
boolean result = instance.addSPARQLprefix(label, prefix);
if(result){
- HashMap<String, String> mymap = instance.getSPARQLprefix();
+ Map<String, String> mymap = instance.getSPARQLprefix();
assertEquals(prefix, mymap.get(label));
// TODO review the generated test code and remove the default call to fail.
@@ -127,7 +128,7 @@ public class RunSingleSPARQLTest {
@Test
public void testRemoveSPARQLprefix() {
- HashMap<String,String> map = new HashMap();
+ Map<String,String> map = new HashMap<String,String>();
map.put("rdfs","<http://www.w3.org/2000/01/rdf-schema#>");
map.put("xsd","<http://www.w3.org/2000/01/rdf-schema#>");
map.put("owl","<http://www.w3.org/2000/01/rdf-schema#>");
@@ -138,7 +139,7 @@ public class RunSingleSPARQLTest {
boolean result = instance.removeSPARQLprefix("ex");
if(result){
- HashMap<String, String> mymap = instance.getSPARQLprefix();
+ Map<String, String> mymap = instance.getSPARQLprefix();
assertEquals(false, mymap.containsKey("ex"));
// TODO review the generated test code and remove the default call to fail.
}else{
@@ -151,7 +152,7 @@ public class RunSingleSPARQLTest {
*/
@Test
public void testRunSPARQL() {
- HashMap<String,String> map = new HashMap();
+ Map<String,String> map = new HashMap<String,String>();
map.put("rdfs","<http://www.w3.org/2000/01/rdf-schema#>");
map.put("xsd","<http://www.w3.org/2000/01/rdf-schema#>");
map.put("owl","<http://www.w3.org/2000/01/rdf-schema#>");
Modified: stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java (original)
+++ stanbol/trunk/commons/security/usermanagement/src/main/java/org/apache/stanbol/commons/usermanagement/resource/UserResource.java Wed Apr 16 05:22:42 2014
@@ -1044,7 +1044,7 @@ public class UserResource {
* @param object
* @return
*/
- private ArrayList<Triple> filterToArray(NonLiteral subject, UriRef predicate, Resource object) {
+ private List<Triple> filterToArray(NonLiteral subject, UriRef predicate, Resource object) {
Iterator<Triple> triples = systemGraph.filter(subject, predicate, object);
ArrayList<Triple> buffer = new ArrayList<Triple>();
Lock readLock = systemGraph.getLock().readLock();
Modified: stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java (original)
+++ stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/resource/SparqlEndpointResource.java Wed Apr 16 05:22:42 2014
@@ -19,11 +19,7 @@ package org.apache.stanbol.commons.web.s
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
import javax.ws.rs.Consumes;
import javax.ws.rs.FormParam;
@@ -188,14 +184,14 @@ public class SparqlEndpointResource exte
}
private TripleCollection getTripleCollection(String graphUri) throws InvalidSyntaxException {
- LinkedHashMap<ServiceReference,TripleCollection> services = getServices(graphUri);
+ Map<ServiceReference,TripleCollection> services = getServices(graphUri);
if (services != null && services.size() > 0) {
return services.get(services.keySet().iterator().next());
}
return null;
}
- private void populateTripleCollectionList(LinkedHashMap<ServiceReference,TripleCollection> services) {
+ private void populateTripleCollectionList(Map<ServiceReference,TripleCollection> services) {
if (services != null) {
for (ServiceReference service : services.keySet()) {
Object graphUri = service.getProperty(GRAPH_URI);
@@ -213,8 +209,8 @@ public class SparqlEndpointResource exte
}
}
- private LinkedHashMap<ServiceReference,TripleCollection> getServices(String graphUri) throws InvalidSyntaxException {
- LinkedHashMap<ServiceReference,TripleCollection> registeredGraphs = new LinkedHashMap<ServiceReference,TripleCollection>();
+ private Map<ServiceReference,TripleCollection> getServices(String graphUri) throws InvalidSyntaxException {
+ Map<ServiceReference,TripleCollection> registeredGraphs = new LinkedHashMap<ServiceReference,TripleCollection>();
ServiceReference[] refs = bundleContext.getServiceReferences(TripleCollection.class.getName(),
getFilter(graphUri));
if (refs != null) {
Modified: stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java (original)
+++ stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java Wed Apr 16 05:22:42 2014
@@ -96,7 +96,7 @@ public class EntityLinker {
// private int numLabels = 0;
private long processingTime = -1;
- private HashMap<List<String>,List<Entity>> lookupCache;
+ private Map<List<String>,List<Entity>> lookupCache;
public EntityLinker(AnalysedText analysedText, String language,
Modified: stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractionRegistry.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractionRegistry.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractionRegistry.java (original)
+++ stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractionRegistry.java Wed Apr 16 05:22:42 2014
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
@@ -55,8 +56,8 @@ public class HtmlExtractionRegistry {
private static final Logger LOG =
LoggerFactory.getLogger(HtmlExtractionRegistry.class);
- private HashMap<String, HtmlExtractionComponent> registry;
- private HashSet<String> activeExtractors;
+ private Map<String, HtmlExtractionComponent> registry;
+ private Set<String> activeExtractors;
public HtmlExtractionRegistry() {
@@ -190,11 +191,11 @@ public class HtmlExtractionRegistry {
}
}
- public HashMap<String, HtmlExtractionComponent> getRegistry() {
+ public Map<String, HtmlExtractionComponent> getRegistry() {
return registry;
}
- public void setRegistry(HashMap<String, HtmlExtractionComponent> registry) {
+ public void setRegistry(Map<String, HtmlExtractionComponent> registry) {
this.registry = registry;
}
@@ -202,7 +203,7 @@ public class HtmlExtractionRegistry {
return activeExtractors;
}
- public void setActiveExtractors(HashSet<String> activeExtractors) {
+ public void setActiveExtractors(Set<String> activeExtractors) {
this.activeExtractors = activeExtractors;
}
Modified: stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractor.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractor.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractor.java (original)
+++ stanbol/trunk/enhancement-engines/htmlextractor/src/main/java/org/apache/stanbol/enhancer/engines/htmlextractor/impl/HtmlExtractor.java Wed Apr 16 05:22:42 2014
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
@@ -93,7 +93,7 @@ public class HtmlExtractor {
encoding = charset.name();
}
Document doc = htmlParser.getDOM(input, encoding);
- HashMap<String, HtmlExtractionComponent> extractors =
+ Map<String, HtmlExtractionComponent> extractors =
registry.getRegistry();
List<String> formats = new ArrayList<String>();
long modelSize = result.size();
Modified: stanbol/trunk/enhancement-engines/langdetect/src/main/java/org/apache/stanbol/enhancer/engines/langdetect/LanguageIdentifier.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/langdetect/src/main/java/org/apache/stanbol/enhancer/engines/langdetect/LanguageIdentifier.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/langdetect/src/main/java/org/apache/stanbol/enhancer/engines/langdetect/LanguageIdentifier.java (original)
+++ stanbol/trunk/enhancement-engines/langdetect/src/main/java/org/apache/stanbol/enhancer/engines/langdetect/LanguageIdentifier.java Wed Apr 16 05:22:42 2014
@@ -81,7 +81,7 @@ public class LanguageIdentifier {
return detector.detect();
}
- public ArrayList<Language> getLanguages(String text) throws LangDetectException {
+ public List<Language> getLanguages(String text) throws LangDetectException {
Detector detector = DetectorFactory.create();
detector.append(text);
return detector.getProbabilities();
Modified: stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java Wed Apr 16 05:22:42 2014
@@ -295,7 +295,7 @@ public final class ContentItemHelper {
* @param clazz the class of the content part
* @return the Map with the {@link UriRef id}s and the content as entries.
*/
- public static <T> LinkedHashMap<UriRef,T> getContentParts(ContentItem ci, Class<T> clazz){
+ public static <T> Map<UriRef,T> getContentParts(ContentItem ci, Class<T> clazz){
if(ci == null){
throw new IllegalArgumentException("The parsed ContentItem MUST NOT be NULL!");
}
Modified: stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/impl/ContentItemImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/impl/ContentItemImpl.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/impl/ContentItemImpl.java (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/impl/ContentItemImpl.java Wed Apr 16 05:22:42 2014
@@ -61,7 +61,7 @@ public abstract class ContentItemImpl im
/**
* Holds the content parts of this ContentItem
*/
- private final LinkedHashMap<UriRef, Object> parts = new LinkedHashMap<UriRef, Object>();
+ private final Map<UriRef, Object> parts = new LinkedHashMap<UriRef, Object>();
/**
* The uri of the ContentItem
*/
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java Wed Apr 16 05:22:42 2014
@@ -150,7 +150,7 @@ public class ContentItemResource extends
private ChainExecution chainExecution;
- private ArrayList<org.apache.stanbol.enhancer.servicesapi.helper.execution.Execution> engineExecutions;
+ private List<org.apache.stanbol.enhancer.servicesapi.helper.execution.Execution> engineExecutions;
private EnhancementException enhancementException;
private LayoutConfiguration layoutConfiguration;
Modified: stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java (original)
+++ stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/GenericEnhancerUiResource.java Wed Apr 16 05:22:42 2014
@@ -77,8 +77,8 @@ public class GenericEnhancerUiResource e
*/
//protected QueryEngine queryEngine;
protected final Serializer serializer;
- private LinkedHashSet<ExecutionNode> _executionNodes;
- private LinkedHashSet<ExecutionNode> _activeNodes;
+ private Set<ExecutionNode> _executionNodes;
+ private Set<ExecutionNode> _activeNodes;
protected final Chain chain;
public GenericEnhancerUiResource(String chainName,
Modified: stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java?rev=1587805&r1=1587804&r2=1587805&view=diff
==============================================================================
--- stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java (original)
+++ stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java Wed Apr 16 05:22:42 2014
@@ -19,19 +19,7 @@ package org.apache.stanbol.entityhub.ldp
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
import java.util.concurrent.ThreadPoolExecutor;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
@@ -74,7 +62,7 @@ public abstract class AbstractBackend im
private static final int LRU_CACHE_SIZE = 1000;
@SuppressWarnings("serial")
- private final LinkedHashMap<String,Representation> lru =
+ private final Map<String,Representation> lru =
new LinkedHashMap<String,Representation>(LRU_CACHE_SIZE+1, 0.75f, true){
@Override
protected boolean removeEldestEntry(java.util.Map.Entry<String,Representation> eldest) {