Merge branch 'RDF_Ontology_Graph' of github.com:dice-group/ida into R…

…DF_Ontology_Graph � Conflicts: � ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
dice-group · Jan 14, 2020 · 3c2afa9 · 3c2afa9
2 parents 4b112be + c808440
commit 3c2afa9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js b/ida-chatbot/src/assets/rdfontology/d3v4-rdf-ontology-graph-view.js
@@ -649,7 +649,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
         var tempNodeContains = [];
         nodeContents.forEach(function(val) {
             if (val.label === nodeIdVal) {
-                tempNodeContains = val.contents
+                tempNodeContains = val.contents;
             }
         });
 
@@ -879,7 +879,7 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
     }
 
     function zoomActions() {
-        g.attr("transform", d3.event.transform)
+        g.attr("transform", d3.event.transform);
     }
 
     function update() 
@@ -1145,4 +1145,4 @@ function createV4RDFOntologyGraph(figId, svgId, fileName, displayDeustch, displa
       d.fy = null;
   }
 
-};
+};
diff --git a/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java b/ida-ws/src/main/java/upb/ida/ontologyexplorer/OntologyExplorer.java
@@ -1,7 +1,13 @@
 package upb.ida.ontologyexplorer;
 
 import org.apache.jena.graph.Triple;
-import org.apache.jena.query.*;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.ResultSetFactory;
+import org.apache.jena.query.QuerySolution;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdfconnection.RDFConnectionFuseki;