@@ -27,7 +27,7 @@ import org.jgrapht.io._
2727import org .openide .util .Lookup
2828import scalax .collection .edge .LDiEdge
2929
30- import net .sansa_stack .inference .utils .graph .{EdgeEquivalenceComparator , LabeledEdge , NodeEquivalenceComparator };
30+ import net .sansa_stack .inference .utils .graph .{EdgeEquivalenceComparator , LabeledEdge , NodeEquivalenceComparator }
3131
3232/**
3333 * @author Lorenz Buehmann
@@ -188,12 +188,12 @@ object GraphUtils {
188188
189189 // Gephi
190190 // Init a project - and therefore a workspace
191- val pc = Lookup .getDefault() .lookup(classOf [ProjectController ])
191+ val pc = Lookup .getDefault.lookup(classOf [ProjectController ])
192192 pc.newProject()
193- val workspace = pc.getCurrentWorkspace()
193+ val workspace = pc.getCurrentWorkspace
194194
195195 // Get controllers and models
196- val importController = Lookup .getDefault() .lookup(classOf [ImportController ])
196+ val importController = Lookup .getDefault.lookup(classOf [ImportController ])
197197
198198 // export as GraphML
199199 val tmpFilename = " /tmp/temp-graph.graphml"
@@ -202,8 +202,8 @@ object GraphUtils {
202202 // Import file
203203 val file = new File (tmpFilename)
204204 val container = importController.importFile(file)
205- container.getLoader() .setEdgeDefault(EdgeDirectionDefault .DIRECTED ) // Force DIRECTED
206- container.getLoader() .setAllowAutoNode(false ) // Don't create missing nodes
205+ container.getLoader.setEdgeDefault(EdgeDirectionDefault .DIRECTED ) // Force DIRECTED
206+ container.getLoader.setAllowAutoNode(false ) // Don't create missing nodes
207207
208208 // Append imported data to GraphAPI
209209 importController.process(container, new DefaultProcessor (), workspace)
@@ -213,7 +213,7 @@ object GraphUtils {
213213
214214
215215 // See if graph is well imported
216- val graphModel = Lookup .getDefault() .lookup(classOf [GraphController ]).getGraphModel
216+ val graphModel = Lookup .getDefault.lookup(classOf [GraphController ]).getGraphModel
217217 val g = graphModel.getDirectedGraph()
218218
219219 // Run YifanHuLayout for 100 passes - The layout always takes the current visible view
@@ -223,23 +223,23 @@ object GraphUtils {
223223 layout.setOptimalDistance(200f )
224224
225225 layout.initAlgo()
226- for (i <- 0 to 100 if layout.canAlgo() ) {
226+ for (i <- 0 to 100 if layout.canAlgo) {
227227 layout.goAlgo()
228228 }
229229 layout.endAlgo()
230230
231- val model = Lookup .getDefault() .lookup(classOf [PreviewController ]).getModel()
232- model.getProperties() .putValue(PreviewProperty .SHOW_NODE_LABELS , true )
233- model.getProperties() .putValue(PreviewProperty .SHOW_EDGE_LABELS , true )
234- model.getProperties() .putValue(PreviewProperty .EDGE_CURVED , false )
235- model.getProperties() .putValue(PreviewProperty .EDGE_COLOR , new EdgeColor (java.awt.Color .GRAY ))
236- model.getProperties() .putValue(PreviewProperty .EDGE_THICKNESS , 0.1f )
237- model.getProperties() .putValue(PreviewProperty .NODE_LABEL_FONT , model.getProperties() .getFontValue(PreviewProperty .NODE_LABEL_FONT ).deriveFont(8 ))
231+ val model = Lookup .getDefault.lookup(classOf [PreviewController ]).getModel()
232+ model.getProperties.putValue(PreviewProperty .SHOW_NODE_LABELS , true )
233+ model.getProperties.putValue(PreviewProperty .SHOW_EDGE_LABELS , true )
234+ model.getProperties.putValue(PreviewProperty .EDGE_CURVED , false )
235+ model.getProperties.putValue(PreviewProperty .EDGE_COLOR , new EdgeColor (java.awt.Color .GRAY ))
236+ model.getProperties.putValue(PreviewProperty .EDGE_THICKNESS , 0.1f )
237+ model.getProperties.putValue(PreviewProperty .NODE_LABEL_FONT , model.getProperties.getFontValue(PreviewProperty .NODE_LABEL_FONT ).deriveFont(8 ))
238238 model.getProperties.putValue(Item .NODE_LABEL , " Vertex Label" )
239239
240240
241241 // Export full graph
242- val ec = Lookup .getDefault() .lookup(classOf [ExportController ])
242+ val ec = Lookup .getDefault.lookup(classOf [ExportController ])
243243 // ec.exportFile(new File("io_gexf.gexf"));
244244
245245 // PDF Exporter config and export to Byte array
@@ -341,7 +341,7 @@ object GraphUtils {
341341 val label = e.label.asInstanceOf [Node ]
342342 g.addVertex(s)
343343 g.addVertex(t)
344- g.addEdge(s, t, new LabeledEdge (s, t, label))
344+ g.addEdge(s, t, LabeledEdge (s, t, label))
345345 }
346346
347347 // In order to be able to export edge and node labels and IDs,
0 commit comments