Skip to content
This repository was archived by the owner on Oct 8, 2020. It is now read-only.

Commit 8912cff

Browse files
Get rid of deprecation warnings caused by JGraphT 1.1.0 update
1 parent d2effcb commit 8912cff

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

  • sansa-inference-common/src/main/scala/net/sansa_stack/inference/utils

sansa-inference-common/src/main/scala/net/sansa_stack/inference/utils/GraphUtils.scala

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package net.sansa_stack.inference.utils
33
import java.io.{ByteArrayOutputStream, File, FileOutputStream, FileWriter}
44

55
import scalax.collection.edge.LDiEdge
6-
76
import com.itextpdf.text.PageSize
87
import org.apache.jena.graph.Node
98
import org.apache.jena.reasoner.TriplePattern
@@ -19,13 +18,12 @@ import org.gephi.layout.plugin.force.yifanHu.YifanHuLayout
1918
import org.gephi.preview.api.{Item, PreviewController, PreviewProperty}
2019
import org.gephi.preview.types.EdgeColor
2120
import org.gephi.project.api.ProjectController
22-
import org.jgrapht.DirectedGraph
21+
import org.jgrapht.{DirectedGraph, Graph}
2322
import org.jgrapht.alg.isomorphism.VF2GraphIsomorphismInspector
24-
import org.jgrapht.ext._
25-
import org.jgrapht.graph._
2623
import org.openide.util.Lookup
27-
28-
import net.sansa_stack.inference.utils.graph.{EdgeEquivalenceComparator, LabeledEdge, NodeEquivalenceComparator};
24+
import net.sansa_stack.inference.utils.graph.{EdgeEquivalenceComparator, LabeledEdge, NodeEquivalenceComparator}
25+
import org.jgrapht.graph.{DefaultDirectedGraph, DirectedPseudograph}
26+
import org.jgrapht.io.{ComponentNameProvider, GraphMLExporter, IntegerComponentNameProvider};
2927

3028
/**
3129
* @author Lorenz Buehmann
@@ -52,8 +50,8 @@ object GraphUtils {
5250
* @param graph the 'Graph for Scala' graph
5351
* @return the JGraphT graph
5452
*/
55-
def asJGraphtRuleGraph(graph: scalax.collection.mutable.Graph[Node, LDiEdge]): DirectedGraph[Node, LabeledEdge[Node, String]] = {
56-
val g: DirectedGraph[Node, LabeledEdge[Node, String]] = new DefaultDirectedGraph[Node, LabeledEdge[Node, String]](classOf[LabeledEdge[Node, String]])
53+
def asJGraphtRuleGraph(graph: scalax.collection.mutable.Graph[Node, LDiEdge]): Graph[Node, LabeledEdge[Node, String]] = {
54+
val g: Graph[Node, LabeledEdge[Node, String]] = new DefaultDirectedGraph[Node, LabeledEdge[Node, String]](classOf[LabeledEdge[Node, String]])
5755

5856
val edges = graph.edges.toList
5957

@@ -89,7 +87,7 @@ object GraphUtils {
8987
* @param graph the 'Graph for Scala' graph
9088
* @return the JGraphT graph
9189
*/
92-
def asJGraphtRuleSetGraph(graph: scalax.collection.mutable.Graph[Rule, LDiEdge]): DirectedGraph[Rule, LabeledEdge[Rule, TriplePattern]] = {
90+
def asJGraphtRuleSetGraph(graph: scalax.collection.mutable.Graph[Rule, LDiEdge]): Graph[Rule, LabeledEdge[Rule, TriplePattern]] = {
9391
val g = new DefaultDirectedGraph[Rule, LabeledEdge[Rule, TriplePattern]](classOf[LabeledEdge[Rule, TriplePattern]])
9492

9593
val edges = graph.edges.toList
@@ -119,7 +117,7 @@ object GraphUtils {
119117
*/
120118
def export(filename: String, showInFlowDirection: Boolean = false): Unit = {
121119

122-
val g: DirectedGraph[Rule, LabeledEdge[Rule, TriplePattern]] = asJGraphtRuleSetGraph(graph)
120+
val g: Graph[Rule, LabeledEdge[Rule, TriplePattern]] = asJGraphtRuleSetGraph(graph)
123121

124122
// In order to be able to export edge and node labels and IDs,
125123
// we must implement providers for them
@@ -219,7 +217,7 @@ object GraphUtils {
219217
pdfExporter.setWorkspace(workspace)
220218
val baos = new ByteArrayOutputStream()
221219
ec.exportStream(baos, pdfExporter)
222-
new FileOutputStream(filename + ".pdf").write(baos.toByteArray())
220+
new FileOutputStream(filename + ".pdf").write(baos.toByteArray)
223221
}
224222
}
225223

@@ -302,7 +300,7 @@ object GraphUtils {
302300
*/
303301
def export(filename: String): Unit = {
304302

305-
val g: DirectedGraph[Node, LabeledEdge[Node, Node]] = new DirectedPseudograph[Node, LabeledEdge[Node, Node]](classOf[LabeledEdge[Node, Node]])
303+
val g: Graph[Node, LabeledEdge[Node, Node]] = new DirectedPseudograph[Node, LabeledEdge[Node, Node]](classOf[LabeledEdge[Node, Node]])
306304

307305
val edges = graph.edges.toList
308306

0 commit comments

Comments
 (0)