diff --git a/modules/GraphvizLayout/pom.xml b/modules/GraphvizLayout/pom.xml index a2bb9ce6f..02cffc101 100644 --- a/modules/GraphvizLayout/pom.xml +++ b/modules/GraphvizLayout/pom.xml @@ -1,5 +1,7 @@ - - + + 4.0.0 gephi-plugin-parent @@ -9,7 +11,7 @@ org.icculus.chunky gephigraphviz - 1.0.1 + 1.2.0 nbm GraphvizLayout @@ -59,6 +61,7 @@ license.txt Gary "ChunkyKs" Briggs chunky@icculus.org + https://github.com/chunky/gephi-plugins https://github.com/chunky/gephi-plugins @@ -68,8 +71,16 @@ - - 1.7 - 1.7 - + + + + + oss-sonatype + oss-sonatype + https://oss.sonatype.org/content/repositories/snapshots/ + + true + + + diff --git a/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/DotProcessError.java b/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/DotProcessError.java index 6149eba3f..719844350 100644 --- a/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/DotProcessError.java +++ b/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/DotProcessError.java @@ -101,7 +101,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed Desktop desktop = Desktop.getDesktop(); try { - desktop.browse(new URI("http://www.graphviz.org/")); + desktop.browse(new URI("https://www.graphviz.org/")); } catch (Exception ex) { ex.printStackTrace(); } diff --git a/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/GraphvizLayout.java b/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/GraphvizLayout.java index cf000438e..e399f9ae8 100644 --- a/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/GraphvizLayout.java +++ b/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/GraphvizLayout.java @@ -105,15 +105,15 @@ public void goAlgo() { graph.readLock(); for (final Node n : this.graph.getNodes()) { - dotfile.append("\"").append(n.getId()).append("\""); + dotfile.append(n.getId()); dotfile.append(" ["); dotfile.append("pos=\"").append(n.x()).append(',').append(n.y()).append('"'); dotfile.append("];\n"); } for (final Edge e : this.graph.getEdges()) { - dotfile.append("\"").append(e.getSource().getId()).append("\""); + dotfile.append(e.getSource().getId()); dotfile.append(edgearrow); - dotfile.append("\"").append(e.getTarget().getId()).append("\""); + dotfile.append(e.getTarget().getId()); dotfile.append(" [weight="); dotfile.append(e.getWeight()); dotfile.append("];\n"); diff --git a/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/GraphvizUIPanel.java b/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/GraphvizUIPanel.java index fe6b9286c..86c63ab3f 100644 --- a/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/GraphvizUIPanel.java +++ b/modules/GraphvizLayout/src/main/java/org/icculus/chunky/gephigraphviz/GraphvizUIPanel.java @@ -36,7 +36,7 @@ */ public class GraphvizUIPanel extends javax.swing.JPanel { - GraphvizLayout gvl = null; + transient GraphvizLayout gvl = null; /** Creates new form GraphvizUIPanel */ public GraphvizUIPanel(GraphvizLayout gvl) { @@ -62,24 +62,20 @@ private void initComponents() { jButton1 = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); - algoCombo = new javax.swing.JComboBox(); + algoCombo = new javax.swing.JComboBox(); jLabel2 = new javax.swing.JLabel(); - rankdirCombo = new javax.swing.JComboBox(); + rankdirCombo = new javax.swing.JComboBox(); jLabel4 = new javax.swing.JLabel(); concentrateCheck = new javax.swing.JCheckBox(); jLabel5 = new javax.swing.JLabel(); - overlapCombo = new javax.swing.JComboBox(); + overlapCombo = new javax.swing.JComboBox(); jLabel3 = new javax.swing.JLabel(); dotBinary = new javax.swing.JTextField(); setLayout(new java.awt.GridBagLayout()); jButton1.setText(org.openide.util.NbBundle.getMessage(GraphvizUIPanel.class, "GraphvizUIPanel.jButton1.text")); // NOI18N - jButton1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton1ActionPerformed(evt); - } - }); + jButton1.addActionListener(evt -> jButton1ActionPerformed(evt)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); @@ -174,6 +170,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { public void keyTyped(java.awt.event.KeyEvent evt) { dotBinaryKeyTyped(evt); } + + @Override public void keyReleased(java.awt.event.KeyEvent evt) { dotBinaryKeyReleased(evt); }