You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/01/25 21:26:35 UTC
[GitHub] sdedic closed pull request #390: NETBEANS-324: Maven graph widgets created in EDT
sdedic closed pull request #390: NETBEANS-324: Maven graph widgets created in EDT
URL: https://github.com/apache/incubator-netbeans/pull/390
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/maven.graph/src/org/netbeans/modules/maven/graph/DependencyGraphTopComponent.java b/maven.graph/src/org/netbeans/modules/maven/graph/DependencyGraphTopComponent.java
index 63533406d..0bdc7a89e 100644
--- a/maven.graph/src/org/netbeans/modules/maven/graph/DependencyGraphTopComponent.java
+++ b/maven.graph/src/org/netbeans/modules/maven/graph/DependencyGraphTopComponent.java
@@ -78,7 +78,6 @@
import org.netbeans.modules.maven.model.Utilities;
import org.netbeans.modules.maven.model.pom.POMModel;
import org.netbeans.modules.maven.spi.IconResources;
-import org.netbeans.modules.java.graph.GraphNodeImplementation;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileObject;
import org.openide.util.ImageUtilities;
@@ -606,16 +605,16 @@ public Stroke getStroke(MavenDependencyNode source, MavenDependencyNode target)
};
- final DependencyGraphScene<MavenDependencyNode> scene2 = new DependencyGraphScene<>(
- new MavenActionsProvider(DependencyGraphTopComponent.this, nbProj, model),
- DependencyGraphTopComponent.this::getSelectedDepth,
- versionProvider,
- pp);
-
- GraphConstructor constr = new GraphConstructor(scene2, prj);
+ GraphConstructor constr = new GraphConstructor(prj);
constr.accept(root);
SwingUtilities.invokeLater(new Runnable() {
@Override public void run() {
+ final DependencyGraphScene<MavenDependencyNode> scene2 = new DependencyGraphScene<>(
+ new MavenActionsProvider(DependencyGraphTopComponent.this, nbProj, model),
+ DependencyGraphTopComponent.this::getSelectedDepth,
+ versionProvider,
+ pp);
+ constr.updateScene(scene2);
scene = scene2;
JComponent sceneView = scene.getView();
if (sceneView == null) {
diff --git a/maven.graph/src/org/netbeans/modules/maven/graph/GraphConstructor.java b/maven.graph/src/org/netbeans/modules/maven/graph/GraphConstructor.java
index 9bb05a7af..995d53634 100644
--- a/maven.graph/src/org/netbeans/modules/maven/graph/GraphConstructor.java
+++ b/maven.graph/src/org/netbeans/modules/maven/graph/GraphConstructor.java
@@ -23,8 +23,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Stack;
+import javax.swing.SwingUtilities;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
@@ -41,7 +41,6 @@
* @author mkleint
*/
public class GraphConstructor implements GraphNodeVisitor<MavenDependencyNode> {
- private final DependencyGraphScene scene;
private final MavenProject proj;
private MavenDependencyNode root;
@@ -50,8 +49,7 @@
final Map<String, GraphNode<MavenDependencyNode>> cache;
private final List<GraphEdge<MavenDependencyNode>> edges;
- public GraphConstructor(DependencyGraphScene scene, MavenProject proj) {
- this.scene = scene;
+ public GraphConstructor(MavenProject proj) {
this.proj = proj;
path = new Stack<>();
// graphPath = new Stack<ArtifactGraphNode>();
@@ -100,31 +98,33 @@ public GraphConstructor(DependencyGraphScene scene, MavenProject proj) {
return true;
}
-
- @Override public boolean endVisit(MavenDependencyNode node) {
- path.pop();
-// graphPath.pop();
- if (root == node) {
- //add all nodes and edges now
- GraphNode rootNode = cache.get(node.getDependencyConflictId());
- //root needs to go first..
- scene.addNode(rootNode);
- for (GraphNode nd : cache.values()) {
- if (nd != rootNode) {
- scene.addNode(nd);
- }
+
+ public void updateScene(final DependencyGraphScene scene) {
+ assert SwingUtilities.isEventDispatchThread();
+ //add all nodes and edges now
+ GraphNode rootNode = cache.get(root.getDependencyConflictId());
+ //root needs to go first..
+ scene.addNode(rootNode);
+ for (GraphNode nd : cache.values()) {
+ if (nd != rootNode) {
+ scene.addNode(nd);
}
- for (GraphEdge<MavenDependencyNode> ed : edges) {
- scene.addEdge(ed);
- GraphNode grNode = cache.get(ed.getTarget().getDependencyConflictId());
- if (grNode == null) { //FOR conflicting nodes..
- grNode = cache.get(ed.getTarget().getRelatedDependencyConflictId());
- }
- scene.setEdgeTarget(ed, grNode);
- GraphNode parentGrNode = cache.get(ed.getSource().getDependencyConflictId());
- scene.setEdgeSource(ed, parentGrNode);
+ }
+ for (GraphEdge<MavenDependencyNode> ed : edges) {
+ scene.addEdge(ed);
+ GraphNode grNode = cache.get(ed.getTarget().getDependencyConflictId());
+ if (grNode == null) { //FOR conflicting nodes..
+ grNode = cache.get(ed.getTarget().getRelatedDependencyConflictId());
}
+ scene.setEdgeTarget(ed, grNode);
+ GraphNode parentGrNode = cache.get(ed.getSource().getDependencyConflictId());
+ scene.setEdgeSource(ed, parentGrNode);
}
+ }
+
+ @Override public boolean endVisit(MavenDependencyNode node) {
+ path.pop();
+// graphPath.pop();
return true;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists