Mercurial > hg > truffle
changeset 4382:f22dc0a63f03
Removed old hierarchical layout manager; start removing cluster layout. apply diamond operator to whole source.
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java Sat Jan 28 00:16:17 2012 +0100 @@ -54,11 +54,11 @@ bciValue = bytecode.getBci() + " " + bciValue; bciValue = bciValue.trim(); - Properties.PropertySelector<InputNode> selector = new Properties.PropertySelector<InputNode>(graph.getNodes()); + Properties.PropertySelector<InputNode> selector = new Properties.PropertySelector<>(graph.getNodes()); StringPropertyMatcher matcher = new StringPropertyMatcher("bci", bciValue); List<InputNode> nodeList = selector.selectMultiple(matcher); if (nodeList.size() > 0) { - nodes = new LinkedHashSet<InputNode>(); + nodes = new LinkedHashSet<>(); for (InputNode n : nodeList) { nodes.add(n); }
--- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java Sat Jan 28 00:16:17 2012 +0100 @@ -128,7 +128,7 @@ @Override public void componentOpened() { - Lookup.Template<InputGraphProvider> tpl = new Lookup.Template<InputGraphProvider>(InputGraphProvider.class); + Lookup.Template<InputGraphProvider> tpl = new Lookup.Template<>(InputGraphProvider.class); result = Utilities.actionsGlobalContext().lookup(tpl); result.addLookupListener(this); }
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java Sat Jan 28 00:16:17 2012 +0100 @@ -61,7 +61,7 @@ this.to = (BlockWidget) scene.findWidget(edge.getTo()); inputSlot = to.getInputSlot(); outputSlot = from.getOutputSlot(); - points = new ArrayList<Point>(); + points = new ArrayList<>(); } public InputBlockEdge getEdge() {
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java Sat Jan 28 00:16:17 2012 +0100 @@ -67,17 +67,21 @@ final BlockWidget widget = this; inputSlot = new Port() { + @Override public Point getRelativePosition() { return new Point((int) (getSize().getWidth() / 2), (int) (getSize().getHeight() / 2)); } + @Override public Vertex getVertex() { return widget; } }; outputSlot = new Port() { + @Override public Point getRelativePosition() { return new Point((int) (getSize().getWidth() / 2), (int) (getSize().getHeight() / 2)); } + @Override public Vertex getVertex() { return widget; }
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Sat Jan 28 00:16:17 2012 +0100 @@ -69,7 +69,7 @@ private WidgetAction moveAction = ActionFactory.createMoveAction(null, this); public ControlFlowScene() { - selection = new HashSet<BlockWidget>(); + selection = new HashSet<>(); this.getInputBindings().setZoomActionModifiers(0); this.setLayout(LayoutFactory.createAbsoluteLayout()); @@ -95,12 +95,12 @@ } oldGraph = g; - ArrayList<InputBlock> blocks = new ArrayList<InputBlock>(this.getNodes()); + ArrayList<InputBlock> blocks = new ArrayList<>(this.getNodes()); for (InputBlock b : blocks) { removeNode(b); } - ArrayList<InputBlockEdge> edges = new ArrayList<InputBlockEdge>(this.getEdges()); + ArrayList<InputBlockEdge> edges = new ArrayList<>(this.getEdges()); for (InputBlockEdge e : edges) { removeEdge(e); } @@ -117,7 +117,7 @@ this.setEdgeTarget(e, e.getTo()); } - GraphLayout<InputBlock, InputBlockEdge> layout = new HierarchicalGraphLayout<InputBlock, InputBlockEdge>();//GridGraphLayout(); + GraphLayout<InputBlock, InputBlockEdge> layout = new HierarchicalGraphLayout<>();//GridGraphLayout(); SceneLayout sceneLayout = LayoutFactory.createSceneGraphLayout(this, layout); sceneLayout.invokeLayout(); @@ -135,7 +135,7 @@ public void selectionChanged() { InputGraphProvider p = LookupHistory.getLast(InputGraphProvider.class);//)Utilities.actionsGlobalContext().lookup(InputGraphProvider.class); if (p != null) { - Set<InputNode> inputNodes = new HashSet<InputNode>(); + Set<InputNode> inputNodes = new HashSet<>(); for (BlockWidget w : selection) { inputNodes.addAll(w.getBlock().getNodes()); }
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java Sat Jan 28 00:16:17 2012 +0100 @@ -123,7 +123,7 @@ @Override public void componentOpened() { - Lookup.Template<InputGraphProvider> tpl = new Lookup.Template<InputGraphProvider>(InputGraphProvider.class); + Lookup.Template<InputGraphProvider> tpl = new Lookup.Template<>(InputGraphProvider.class); result = Utilities.actionsGlobalContext().lookup(tpl); result.addLookupListener(this); }
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java Sat Jan 28 00:16:17 2012 +0100 @@ -70,7 +70,7 @@ } public List<Point> getControlPoints() { - return new ArrayList<Point>(); + return new ArrayList<>(); } public void setControlPoints(List<Point> list) { @@ -139,9 +139,9 @@ protected void performGraphLayout(UniversalGraph<N, E> graph) { - Set<LinkWrapper> links = new LinkedHashSet<LinkWrapper>(); - Set<VertexWrapper> vertices = new LinkedHashSet<VertexWrapper>(); - Map<N, VertexWrapper> vertexMap = new HashMap<N, VertexWrapper>(); + Set<LinkWrapper> links = new LinkedHashSet<>(); + Set<VertexWrapper> vertices = new LinkedHashSet<>(); + Map<N, VertexWrapper> vertexMap = new HashMap<>(); for (N node : graph.getNodes()) { VertexWrapper v = new VertexWrapper(node, graph);
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java Sat Jan 28 00:16:17 2012 +0100 @@ -37,7 +37,7 @@ private boolean eventWasFired; public Event() { - listener = new ArrayList<L>(); + listener = new ArrayList<>(); fireEvents = true; } @@ -55,7 +55,7 @@ public void fire() { if(fireEvents) { - List<L> tmpList = new ArrayList<L>(listener); + List<L> tmpList = new ArrayList<>(listener); for (L l : tmpList) { fire(l); }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java Sat Jan 28 00:16:17 2012 +0100 @@ -85,7 +85,7 @@ } public Set<Integer> getAllNodes() { - Set<Integer> result = new HashSet<Integer>(); + Set<Integer> result = new HashSet<>(); for (FolderElement e : elements) { if (e instanceof InputGraph) { InputGraph g = (InputGraph) e;
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java Sat Jan 28 00:16:17 2012 +0100 @@ -63,7 +63,7 @@ return false; } - final HashSet<String> s = new HashSet<String>(); + final HashSet<String> s = new HashSet<>(); for (InputBlock succ : successors) { s.add(succ.name); } @@ -80,8 +80,8 @@ InputBlock(InputGraph graph, String name) { this.graph = graph; this.name = name; - nodes = new ArrayList<InputNode>(); - successors = new LinkedHashSet<InputBlock>(2); + nodes = new ArrayList<>(); + successors = new LinkedHashSet<>(2); } public String getName() {
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java Sat Jan 28 00:16:17 2012 +0100 @@ -90,7 +90,7 @@ public Map<InputNode, List<InputEdge>> findAllOutgoingEdges() { - Map<InputNode, List<InputEdge>> result = new HashMap<InputNode, List<InputEdge>>(getNodes().size()); + Map<InputNode, List<InputEdge>> result = new HashMap<>(getNodes().size()); for(InputNode n : this.getNodes()) { result.put(n, new ArrayList<InputEdge>()); } @@ -113,7 +113,7 @@ public Map<InputNode, List<InputEdge>> findAllIngoingEdges() { - Map<InputNode, List<InputEdge>> result = new HashMap<InputNode, List<InputEdge>>(getNodes().size()); + Map<InputNode, List<InputEdge>> result = new HashMap<>(getNodes().size()); for(InputNode n : this.getNodes()) { result.put(n, new ArrayList<InputEdge>()); } @@ -135,7 +135,7 @@ } public List<InputEdge> findOutgoingEdges(InputNode n) { - List<InputEdge> result = new ArrayList<InputEdge>(); + List<InputEdge> result = new ArrayList<>(); for(InputEdge e : this.edges) { if(e.getFrom() == n.getId()) { @@ -165,7 +165,7 @@ public void ensureNodesInBlocks() { InputBlock noBlock = null; - Set<InputNode> scheduledNodes = new HashSet<InputNode>(); + Set<InputNode> scheduledNodes = new HashSet<>(); for (InputBlock b : getBlocks()) { for (InputNode n : b.getNodes()) {
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java Sat Jan 28 00:16:17 2012 +0100 @@ -244,7 +244,7 @@ @Override public String toString() { - List<String[]> pairs = new ArrayList<String[]>(); + List<String[]> pairs = new ArrayList<>(); for (int i = 0; i < map.length; i += 2) { if (map[i + 1] != null) { pairs.add(new String[]{map[i], map[i + 1]}); @@ -294,7 +294,7 @@ } public List<T> selectMultiple(PropertyMatcher matcher) { - List<T> result = new ArrayList<T>(); + List<T> result = new ArrayList<>(); for (T t : objects) { Property p = t.getProperties().selectSingle(matcher);
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Source.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Source.java Sat Jan 28 00:16:17 2012 +0100 @@ -39,8 +39,8 @@ private Set<Integer> set; public Source() { - sourceNodes = new ArrayList<InputNode>(1); - set = new LinkedHashSet<Integer>(1); + sourceNodes = new ArrayList<>(1); + set = new LinkedHashSet<>(1); } public List<InputNode> getSourceNodes() {
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java Sat Jan 28 00:16:17 2012 +0100 @@ -186,7 +186,7 @@ } }; // <inlined> - private HandoverElementHandler<InputMethod> inlinedHandler = new XMLParser.HandoverElementHandler<InputMethod>(INLINE_ELEMENT); + private HandoverElementHandler<InputMethod> inlinedHandler = new XMLParser.HandoverElementHandler<>(INLINE_ELEMENT); // <inlined><method> private ElementHandler<InputMethod, InputMethod> inlinedMethodHandler = new XMLParser.ElementHandler<InputMethod, InputMethod>(METHOD_ELEMENT) { @@ -281,9 +281,9 @@ } }; // <nodes> - private HandoverElementHandler<InputGraph> nodesHandler = new HandoverElementHandler<InputGraph>(NODES_ELEMENT); + private HandoverElementHandler<InputGraph> nodesHandler = new HandoverElementHandler<>(NODES_ELEMENT); // <controlFlow> - private HandoverElementHandler<InputGraph> controlFlowHandler = new HandoverElementHandler<InputGraph>(CONTROL_FLOW_ELEMENT); + private HandoverElementHandler<InputGraph> controlFlowHandler = new HandoverElementHandler<>(CONTROL_FLOW_ELEMENT); // <block> private ElementHandler<InputBlock, InputGraph> blockHandler = new ElementHandler<InputBlock, InputGraph>(BLOCK_ELEMENT) { @@ -299,7 +299,7 @@ } }; // <nodes> - private HandoverElementHandler<InputBlock> blockNodesHandler = new HandoverElementHandler<InputBlock>(NODES_ELEMENT); + private HandoverElementHandler<InputBlock> blockNodesHandler = new HandoverElementHandler<>(NODES_ELEMENT); // <node> private ElementHandler<InputBlock, InputBlock> blockNodeHandler = new ElementHandler<InputBlock, InputBlock>(NODE_ELEMENT) { @@ -318,14 +318,14 @@ } }; // <successors> - private HandoverElementHandler<InputBlock> successorsHandler = new HandoverElementHandler<InputBlock>(SUCCESSORS_ELEMENT); + private HandoverElementHandler<InputBlock> successorsHandler = new HandoverElementHandler<>(SUCCESSORS_ELEMENT); // <successor> private ElementHandler<InputBlock, InputBlock> successorHandler = new ElementHandler<InputBlock, InputBlock>(SUCCESSOR_ELEMENT) { @Override protected InputBlock start() throws SAXException { String name = readRequiredAttribute(BLOCK_NAME_PROPERTY); - blockConnections.add(new Pair<String, String>(getParentObject().getName(), name)); + blockConnections.add(new Pair<>(getParentObject().getName(), name)); return getParentObject(); } }; @@ -362,7 +362,7 @@ } }; // <graph> - private HandoverElementHandler<InputGraph> edgesHandler = new HandoverElementHandler<InputGraph>(EDGES_ELEMENT); + private HandoverElementHandler<InputGraph> edgesHandler = new HandoverElementHandler<>(EDGES_ELEMENT); // Local class for edge elements private class EdgeElementHandler extends ElementHandler<InputEdge, InputGraph> { @@ -428,7 +428,7 @@ } }; // <properties> - private HandoverElementHandler<Properties.Provider> propertiesHandler = new HandoverElementHandler<Properties.Provider>(PROPERTIES_ELEMENT); + private HandoverElementHandler<Properties.Provider> propertiesHandler = new HandoverElementHandler<>(PROPERTIES_ELEMENT); // <properties> private HandoverElementHandler<Group> groupPropertiesHandler = new HandoverElementHandler<Group>(PROPERTIES_ELEMENT) {
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java Sat Jan 28 00:16:17 2012 +0100 @@ -111,8 +111,8 @@ writer.writeProperties(graph.getProperties()); writer.startTag(Parser.NODES_ELEMENT); - Set<InputNode> removed = new HashSet<InputNode>(); - Set<InputNode> equal = new HashSet<InputNode>(); + Set<InputNode> removed = new HashSet<>(); + Set<InputNode> equal = new HashSet<>(); if (previous != null) { for (InputNode n : previous.getNodes()) { @@ -143,8 +143,8 @@ writer.endTag(); writer.startTag(Parser.EDGES_ELEMENT); - Set<InputEdge> removedEdges = new HashSet<InputEdge>(); - Set<InputEdge> equalEdges = new HashSet<InputEdge>(); + Set<InputEdge> removedEdges = new HashSet<>(); + Set<InputEdge> equalEdges = new HashSet<>(); if (previous != null) { for (InputEdge e : previous.getEdges()) {
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java Sat Jan 28 00:16:17 2012 +0100 @@ -41,7 +41,7 @@ public XMLWriter(Writer inner) { this.inner = inner; - elementStack = new Stack<String>(); + elementStack = new Stack<>(); } @Override
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java Sat Jan 28 00:16:17 2012 +0100 @@ -62,7 +62,7 @@ @Test public void testBase() { - ChangedEvent<Integer> e = new ChangedEvent<Integer>(5); + ChangedEvent<Integer> e = new ChangedEvent<>(5); final int[] fireCount = new int[1]; e.addListener(new ChangedListener<Integer>() {
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java Sat Jan 28 00:16:17 2012 +0100 @@ -246,7 +246,7 @@ * Test property selector */ public void testPropertySelector() { - final Collection<Properties.Entity> c = new ArrayList<Properties.Entity>(); + final Collection<Properties.Entity> c = new ArrayList<>(); final Properties.Entity e1 = new Properties.Entity(); e1.getProperties().setProperty("p1", "1"); @@ -264,7 +264,7 @@ e3.getProperties().setProperty("p4", "4"); c.add(e3); - final PropertySelector<Properties.Entity> sel = new PropertySelector<Properties.Entity>(c); + final PropertySelector<Properties.Entity> sel = new PropertySelector<>(c); final StringPropertyMatcher matcher1 = new StringPropertyMatcher("p2", "2"); assertTrue(sel.selectMultiple(matcher1).size() == 2);
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java Sat Jan 28 00:16:17 2012 +0100 @@ -75,14 +75,14 @@ s.addSourceNode(N1); assertEquals(s.getSourceNodes(), Arrays.asList(N1)); - assertEquals(s.getSourceNodesAsSet(), new LinkedHashSet<Integer>(Arrays.asList(1))); + assertEquals(s.getSourceNodesAsSet(), new LinkedHashSet<>(Arrays.asList(1))); s.addSourceNode(N2); assertEquals(s.getSourceNodes(), Arrays.asList(N1, N2)); - assertEquals(s.getSourceNodesAsSet(), new LinkedHashSet<Integer>(Arrays.asList(1, 2))); + assertEquals(s.getSourceNodesAsSet(), new LinkedHashSet<>(Arrays.asList(1, 2))); s.addSourceNode(N1); assertEquals(s.getSourceNodes(), Arrays.asList(N1, N2)); - assertEquals(s.getSourceNodesAsSet(), new LinkedHashSet<Integer>(Arrays.asList(1, 2))); + assertEquals(s.getSourceNodesAsSet(), new LinkedHashSet<>(Arrays.asList(1, 2))); } } \ No newline at end of file
--- a/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java Sat Jan 28 00:16:17 2012 +0100 @@ -66,14 +66,14 @@ } private static InputGraph createDiffSameGroup(InputGraph a, InputGraph b) { - Map<Integer, InputNode> keyMapB = new HashMap<Integer, InputNode>(b.getNodes().size()); + Map<Integer, InputNode> keyMapB = new HashMap<>(b.getNodes().size()); for (InputNode n : b.getNodes()) { Integer key = n.getId(); assert !keyMapB.containsKey(key); keyMapB.put(key, n); } - Set<NodePair> pairs = new HashSet<NodePair>(); + Set<NodePair> pairs = new HashSet<>(); for (InputNode n : a.getNodes()) { Integer key = n.getId(); @@ -119,7 +119,7 @@ InputGraph graph = new InputGraph(a.getName() + ", " + b.getName()); g.addElement(graph); - Map<InputBlock, InputBlock> blocksMap = new HashMap<InputBlock, InputBlock>(); + Map<InputBlock, InputBlock> blocksMap = new HashMap<>(); for (InputBlock blk : a.getBlocks()) { InputBlock diffblk = graph.addBlock(blk.getName()); blocksMap.put(blk, diffblk); @@ -133,14 +133,14 @@ } // Difference between block edges - Set<Pair<String, String>> aEdges = new HashSet<Pair<String, String>>(); + Set<Pair<String, String>> aEdges = new HashSet<>(); for (InputBlockEdge edge : a.getBlockEdges()) { - aEdges.add(new Pair<String, String>(edge.getFrom().getName(), edge.getTo().getName())); + aEdges.add(new Pair<>(edge.getFrom().getName(), edge.getTo().getName())); } for (InputBlockEdge bEdge : b.getBlockEdges()) { InputBlock from = bEdge.getFrom(); InputBlock to = bEdge.getTo(); - Pair<String, String> pair = new Pair<String, String>(from.getName(), to.getName()); + Pair<String, String> pair = new Pair<>(from.getName(), to.getName()); if (aEdges.contains(pair)) { // same graph.addBlockEdge(blocksMap.get(from), blocksMap.get(to)); @@ -159,10 +159,10 @@ edge.setState(InputBlockEdge.State.DELETED); } - Set<InputNode> nodesA = new HashSet<InputNode>(a.getNodes()); - Set<InputNode> nodesB = new HashSet<InputNode>(b.getNodes()); + Set<InputNode> nodesA = new HashSet<>(a.getNodes()); + Set<InputNode> nodesB = new HashSet<>(b.getNodes()); - Map<InputNode, InputNode> inputNodeMap = new HashMap<InputNode, InputNode>(pairs.size()); + Map<InputNode, InputNode> inputNodeMap = new HashMap<>(pairs.size()); for (NodePair p : pairs) { InputNode n = p.getLeft(); assert nodesA.contains(n); @@ -209,7 +209,7 @@ Collection<InputEdge> edgesA = a.getEdges(); Collection<InputEdge> edgesB = b.getEdges(); - Set<InputEdge> newEdges = new HashSet<InputEdge>(); + Set<InputEdge> newEdges = new HashSet<>(); for (InputEdge e : edgesA) { int from = e.getFrom(); @@ -291,9 +291,9 @@ private static InputGraph createDiff(InputGraph a, InputGraph b) { - Set<InputNode> matched = new HashSet<InputNode>(); + Set<InputNode> matched = new HashSet<>(); - Set<NodePair> pairs = new HashSet<NodePair>(); + Set<NodePair> pairs = new HashSet<>(); for (InputNode n : a.getNodes()) { String s = n.getProperties().get(MAIN_PROPERTY); if (s == null) { @@ -312,7 +312,7 @@ } } - Set<NodePair> selectedPairs = new HashSet<NodePair>(); + Set<NodePair> selectedPairs = new HashSet<>(); while (pairs.size() > 0) { double min = Double.MAX_VALUE; @@ -330,7 +330,7 @@ } else { selectedPairs.add(minPair); - Set<NodePair> toRemove = new HashSet<NodePair>(); + Set<NodePair> toRemove = new HashSet<>(); for (NodePair p : pairs) { if (p.getLeft() == minPair.getLeft() || p.getRight() == minPair.getRight()) { toRemove.add(p);
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java Sat Jan 28 00:16:17 2012 +0100 @@ -45,7 +45,7 @@ public ColorFilter(String name) { this.name = name; - colorRules = new ArrayList<ColorRule>(); + colorRules = new ArrayList<>(); } public String getName() { @@ -54,7 +54,7 @@ public void apply(Diagram diagram) { - Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<Figure>(diagram.getFigures()); + Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<>(diagram.getFigures()); for (ColorRule rule : colorRules) { if (rule.getSelector() != null) { List<Figure> figures = rule.getSelector().selected(diagram);
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java Sat Jan 28 00:16:17 2012 +0100 @@ -46,7 +46,7 @@ public CombineFilter(String name) { this.name = name; - rules = new ArrayList<CombineRule>(); + rules = new ArrayList<>(); } public String getName() { @@ -55,14 +55,14 @@ public void apply(Diagram diagram) { - Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<Figure>(diagram.getFigures()); + Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<>(diagram.getFigures()); for (CombineRule r : rules) { List<Figure> list = selector.selectMultiple(r.getFirstMatcher()); - Set<Figure> figuresToRemove = new HashSet<Figure>(); + Set<Figure> figuresToRemove = new HashSet<>(); for (Figure f : list) { - List<Figure> successors = new ArrayList<Figure>(f.getSuccessors()); + List<Figure> successors = new ArrayList<>(f.getSuccessors()); if (r.isReversed()) { if (successors.size() == 1) { Figure succ = successors.get(0);
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java Sat Jan 28 00:16:17 2012 +0100 @@ -44,7 +44,7 @@ public ConnectionFilter(String name) { this.name = name; - connectionStyleRules = new ArrayList<ConnectionStyleRule>(); + connectionStyleRules = new ArrayList<>(); } public String getName() { @@ -53,7 +53,7 @@ public void apply(Diagram diagram) { - Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<Figure>(diagram.getFigures()); + Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<>(diagram.getFigures()); for (ConnectionStyleRule rule : connectionStyleRules) { List<Figure> figures = null; if (rule.getSelector() != null) {
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java Sat Jan 28 00:16:17 2012 +0100 @@ -47,13 +47,13 @@ }; public FilterChain() { - filters = new ArrayList<Filter>(); - changedEvent = new ChangedEvent<FilterChain>(this); + filters = new ArrayList<>(); + changedEvent = new ChangedEvent<>(this); } public FilterChain(FilterChain f) { - this.filters = new ArrayList<Filter>(f.filters); - changedEvent = new ChangedEvent<FilterChain>(this); + this.filters = new ArrayList<>(f.filters); + changedEvent = new ChangedEvent<>(this); } public ChangedEvent<FilterChain> getChangedEvent() { @@ -72,7 +72,7 @@ } public void apply(Diagram d, FilterChain sequence) { - List<Filter> applied = new ArrayList<Filter>(); + List<Filter> applied = new ArrayList<>(); for (Filter f : sequence.getFilters()) { if (filters.contains(f)) { f.apply(d);
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java Sat Jan 28 00:16:17 2012 +0100 @@ -42,7 +42,7 @@ public FilterSetting(String name) { this.name = name; - filters = new HashSet<Filter>(); + filters = new HashSet<>(); } public Set<Filter> getFilters() {
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java Sat Jan 28 00:16:17 2012 +0100 @@ -42,7 +42,7 @@ public RemoveFilter(String name) { this.name = name; - rules = new ArrayList<RemoveRule>(); + rules = new ArrayList<>(); } public String getName() { @@ -52,7 +52,7 @@ public void apply(Diagram diagram) { for (RemoveRule r : rules) { List<Figure> selected = r.getSelector().selected(diagram); - Set<Figure> toRemove = new HashSet<Figure>(selected); + Set<Figure> toRemove = new HashSet<>(selected); if (r.getRemoveOrphans()) { boolean changed;
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java Sat Jan 28 00:16:17 2012 +0100 @@ -43,7 +43,7 @@ public RemoveInputsFilter(String name) { this.name = name; - rules = new ArrayList<RemoveInputsRule>(); + rules = new ArrayList<>(); } public String getName() { @@ -57,7 +57,7 @@ List<Figure> list = r.getSelector().selected(diagram); for (Figure f : list) { int z = 0; - List<InputSlot> last = new ArrayList<InputSlot>(); + List<InputSlot> last = new ArrayList<>(); for (InputSlot is : f.getInputSlots()) { if (z >= r.getStartingIndex() && z <= r.getEndIndex() && is.getConnections().size() > 0) { StringBuilder sb = new StringBuilder();
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java Sat Jan 28 00:16:17 2012 +0100 @@ -54,7 +54,7 @@ for (InputSlot is : f.getInputSlots()) { - List<Connection> toRemove = new ArrayList<Connection>(); + List<Connection> toRemove = new ArrayList<>(); for (Connection c : is.getConnections()) { if (c.getOutputSlot().getFigure() == f) {
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java Sat Jan 28 00:16:17 2012 +0100 @@ -55,7 +55,7 @@ List<Figure> figures = d.getFigures(); for (Figure f : figures) { - List<Slot> remove = new ArrayList<Slot>(); + List<Slot> remove = new ArrayList<>(); if (removeInputs) { for (InputSlot is : f.getInputSlots()) { if (is.getConnections().isEmpty()) {
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java Sat Jan 28 00:16:17 2012 +0100 @@ -40,7 +40,7 @@ public CheckNode(Children c, Lookup lookup) { super(c, lookup); - selectionChangedEvent = new ChangedEvent<CheckNode>(this); + selectionChangedEvent = new ChangedEvent<>(this); selected = false; enabled = true; }
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java Sat Jan 28 00:16:17 2012 +0100 @@ -69,7 +69,7 @@ update(); - Lookup.Template<FilterChain> tpl = new Lookup.Template<FilterChain>(FilterChain.class); + Lookup.Template<FilterChain> tpl = new Lookup.Template<>(FilterChain.class); result = Utilities.actionsGlobalContext().lookup(tpl); result.addLookupListener(this);
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java Sat Jan 28 00:16:17 2012 +0100 @@ -141,7 +141,7 @@ if (s != customFilterSetting) { FilterChain chain = getFilterChain(); chain.getChangedEvent().beginAtomic(); - List<Filter> toRemove = new ArrayList<Filter>(); + List<Filter> toRemove = new ArrayList<>(); for (Filter f : chain.getFilters()) { if (!s.containsFilter(f)) { toRemove.add(f); @@ -270,7 +270,7 @@ private class FilterChildren extends Children.Keys<Filter> implements ChangedListener<CheckNode> { - private HashMap<Filter, Node> nodeHash = new HashMap<Filter, Node>(); + private HashMap<Filter, Node> nodeHash = new HashMap<>(); protected Node[] createNodes(Filter filter) { if (nodeHash.containsKey(filter)) { @@ -324,7 +324,7 @@ } private FilterTopComponent() { - filterSettingsChangedEvent = new ChangedEvent<FilterTopComponent>(this); + filterSettingsChangedEvent = new ChangedEvent<>(this); initComponents(); setName(NbBundle.getMessage(FilterTopComponent.class, "CTL_FilterTopComponent")); setToolTipText(NbBundle.getMessage(FilterTopComponent.class, "HINT_FilterTopComponent")); @@ -354,7 +354,7 @@ toolBar.add(MoveFilterDownAction.get(MoveFilterDownAction.class).createContextAwareInstance(this.getLookup())); this.add(view, BorderLayout.CENTER); - filterSettings = new ArrayList<FilterSetting>(); + filterSettings = new ArrayList<>(); updateComboBox(); comboBox.addActionListener(comboBoxActionListener); @@ -423,10 +423,10 @@ FileObject folder = FileUtil.getConfigRoot().getFileObject(FOLDER_ID); FileObject[] children = folder.getChildren(); - List<CustomFilter> customFilters = new ArrayList<CustomFilter>(); - HashMap<CustomFilter, String> afterMap = new HashMap<CustomFilter, String>(); - Set<CustomFilter> enabledSet = new HashSet<CustomFilter>(); - HashMap<String, CustomFilter> map = new HashMap<String, CustomFilter>(); + List<CustomFilter> customFilters = new ArrayList<>(); + HashMap<CustomFilter, String> afterMap = new HashMap<>(); + Set<CustomFilter> enabledSet = new HashSet<>(); + HashMap<String, CustomFilter> map = new HashMap<>(); for (final FileObject fo : children) { InputStream is = null; @@ -478,7 +478,7 @@ for (int j = 0; j < customFilters.size(); j++) { for (int i = 0; i < customFilters.size(); i++) { - List<CustomFilter> copiedList = new ArrayList<CustomFilter>(customFilters); + List<CustomFilter> copiedList = new ArrayList<>(customFilters); for (CustomFilter cf : copiedList) { String after = afterMap.get(cf); @@ -562,7 +562,7 @@ @Override public void componentOpened() { - Lookup.Template<FilterChain> tpl = new Lookup.Template<FilterChain>(FilterChain.class); + Lookup.Template<FilterChain> tpl = new Lookup.Template<>(FilterChain.class); result = Utilities.actionsGlobalContext().lookup(tpl); result.addLookupListener(this); }
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java Sat Jan 28 00:16:17 2012 +0100 @@ -39,8 +39,8 @@ } public void apply(Diagram d) { - Set<Figure> figuresToRemove = new HashSet<Figure>(); - Set<Connection> connectionsToRemove = new HashSet<Connection>(); + Set<Figure> figuresToRemove = new HashSet<>(); + Set<Connection> connectionsToRemove = new HashSet<>(); for (Figure f : d.getFigures()) { final String prop = f.getProperties().get("probability");
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java Sat Jan 28 00:16:17 2012 +0100 @@ -43,7 +43,7 @@ public List<Figure> selected(Diagram d) { List<Figure> l1 = selector1.selected(d); List<Figure> l2 = selector2.selected(d); - List<Figure> result = new ArrayList<Figure>(); + List<Figure> result = new ArrayList<>(); for (Figure f : l2) { if (l1.contains(f)) { result.add(f);
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java Sat Jan 28 00:16:17 2012 +0100 @@ -53,7 +53,7 @@ } public Set<? extends Cluster> getSuccessors() { - Set<Block> succs = new HashSet<Block>(); + Set<Block> succs = new HashSet<>(); for (InputBlock b : inputBlock.getSuccessors()) { succs.add(diagram.getBlock(b)); }
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java Sat Jan 28 00:16:17 2012 +0100 @@ -57,7 +57,7 @@ this.label = label; this.inputSlot.connections.add(this); this.outputSlot.connections.add(this); - controlPoints = new ArrayList<Point>(); + controlPoints = new ArrayList<>(); Figure sourceFigure = this.outputSlot.getFigure(); Figure destFigure = this.inputSlot.getFigure(); sourceFigure.addSuccessor(destFigure);
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java Sat Jan 28 00:16:17 2012 +0100 @@ -65,8 +65,8 @@ } private Diagram() { - figures = new ArrayList<Figure>(); - blocks = new LinkedHashMap<InputBlock, Block>(8); + figures = new ArrayList<>(); + blocks = new LinkedHashMap<>(8); this.nodeText = ""; this.font = new Font("Arial", Font.PLAIN, 13); this.slotFont = new Font("Arial", Font.PLAIN, 10); @@ -119,7 +119,7 @@ } public Map<InputNode, Set<Figure>> calcSourceToFigureRelation() { - Map<InputNode, Set<Figure>> map = new HashMap<InputNode, Set<Figure>>(); + Map<InputNode, Set<Figure>> map = new HashMap<>(); for(InputNode node : this.getGraph().getNodes()) { map.put(node, new HashSet<Figure>()); @@ -146,7 +146,7 @@ d.updateBlocks(); Collection<InputNode> nodes = graph.getNodes(); - Hashtable<Integer, Figure> figureHash = new Hashtable<Integer, Figure>(); + Hashtable<Integer, Figure> figureHash = new Hashtable<>(); for (InputNode n : nodes) { Figure f = d.createFigure(); f.getSource().addSourceNode(n); @@ -194,7 +194,7 @@ freeFigure(f); } - ArrayList<Figure> newFigures = new ArrayList<Figure>(); + ArrayList<Figure> newFigures = new ArrayList<>(); for (Figure f : this.figures) { if (!figuresToRemove.contains(f)) { newFigures.add(f); @@ -205,12 +205,12 @@ private void freeFigure(Figure succ) { - List<InputSlot> inputSlots = new ArrayList<InputSlot>(succ.getInputSlots()); + List<InputSlot> inputSlots = new ArrayList<>(succ.getInputSlots()); for (InputSlot s : inputSlots) { succ.removeInputSlot(s); } - List<OutputSlot> outputSlots = new ArrayList<OutputSlot>(succ.getOutputSlots()); + List<OutputSlot> outputSlots = new ArrayList<>(succ.getOutputSlots()); for (OutputSlot s : outputSlots) { succ.removeOutputSlot(s); } @@ -239,7 +239,7 @@ public Set<Connection> getConnections() { - Set<Connection> connections = new HashSet<Connection>(); + Set<Connection> connections = new HashSet<>(); for (Figure f : figures) { for (InputSlot s : f.getInputSlots()) { @@ -251,7 +251,7 @@ } public Figure getRootFigure() { - Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<Figure>(figures); + Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<>(figures); Figure root = selector.selectSingle(new StringPropertyMatcher("name", "Root")); if (root == null) { root = selector.selectSingle(new StringPropertyMatcher("name", "Start")); @@ -278,7 +278,7 @@ System.out.println("Number of figures: " + tmpFigures.size()); System.out.println("Number of connections: " + connections.size()); - List<Figure> figuresSorted = new ArrayList<Figure>(tmpFigures); + List<Figure> figuresSorted = new ArrayList<>(tmpFigures); Collections.sort(figuresSorted, new Comparator<Figure>() { public int compare(Figure a, Figure b) { @@ -303,7 +303,7 @@ } public List<Figure> getRootFigures() { - ArrayList<Figure> rootFigures = new ArrayList<Figure>(); + ArrayList<Figure> rootFigures = new ArrayList<>(); for (Figure f : figures) { if (f.getPredecessors().size() == 0) { rootFigures.add(f);
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java Sat Jan 28 00:16:17 2012 +0100 @@ -29,12 +29,7 @@ import com.sun.hotspot.igv.layout.Cluster; import com.sun.hotspot.igv.layout.Vertex; import com.sun.hotspot.igv.data.Properties; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Point; +import java.awt.*; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Collection; @@ -82,7 +77,7 @@ } public static <T> List<T> getAllBefore(List<T> inputList, T tIn) { - List<T> result = new ArrayList<T>(); + List<T> result = new ArrayList<>(); for(T t : inputList) { if(t.equals(tIn)) { break; @@ -123,10 +118,10 @@ protected Figure(Diagram diagram, int id) { this.diagram = diagram; this.source = new Source(); - inputSlots = new ArrayList<InputSlot>(5); - outputSlots = new ArrayList<OutputSlot>(1); - predecessors = new ArrayList<Figure>(6); - successors = new ArrayList<Figure>(6); + inputSlots = new ArrayList<>(5); + outputSlots = new ArrayList<>(1); + predecessors = new ArrayList<>(6); + successors = new ArrayList<>(6); this.id = id; idString = Integer.toString(id); @@ -151,7 +146,7 @@ } public Set<Figure> getPredecessorSet() { - Set<Figure> result = new HashSet<Figure>(); + Set<Figure> result = new HashSet<>(); for (Figure f : getPredecessors()) { result.add(f); } @@ -159,7 +154,7 @@ } public Set<Figure> getSuccessorSet() { - Set<Figure> result = new HashSet<Figure>(); + Set<Figure> result = new HashSet<>(); for (Figure f : getSuccessors()) { result.add(f); } @@ -221,7 +216,7 @@ assert inputSlots.contains(s) || outputSlots.contains(s); - List<Connection> connections = new ArrayList<Connection>(s.getConnections()); + List<Connection> connections = new ArrayList<>(s.getConnections()); for (Connection c : connections) { c.remove(); } @@ -251,7 +246,7 @@ } public Set<Slot> getSlots() { - Set<Slot> result = new HashSet<Slot>(); + Set<Slot> result = new HashSet<>(); result.addAll(getInputSlots()); result.addAll(getOutputSlots()); return result; @@ -363,7 +358,12 @@ } } + @Override public int compareTo(Vertex f) { return toString().compareTo(f.toString()); } + + public Rectangle getBounds() { + return new Rectangle(this.getPosition(), new Dimension(this.getWidth(), this.getHeight())); + } }
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java Sat Jan 28 00:16:17 2012 +0100 @@ -40,7 +40,7 @@ public List<Figure> selected(Diagram d) { - List<Figure> result = new ArrayList<Figure>(); + List<Figure> result = new ArrayList<>(); List<Figure> otherResult = selector.selected(d); for (Figure f : d.getFigures()) { if (!otherResult.contains(f)) {
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java Sat Jan 28 00:16:17 2012 +0100 @@ -40,7 +40,7 @@ } public List<Figure> selected(Diagram d) { - Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<Figure>(d.getFigures()); + Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<>(d.getFigures()); List<Figure> list = selector.selectMultiple(matcher); return list; }
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java Sat Jan 28 00:16:17 2012 +0100 @@ -40,7 +40,7 @@ public List<Figure> selected(Diagram d) { List<Figure> inner = innerSelector.selected(d); - List<Figure> result = new ArrayList<Figure>(); + List<Figure> result = new ArrayList<>(); for (Figure f : d.getFigures()) { boolean saved = false; for (Figure f2 : f.getSuccessors()) {
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java Sat Jan 28 00:16:17 2012 +0100 @@ -55,7 +55,7 @@ protected Slot(Figure figure, int wantedIndex) { this.figure = figure; - connections = new ArrayList<Connection>(2); + connections = new ArrayList<>(2); source = new Source(); this.wantedIndex = wantedIndex; text = ""; @@ -173,7 +173,7 @@ } public void removeAllConnections() { - List<Connection> connectionsCopy = new ArrayList<Connection>(this.connections); + List<Connection> connectionsCopy = new ArrayList<>(this.connections); for (Connection c : connectionsCopy) { c.remove(); }
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java Sat Jan 28 00:16:17 2012 +0100 @@ -40,7 +40,7 @@ public List<Figure> selected(Diagram d) { List<Figure> inner = innerSelector.selected(d); - List<Figure> result = new ArrayList<Figure>(); + List<Figure> result = new ArrayList<>(); for (Figure f : d.getFigures()) { boolean saved = false; for (Figure f2 : f.getPredecessors()) {
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java Sat Jan 28 00:16:17 2012 +0100 @@ -44,7 +44,7 @@ public ClusterIngoingConnection(ClusterInputSlotNode inputSlotNode, Link c) { this.inputSlotNode = inputSlotNode; this.connection = c; - this.controlPoints = new ArrayList<Point>(); + this.controlPoints = new ArrayList<>(); inputSlot = c.getTo(); outputSlot = inputSlotNode.getOutputSlot();
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java Sat Jan 28 00:16:17 2012 +0100 @@ -54,8 +54,8 @@ public static final int BORDER = 20; public ClusterNode(Cluster cluster, String name) { - this.subNodes = new HashSet<Vertex>(); - this.subEdges = new HashSet<Link>(); + this.subNodes = new HashSet<>(); + this.subEdges = new HashSet<>(); this.cluster = cluster; position = new Point(0, 0); this.name = name; @@ -142,7 +142,7 @@ } for (Link l : subEdges) { - List<Point> points = new ArrayList<Point>(l.getControlPoints()); + List<Point> points = new ArrayList<>(l.getControlPoints()); for (Point p : points) { p.x -= minX; p.y -= minY; @@ -183,7 +183,7 @@ for (Link e : subEdges) { List<Point> arr = e.getControlPoints(); - ArrayList<Point> newArr = new ArrayList<Point>(arr.size()); + ArrayList<Point> newArr = new ArrayList<>(arr.size()); for (Point p : arr) { if (p != null) { Point p2 = new Point(p);
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java Sat Jan 28 00:16:17 2012 +0100 @@ -44,7 +44,7 @@ public ClusterOutgoingConnection(ClusterOutputSlotNode outputSlotNode, Link c) { this.outputSlotNode = outputSlotNode; this.connection = c; - this.intermediatePoints = new ArrayList<Point>(); + this.intermediatePoints = new ArrayList<>(); outputSlot = c.getFrom(); inputSlot = outputSlotNode.getInputSlot();
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java Sat Jan 28 00:16:17 2012 +0100 @@ -42,13 +42,13 @@ private List<Node<N, E>> nodeList; public Graph() { - nodes = new HashMap<Object, Node<N, E>>(); - edges = new HashMap<Object, Edge<N, E>>(); - nodeList = new ArrayList<Node<N, E>>(); + nodes = new HashMap<>(); + edges = new HashMap<>(); + nodeList = new ArrayList<>(); } public Node<N, E> createNode(N data, Object key) { - Node<N, E> n = new Node<N, E>(this, data); + Node<N, E> n = new Node<>(this, data); assert key == null || !nodes.containsKey(key); if (key != null) { nodes.put(key, n); @@ -58,7 +58,7 @@ } public Edge<N, E> createEdge(Node<N, E> source, Node<N, E> dest, E data, Object key) { - Edge<N, E> e = new Edge<N, E>(this, source, dest, data); + Edge<N, E> e = new Edge<>(this, source, dest, data); source.addOutEdge(e); dest.addInEdge(e); if (key != null) { @@ -114,7 +114,7 @@ public List<Node<N, E>> getNodesWithInDegree(int x, boolean countSelfLoops) { - List<Node<N, E>> result = new ArrayList<Node<N, E>>(); + List<Node<N, E>> result = new ArrayList<>(); for (Node<N, E> n : getNodes()) { if (n.getInDegree(countSelfLoops) == x) { result.add(n); @@ -126,7 +126,7 @@ } private void markReachable(Node<N, E> startingNode) { - ArrayList<Node<N, E>> arr = new ArrayList<Node<N, E>>(); + ArrayList<Node<N, E>> arr = new ArrayList<>(); arr.add(startingNode); for (Node<N, E> n : getNodes()) { n.setReachable(false); @@ -151,7 +151,7 @@ n.setActive(false); } - Queue<Node<N, E>> queue = new LinkedList<Node<N, E>>(); + Queue<Node<N, E>> queue = new LinkedList<>(); queue.add(startingNode); startingNode.setVisited(true); int layer = 0;
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java Fri Jan 27 23:57:47 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,247 +0,0 @@ -/* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ -package com.sun.hotspot.igv.hierarchicallayout; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.HashMap; -import java.util.List; -import java.util.Set; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.TreeSet; -import com.sun.hotspot.igv.layout.Cluster; -import com.sun.hotspot.igv.layout.LayoutGraph; -import com.sun.hotspot.igv.layout.LayoutManager; -import com.sun.hotspot.igv.layout.Link; -import com.sun.hotspot.igv.layout.Port; -import com.sun.hotspot.igv.layout.Vertex; - -/** - * - * @author Thomas Wuerthinger - */ -public class HierarchicalClusterLayoutManager implements LayoutManager { - - private OldHierarchicalLayoutManager.Combine combine; - private LayoutManager subManager = new OldHierarchicalLayoutManager(combine); - private LayoutManager manager = new OldHierarchicalLayoutManager(combine, 150); - private static final boolean TRACE = false; - - public HierarchicalClusterLayoutManager(OldHierarchicalLayoutManager.Combine combine) { - this.combine = combine; - } - - public void doLayout(LayoutGraph graph) { - doLayout(graph, new HashSet<Vertex>(), new HashSet<Vertex>(), new HashSet<Link>()); - } - - public void setSubManager(LayoutManager manager) { - this.subManager = manager; - } - - public void setManager(LayoutManager manager) { - this.manager = manager; - } - - public void doLayout(LayoutGraph graph, Set<? extends Vertex> firstLayerHint, Set<? extends Vertex> lastLayerHint, Set<? extends Link> importantLinks) { - - assert graph.verify(); - - HashMap<Cluster, List<Vertex>> lists = new HashMap<Cluster, List<Vertex>>(); - HashMap<Cluster, List<Link>> listsConnection = new HashMap<Cluster, List<Link>>(); - HashMap<Cluster, HashMap<Port, ClusterInputSlotNode>> clusterInputSlotHash = new HashMap<Cluster, HashMap<Port, ClusterInputSlotNode>>(); - HashMap<Cluster, HashMap<Port, ClusterOutputSlotNode>> clusterOutputSlotHash = new HashMap<Cluster, HashMap<Port, ClusterOutputSlotNode>>(); - - HashMap<Cluster, ClusterNode> clusterNodes = new HashMap<Cluster, ClusterNode>(); - HashMap<Cluster, Set<ClusterInputSlotNode>> clusterInputSlotSet = new HashMap<Cluster, Set<ClusterInputSlotNode>>(); - HashMap<Cluster, Set<ClusterOutputSlotNode>> clusterOutputSlotSet = new HashMap<Cluster, Set<ClusterOutputSlotNode>>(); - Set<Link> clusterEdges = new HashSet<Link>(); - Set<Link> interClusterEdges = new HashSet<Link>(); - HashMap<Link, ClusterOutgoingConnection> linkClusterOutgoingConnection = new HashMap<Link, ClusterOutgoingConnection>(); - HashMap<Link, InterClusterConnection> linkInterClusterConnection = new HashMap<Link, InterClusterConnection>(); - HashMap<Link, ClusterIngoingConnection> linkClusterIngoingConnection = new HashMap<Link, ClusterIngoingConnection>(); - Set<ClusterNode> clusterNodeSet = new HashSet<ClusterNode>(); - - Set<Cluster> cluster = graph.getClusters(); - int z = 0; - for (Cluster c : cluster) { - lists.put(c, new ArrayList<Vertex>()); - listsConnection.put(c, new ArrayList<Link>()); - clusterInputSlotHash.put(c, new HashMap<Port, ClusterInputSlotNode>()); - clusterOutputSlotHash.put(c, new HashMap<Port, ClusterOutputSlotNode>()); - clusterOutputSlotSet.put(c, new TreeSet<ClusterOutputSlotNode>()); - clusterInputSlotSet.put(c, new TreeSet<ClusterInputSlotNode>()); - ClusterNode cn = new ClusterNode(c, "" + z); - clusterNodes.put(c, cn); - clusterNodeSet.add(cn); - z++; - } - - // Add cluster edges - for (Cluster c : cluster) { - - ClusterNode start = clusterNodes.get(c); - - for (Cluster succ : c.getSuccessors()) { - ClusterNode end = clusterNodes.get(succ); - if (end != null && start != end) { - ClusterEdge e = new ClusterEdge(start, end); - clusterEdges.add(e); - interClusterEdges.add(e); - } - } - } - - for (Vertex v : graph.getVertices()) { - Cluster c = v.getCluster(); - assert c != null : "Cluster of vertex " + v + " is null!"; - clusterNodes.get(c).addSubNode(v); - } - - for (Link l : graph.getLinks()) { - - Port fromPort = l.getFrom(); - Port toPort = l.getTo(); - Vertex fromVertex = fromPort.getVertex(); - Vertex toVertex = toPort.getVertex(); - Cluster fromCluster = fromVertex.getCluster(); - Cluster toCluster = toVertex.getCluster(); - - Port samePort = null; - if (combine == OldHierarchicalLayoutManager.Combine.SAME_INPUTS) { - samePort = toPort; - } else if (combine == OldHierarchicalLayoutManager.Combine.SAME_OUTPUTS) { - samePort = fromPort; - } - - assert listsConnection.containsKey(fromCluster); - assert listsConnection.containsKey(toCluster); - - if (fromCluster == toCluster) { - listsConnection.get(fromCluster).add(l); - clusterNodes.get(fromCluster).addSubEdge(l); - } else { - ClusterInputSlotNode inputSlotNode = null; - ClusterOutputSlotNode outputSlotNode = null; - - if (samePort != null) { - outputSlotNode = clusterOutputSlotHash.get(fromCluster).get(samePort); - inputSlotNode = clusterInputSlotHash.get(toCluster).get(samePort); - } - - if (outputSlotNode == null) { - outputSlotNode = new ClusterOutputSlotNode(clusterNodes.get(fromCluster), "Out " + fromCluster.toString() + " " + samePort.toString()); - clusterOutputSlotSet.get(fromCluster).add(outputSlotNode); - ClusterOutgoingConnection conn = new ClusterOutgoingConnection(outputSlotNode, l); - outputSlotNode.setOutgoingConnection(conn); - clusterNodes.get(fromCluster).addSubEdge(conn); - if (samePort != null) { - clusterOutputSlotHash.get(fromCluster).put(samePort, outputSlotNode); - } - - linkClusterOutgoingConnection.put(l, conn); - } else { - linkClusterOutgoingConnection.put(l, outputSlotNode.getOutgoingConnection()); - } - - if (inputSlotNode == null) { - inputSlotNode = new ClusterInputSlotNode(clusterNodes.get(toCluster), "In " + toCluster.toString() + " " + samePort.toString()); - clusterInputSlotSet.get(toCluster).add(inputSlotNode); - } - - ClusterIngoingConnection conn = new ClusterIngoingConnection(inputSlotNode, l); - inputSlotNode.setIngoingConnection(conn); - clusterNodes.get(toCluster).addSubEdge(conn); - if (samePort != null) { - clusterInputSlotHash.get(toCluster).put(samePort, inputSlotNode); - } - - linkClusterIngoingConnection.put(l, conn); - - - InterClusterConnection interConn = new InterClusterConnection(outputSlotNode, inputSlotNode); - linkInterClusterConnection.put(l, interConn); - clusterEdges.add(interConn); - } - } - - Timing t = null; - - if (TRACE) { - new Timing("Child timing"); - t.start(); - } - - for (Cluster c : cluster) { - ClusterNode n = clusterNodes.get(c); - subManager.doLayout(new LayoutGraph(n.getSubEdges(), n.getSubNodes()), clusterInputSlotSet.get(c), clusterOutputSlotSet.get(c), new HashSet<Link>()); - n.updateSize(); - } - - Set<Vertex> roots = new LayoutGraph(interClusterEdges).findRootVertices(); - for (Vertex v : roots) { - assert v instanceof ClusterNode; - ((ClusterNode) v).setRoot(true); - } - - manager.doLayout(new LayoutGraph(clusterEdges, clusterNodeSet), new HashSet<Vertex>(), new HashSet<Vertex>(), interClusterEdges); - - for (Cluster c : cluster) { - ClusterNode n = clusterNodes.get(c); - c.setBounds(new Rectangle(n.getPosition(), n.getSize())); - } - - // TODO: handle case where blocks are not fully connected - - if (TRACE) { - t.stop(); - t.print(); - } - - for (Link l : graph.getLinks()) { - - if (linkInterClusterConnection.containsKey(l)) { - ClusterOutgoingConnection conn1 = linkClusterOutgoingConnection.get(l); - InterClusterConnection conn2 = linkInterClusterConnection.get(l); - ClusterIngoingConnection conn3 = linkClusterIngoingConnection.get(l); - - assert conn1 != null; - assert conn2 != null; - assert conn3 != null; - - List<Point> points = new ArrayList<Point>(); - - points.addAll(conn1.getControlPoints()); - points.addAll(conn2.getControlPoints()); - points.addAll(conn3.getControlPoints()); - - l.setControlPoints(points); - } - } - } - - public void doRouting(LayoutGraph graph) { - } -}
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java Sat Jan 28 00:16:17 2012 +0100 @@ -103,10 +103,10 @@ public int bottomYOffset; public Vertex vertex; // Only used for non-dummy nodes, otherwise null - public List<LayoutEdge> preds = new ArrayList<LayoutEdge>(); - public List<LayoutEdge> succs = new ArrayList<LayoutEdge>(); - public HashMap<Integer, Integer> outOffsets = new HashMap<Integer, Integer>(); - public HashMap<Integer, Integer> inOffsets = new HashMap<Integer, Integer>(); + public List<LayoutEdge> preds = new ArrayList<>(); + public List<LayoutEdge> succs = new ArrayList<>(); + public HashMap<Integer, Integer> outOffsets = new HashMap<>(); + public HashMap<Integer, Integer> inOffsets = new HashMap<>(); public int pos = -1; // Position within layer public int crossingNumber; @@ -174,7 +174,7 @@ this.layerOffset = LAYER_OFFSET; this.maxLayerLength = MAX_LAYER_LENGTH; this.minLayerDifference = MIN_LAYER_DIFFERENCE; - this.linksToFollow = new HashSet<Link>(); + this.linksToFollow = new HashSet<>(); } public int getMaxLayerLength() { @@ -201,14 +201,14 @@ this.firstLayerHint = firstLayerHint; this.lastLayerHint = lastLayerHint; - vertexToLayoutNode = new HashMap<Vertex, LayoutNode>(); - reversedLinks = new HashSet<Link>(); - reversedLinkStartPoints = new HashMap<Link, List<Point>>(); - reversedLinkEndPoints = new HashMap<Link, List<Point>>(); - bottomEdgeHash = new HashMap<LayoutEdge, LayoutEdge>(); - nodes = new ArrayList<LayoutNode>(); - splitStartPoints = new HashMap<Link, List<Point>>(); - splitEndPoints = new HashMap<Link, List<Point>>(); + vertexToLayoutNode = new HashMap<>(); + reversedLinks = new HashSet<>(); + reversedLinkStartPoints = new HashMap<>(); + reversedLinkEndPoints = new HashMap<>(); + bottomEdgeHash = new HashMap<>(); + nodes = new ArrayList<>(); + splitStartPoints = new HashMap<>(); + splitEndPoints = new HashMap<>(); // ############################################################# // Step 1: Build up data structure @@ -219,7 +219,7 @@ new ReverseEdges().start(); for (LayoutNode n : nodes) { - ArrayList<LayoutEdge> tmpArr = new ArrayList<LayoutEdge>(); + ArrayList<LayoutEdge> tmpArr = new ArrayList<>(); for (LayoutEdge e : n.succs) { if (importantLinks.contains(e.link)) { tmpArr.add(e); @@ -265,8 +265,8 @@ protected void run() { - HashMap<Vertex, Point> vertexPositions = new HashMap<Vertex, Point>(); - HashMap<Link, List<Point>> linkPositions = new HashMap<Link, List<Point>>(); + HashMap<Vertex, Point> vertexPositions = new HashMap<>(); + HashMap<Link, List<Point>> linkPositions = new HashMap<>(); for (Vertex v : graph.getVertices()) { LayoutNode n = vertexToLayoutNode.get(v); assert !vertexPositions.containsKey(v); @@ -277,7 +277,7 @@ for (LayoutEdge e : n.preds) { if (e.link != null) { - ArrayList<Point> points = new ArrayList<Point>(); + ArrayList<Point> points = new ArrayList<>(); Point p = new Point(e.to.x + e.relativeTo, e.to.y + e.to.yOffset + e.link.getTo().getRelativePosition().y); points.add(p); @@ -362,7 +362,7 @@ for (LayoutEdge e : n.succs) { if (e.link != null) { - ArrayList<Point> points = new ArrayList<Point>(); + ArrayList<Point> points = new ArrayList<>(); Point p = new Point(e.from.x + e.relativeFrom, e.from.y + e.from.height - e.from.bottomYOffset + e.link.getFrom().getRelativePosition().y); points.add(p); if (e.from.outOffsets.containsKey(e.relativeFrom)) { @@ -498,9 +498,9 @@ public float d; public int orderNumber = -1; - public ArrayList<LayoutNode> nodes = new ArrayList<LayoutNode>(); - public HashSet<Segment> succs = new HashSet<Segment>(); - public HashSet<Segment> preds = new HashSet<Segment>(); + public ArrayList<LayoutNode> nodes = new ArrayList<>(); + public HashSet<Segment> succs = new HashSet<>(); + public HashSet<Segment> preds = new HashSet<>(); public Region region; } private static final Comparator<Segment> segmentComparator = new Comparator<Segment>() { @@ -514,9 +514,9 @@ public float d; public int minOrderNumber; - public SortedSet<Segment> segments = new TreeSet<Segment>(segmentComparator); - public HashSet<Region> succs = new HashSet<Region>(4); - public HashSet<Region> preds = new HashSet<Region>(4); + public SortedSet<Segment> segments = new TreeSet<>(segmentComparator); + public HashSet<Region> succs = new HashSet<>(4); + public HashSet<Region> preds = new HashSet<>(4); } private static final Comparator<Region> regionComparator = new Comparator<Region>() { @@ -583,9 +583,9 @@ createArrays(); for (int i = 0; i < layers.length; i++) { - space[i] = new ArrayList<Integer>(); - downProcessingOrder[i] = new ArrayList<LayoutNode>(); - upProcessingOrder[i] = new ArrayList<LayoutNode>(); + space[i] = new ArrayList<>(); + downProcessingOrder[i] = new ArrayList<>(); + upProcessingOrder[i] = new ArrayList<>(); int curX = 0; for (LayoutNode n : layers[i]) { @@ -710,7 +710,7 @@ private ArrayList<Integer> space; public NodeRow(ArrayList<Integer> space) { - treeSet = new TreeSet<LayoutNode>(nodePositionComparator); + treeSet = new TreeSet<>(nodePositionComparator); this.space = space; } @@ -758,8 +758,8 @@ private class AssignXCoordinates extends AlgorithmPart { - HashMap<LayoutNode, Segment> hashMap = new HashMap<LayoutNode, Segment>(); - ArrayList<Segment> segments = new ArrayList<Segment>(); + HashMap<LayoutNode, Segment> hashMap = new HashMap<>(); + ArrayList<Segment> segments = new ArrayList<>(); private void generateSegments() { @@ -819,10 +819,10 @@ private void topologicalSorting() { - Queue<Segment> queue = new LinkedList<Segment>(); + Queue<Segment> queue = new LinkedList<>(); int index = 0; - ArrayList<Segment> newList = new ArrayList<Segment>(); + ArrayList<Segment> newList = new ArrayList<>(); for (Segment s : segments) { if (s.preds.size() == 0) { s.orderNumber = index; @@ -946,7 +946,7 @@ upValues(); } - SortedSet<Region> regions = new TreeSet<Region>(regionComparator); + SortedSet<Region> regions = new TreeSet<>(regionComparator); for (Segment s : segments) { s.region = new Region(); s.region.minOrderNumber = s.orderNumber; @@ -997,7 +997,7 @@ - ArrayList<Region> reversedRegions = new ArrayList<Region>(); + ArrayList<Region> reversedRegions = new ArrayList<>(); for (Region r : regions) { if (r.d < 0) { processRegion(r, down); @@ -1019,7 +1019,7 @@ return; } - ArrayList<Segment> arr = new ArrayList<Segment>(); + ArrayList<Segment> arr = new ArrayList<>(); for (Segment s : r.segments) { arr.add(s); } @@ -1119,7 +1119,7 @@ layers = new List[layerCount]; for (int i = 0; i < layerCount; i++) { - layers[i] = new ArrayList<LayoutNode>(); + layers[i] = new ArrayList<>(); } } @@ -1127,7 +1127,7 @@ createLayers(); // Generate initial ordering - HashSet<LayoutNode> visited = new HashSet<LayoutNode>(); + HashSet<LayoutNode> visited = new HashSet<>(); for (LayoutNode n : nodes) { if (n.layer == 0) { layers[0].add(n); @@ -1310,7 +1310,7 @@ @Override public void postCheck() { - HashSet<LayoutNode> visited = new HashSet<LayoutNode>(); + HashSet<LayoutNode> visited = new HashSet<>(); for (int i = 0; i < layers.length; i++) { for (LayoutNode n : layers[i]) { assert !visited.contains(n); @@ -1392,14 +1392,14 @@ return e1.to.layer - e2.to.layer; } }; - HashMap<Integer, List<LayoutEdge>> portHash = new HashMap<Integer, List<LayoutEdge>>(); - ArrayList<LayoutNode> currentNodes = new ArrayList<LayoutNode>(nodes); + HashMap<Integer, List<LayoutEdge>> portHash = new HashMap<>(); + ArrayList<LayoutNode> currentNodes = new ArrayList<>(nodes); for (LayoutNode n : currentNodes) { portHash.clear(); - ArrayList<LayoutEdge> succs = new ArrayList<LayoutEdge>(n.succs); - HashMap<Integer, LayoutNode> topNodeHash = new HashMap<Integer, LayoutNode>(); - HashMap<Integer, HashMap<Integer, LayoutNode>> bottomNodeHash = new HashMap<Integer, HashMap<Integer, LayoutNode>>(); + ArrayList<LayoutEdge> succs = new ArrayList<>(n.succs); + HashMap<Integer, LayoutNode> topNodeHash = new HashMap<>(); + HashMap<Integer, HashMap<Integer, LayoutNode>> bottomNodeHash = new HashMap<>(); for (LayoutEdge e : succs) { assert e.from.layer < e.to.layer; if (e.from.layer != e.to.layer - 1) { @@ -1474,7 +1474,7 @@ } } - succs = new ArrayList<LayoutEdge>(n.succs); + succs = new ArrayList<>(n.succs); for (LayoutEdge e : succs) { Integer i = e.relativeFrom; @@ -1541,7 +1541,7 @@ } else if (combine == Combine.SAME_INPUTS) { throw new UnsupportedOperationException("Currently not supported"); } else { - ArrayList<LayoutNode> currentNodes = new ArrayList<LayoutNode>(nodes); + ArrayList<LayoutNode> currentNodes = new ArrayList<>(nodes); for (LayoutNode n : currentNodes) { for (LayoutEdge e : n.succs) { processSingleEdge(e); @@ -1587,7 +1587,7 @@ @Override public void postCheck() { - ArrayList<LayoutNode> currentNodes = new ArrayList<LayoutNode>(nodes); + ArrayList<LayoutNode> currentNodes = new ArrayList<>(nodes); for (LayoutNode n : currentNodes) { for (LayoutEdge e : n.succs) { assert e.from.layer == e.to.layer - 1; @@ -1614,9 +1614,9 @@ protected void run() { - List<LayoutNode> insertOrder = new ArrayList<LayoutNode>(); + List<LayoutNode> insertOrder = new ArrayList<>(); - HashSet<LayoutNode> set = new HashSet<LayoutNode>(); + HashSet<LayoutNode> set = new HashSet<>(); for (LayoutNode n : nodes) { if (n.preds.size() == 0) { set.add(n); @@ -1626,8 +1626,8 @@ } int z = minLayerDifference; - HashSet<LayoutNode> newSet = new HashSet<LayoutNode>(); - HashSet<LayoutNode> failed = new HashSet<LayoutNode>(); + HashSet<LayoutNode> newSet = new HashSet<>(); + HashSet<LayoutNode> failed = new HashSet<>(); while (!set.isEmpty()) { newSet.clear(); @@ -1722,7 +1722,7 @@ // Remove self-edges for (LayoutNode node : nodes) { - ArrayList<LayoutEdge> succs = new ArrayList<LayoutEdge>(node.succs); + ArrayList<LayoutEdge> succs = new ArrayList<>(node.succs); for (LayoutEdge e : succs) { assert e.from == node; if (e.to == node) { @@ -1750,8 +1750,8 @@ // Start DFS and reverse back edges - visited = new HashSet<LayoutNode>(); - active = new HashSet<LayoutNode>(); + visited = new HashSet<>(); + active = new HashSet<>(); for (LayoutNode node : nodes) { DFS(node); } @@ -1759,7 +1759,7 @@ for (LayoutNode node : nodes) { - SortedSet<Integer> reversedDown = new TreeSet<Integer>(); + SortedSet<Integer> reversedDown = new TreeSet<>(); for (LayoutEdge e : node.succs) { if (reversedLinks.contains(e.link)) { @@ -1770,9 +1770,9 @@ SortedSet<Integer> reversedUp = null; if (reversedDown.size() == 0) { - reversedUp = new TreeSet<Integer>(Collections.reverseOrder()); + reversedUp = new TreeSet<>(Collections.reverseOrder()); } else { - reversedUp = new TreeSet<Integer>(); + reversedUp = new TreeSet<>(); } for (LayoutEdge e : node.preds) { @@ -1786,7 +1786,7 @@ int curX = 0; int curWidth = node.width + reversedDown.size() * offset; for (int pos : reversedDown) { - ArrayList<LayoutEdge> reversedSuccs = new ArrayList<LayoutEdge>(); + ArrayList<LayoutEdge> reversedSuccs = new ArrayList<>(); for (LayoutEdge e : node.succs) { if (e.relativeFrom == pos && reversedLinks.contains(e.link)) { reversedSuccs.add(e); @@ -1794,7 +1794,7 @@ } } - ArrayList<Point> startPoints = new ArrayList<Point>(); + ArrayList<Point> startPoints = new ArrayList<>(); startPoints.add(new Point(curWidth, curX)); startPoints.add(new Point(pos, curX)); startPoints.add(new Point(pos, reversedDown.size() * offset)); @@ -1824,7 +1824,7 @@ int oldNodeHeight = node.height; for (int pos : reversedUp) { - ArrayList<LayoutEdge> reversedPreds = new ArrayList<LayoutEdge>(); + ArrayList<LayoutEdge> reversedPreds = new ArrayList<>(); for (LayoutEdge e : node.preds) { if (e.relativeTo == pos && reversedLinks.contains(e.link)) { if (reversedDown.size() == 0) { @@ -1837,7 +1837,7 @@ } } node.height += offset; - ArrayList<Point> endPoints = new ArrayList<Point>(); + ArrayList<Point> endPoints = new ArrayList<>(); if (reversedDown.size() == 0) { @@ -1885,7 +1885,7 @@ return; } - Stack<LayoutNode> stack = new Stack<LayoutNode>(); + Stack<LayoutNode> stack = new Stack<>(); stack.push(startNode); while (!stack.empty()) { @@ -1902,7 +1902,7 @@ visited.add(node); active.add(node); - ArrayList<LayoutEdge> succs = new ArrayList<LayoutEdge>(node.succs); + ArrayList<LayoutEdge> succs = new ArrayList<>(node.succs); for (LayoutEdge e : succs) { if (active.contains(e.to)) { assert visited.contains(e.to); @@ -1957,8 +1957,8 @@ for (LayoutNode n : nodes) { - HashSet<LayoutNode> curVisited = new HashSet<LayoutNode>(); - Queue<LayoutNode> queue = new LinkedList<LayoutNode>(); + HashSet<LayoutNode> curVisited = new HashSet<>(); + Queue<LayoutNode> queue = new LinkedList<>(); for (LayoutEdge e : n.succs) { LayoutNode s = e.to; queue.add(s); @@ -2004,7 +2004,7 @@ protected void run() { // Set up nodes - List<Vertex> vertices = new ArrayList<Vertex>(graph.getVertices()); + List<Vertex> vertices = new ArrayList<>(graph.getVertices()); Collections.sort(vertices); for (Vertex v : vertices) { @@ -2018,7 +2018,7 @@ } // Set up edges - List<Link> links = new ArrayList<Link>(graph.getLinks()); + List<Link> links = new ArrayList<>(graph.getLinks()); Collections.sort(links, linkComparator); for (Link l : links) { LayoutEdge edge = new LayoutEdge();
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java Sat Jan 28 00:16:17 2012 +0100 @@ -46,7 +46,7 @@ this.inputSlotNode = inputSlotNode; this.inputSlot = inputSlotNode.getInputSlot(); this.outputSlot = outputSlotNode.getOutputSlot(); - intermediatePoints = new ArrayList<Point>(); + intermediatePoints = new ArrayList<>(); } public ClusterOutputSlotNode getOutputSlotNode() {
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java Sat Jan 28 00:16:17 2012 +0100 @@ -90,8 +90,8 @@ protected Node(Graph<N, E> graph, N data) { setData(data); this.graph = graph; - inEdges = new ArrayList<Edge<N, E>>(); - outEdges = new ArrayList<Edge<N, E>>(); + inEdges = new ArrayList<>(); + outEdges = new ArrayList<>(); } protected void addInEdge(Edge<N, E> e) { @@ -125,7 +125,7 @@ } public List<Node<N, E>> getSuccessors() { - ArrayList<Node<N, E>> succ = new ArrayList<Node<N, E>>(); + ArrayList<Node<N, E>> succ = new ArrayList<>(); for (Edge<N, E> e : getOutEdges()) { Node<N, E> n = e.getDest(); if (!succ.contains(n)) { @@ -136,7 +136,7 @@ } public List<Node<N, E>> getPredecessors() { - ArrayList<Node<N, E>> pred = new ArrayList<Node<N, E>>(); + ArrayList<Node<N, E>> pred = new ArrayList<>(); for (Edge<N, E> e : getInEdges()) { Node<N, E> n = e.getSource(); if (!pred.contains(n)) {
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/OldHierarchicalLayoutManager.java Fri Jan 27 23:57:47 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1222 +0,0 @@ -/* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ -package com.sun.hotspot.igv.hierarchicallayout; - -import java.awt.Point; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import com.sun.hotspot.igv.layout.LayoutGraph; -import com.sun.hotspot.igv.layout.LayoutManager; -import com.sun.hotspot.igv.layout.Link; -import com.sun.hotspot.igv.layout.Port; -import com.sun.hotspot.igv.layout.Vertex; - -/** - * - * @author Thomas Wuerthinger - */ -public class OldHierarchicalLayoutManager implements LayoutManager { - - public static final int DUMMY_WIDTH = 0; - public static final int DUMMY_HEIGHT = 0; - public static final int LAYER_OFFSET = 50; - public static final int OFFSET = 8; - public static final boolean VERTICAL_LAYOUT = true; - public static final boolean ASSERT = false; - public static final boolean TRACE = false; - public static final Timing initTiming = new Timing("init"); - public static final Timing removeCyclesTiming = new Timing("removeCycles"); - public static final Timing reversedEdgesTiming = new Timing("reversedEdges"); - public static final Timing assignLayersTiming = new Timing("assignLayers"); - public static final Timing dummyNodesTiming = new Timing("dummyNodes"); - public static final Timing crossingReductionTiming = new Timing("crossingReduction"); - public static final Timing assignCoordinatesTiming = new Timing("assignCoordinates"); - public static final Timing assignRealTiming = new Timing("assignReal"); - public static final Timing rootVertexTiming = new Timing("rootVertex"); - public static final Timing createEdgesTiming = new Timing("createEdges"); - public static final Timing optimizeMedianTiming = new Timing("optimizeMedian"); - private Combine combine; - - public enum Combine { - - NONE, - SAME_INPUTS, - SAME_OUTPUTS - } - - private class NodeData { - - private Map<Port, Integer> reversePositions; - private Vertex node; - private Link edge; - private int layer; - private int x; - private int y; - private int width; - - public NodeData(Vertex node) { - reversePositions = new HashMap<Port, Integer>(); - layer = -1; - this.node = node; - assert node != null; - - if (VERTICAL_LAYOUT) { - width = node.getSize().width; - } else { - width = node.getSize().height; - } - } - - public NodeData(Link edge) { - layer = -1; - this.edge = edge; - assert edge != null; - - if (VERTICAL_LAYOUT) { - width = DUMMY_WIDTH; - } else { - width = DUMMY_HEIGHT; - } - } - - public Vertex getNode() { - return node; - } - - public Link getEdge() { - return edge; - } - - public int getCoordinate() { - return x; - } - - public void setCoordinate(int x) { - this.x = x; - } - - public int getX() { - if (VERTICAL_LAYOUT) { - return x; - } else { - return y; - } - } - - public int getY() { - if (VERTICAL_LAYOUT) { - return y; - } else { - return x; - } - } - - public void setLayerCoordinate(int y) { - this.y = y; - } - - public void setLayer(int x) { - layer = x; - } - - public int getLayer() { - return layer; - } - - public boolean isDummy() { - return edge != null; - } - - public int getWidth() { - return width; - } - - public void addReversedStartEdge(Edge<NodeData, EdgeData> e) { - assert e.getData().isReversed(); - Port port = e.getData().getEdge().getTo(); - int pos = addReversedPort(port); - Point start = e.getData().getRelativeStart(); - e.getData().addStartPoint(start); - int yCoord = node.getSize().height + width - node.getSize().width; - e.getData().addStartPoint(new Point(start.x, yCoord)); - e.getData().addStartPoint(new Point(pos, yCoord)); - e.getData().setRelativeStart(new Point(pos, 0)); - } - - private int addReversedPort(Port p) { - if (reversePositions.containsKey(p)) { - return reversePositions.get(p); - } else { - width += OFFSET; - reversePositions.put(p, width); - return width; - } - } - - public void addReversedEndEdge(Edge<NodeData, EdgeData> e) { - assert e.getData().isReversed(); - int pos = addReversedPort(e.getData().getEdge().getFrom()); - Point end = e.getData().getRelativeEnd(); - e.getData().setRelativeEnd(new Point(pos, node.getSize().height)); - int yCoord = 0 - width + node.getSize().width; - e.getData().addEndPoint(new Point(pos, yCoord)); - e.getData().addEndPoint(new Point(end.x, yCoord)); - e.getData().addEndPoint(end); - } - - public int getHeight() { - if (isDummy()) { - if (VERTICAL_LAYOUT) { - return DUMMY_HEIGHT; - } else { - return DUMMY_WIDTH; - } - - } else { - if (VERTICAL_LAYOUT) { - return node.getSize().height; - } else { - return node.getSize().width; - } - } - } - - @Override - public String toString() { - if (isDummy()) { - return edge.toString() + "(layer=" + layer + ")"; - } else { - return node.toString() + "(layer=" + layer + ")"; - } - } - } - - private class EdgeData { - - private Point relativeEnd; - private Point relativeStart; - private List<Point> startPoints; - private List<Point> endPoints; - private boolean important; - private boolean reversed; - private Link edge; - - public EdgeData(Link edge) { - this(edge, false); - } - - public EdgeData(Link edge, boolean rev) { - this.edge = edge; - reversed = rev; - relativeStart = edge.getFrom().getRelativePosition(); - relativeEnd = edge.getTo().getRelativePosition(); - assert relativeStart.x >= 0 && relativeStart.x <= edge.getFrom().getVertex().getSize().width; - assert relativeStart.y >= 0 && relativeStart.y <= edge.getFrom().getVertex().getSize().height; - assert relativeEnd.x >= 0 && relativeEnd.x <= edge.getTo().getVertex().getSize().width; - assert relativeEnd.y >= 0 && relativeEnd.y <= edge.getTo().getVertex().getSize().height; - startPoints = new ArrayList<Point>(); - endPoints = new ArrayList<Point>(); - this.important = true; - } - - public boolean isImportant() { - return important; - } - - public void setImportant(boolean b) { - this.important = b; - } - - public List<Point> getStartPoints() { - return startPoints; - } - - public List<Point> getEndPoints() { - return endPoints; - } - - public List<Point> getAbsoluteEndPoints() { - if (endPoints.size() == 0) { - return endPoints; - } - - List<Point> result = new ArrayList<Point>(); - Point point = edge.getTo().getVertex().getPosition(); - for (Point p : endPoints) { - Point p2 = new Point(p.x + point.x, p.y + point.y); - result.add(p2); - } - - return result; - } - - public List<Point> getAbsoluteStartPoints() { - if (startPoints.size() == 0) { - return startPoints; - } - - List<Point> result = new ArrayList<Point>(); - Point point = edge.getFrom().getVertex().getPosition(); - for (Point p : startPoints) { - Point p2 = new Point(p.x + point.x, p.y + point.y); - result.add(p2); - } - - return result; - } - - public void addEndPoint(Point p) { - endPoints.add(p); - } - - public void addStartPoint(Point p) { - startPoints.add(p); - } - - public Link getEdge() { - return edge; - } - - public void setRelativeEnd(Point p) { - relativeEnd = p; - } - - public void setRelativeStart(Point p) { - relativeStart = p; - } - - public Point getRelativeEnd() { - return relativeEnd; - } - - public Point getRelativeStart() { - return relativeStart; - } - - public boolean isReversed() { - return reversed; - } - - public void setReversed(boolean b) { - reversed = b; - } - - @Override - public String toString() { - return "EdgeData[reversed=" + reversed + "]"; - } - } - private Graph<NodeData, EdgeData> graph; - private Map<Vertex, Node<NodeData, EdgeData>> nodeMap; - private int layerOffset; - - /** Creates a new instance of HierarchicalPositionManager */ - public OldHierarchicalLayoutManager(Combine combine) { - this(combine, LAYER_OFFSET); - } - - public OldHierarchicalLayoutManager(Combine combine, int layerOffset) { - this.combine = combine; - this.layerOffset = layerOffset; - } - - public void doRouting(LayoutGraph graph) { - } - - //public void setPositions(PositionedNode rootNode, List<? extends PositionedNode> nodes, List<? extends PositionedEdge> edges) { - public void doLayout(LayoutGraph layoutGraph) { - doLayout(layoutGraph, new HashSet<Vertex>(), new HashSet<Vertex>()); - } - - public void doLayout(LayoutGraph layoutGraph, Set<? extends Vertex> firstLayerHint, Set<? extends Vertex> lastLayerHint) { - doLayout(layoutGraph, firstLayerHint, lastLayerHint, new HashSet<Link>()); - } - - public void doLayout(LayoutGraph layoutGraph, Set<? extends Vertex> firstLayerHint, Set<? extends Vertex> lastLayerHint, Set<? extends Link> importantLinksHint) { - - if (TRACE) { - System.out.println("HierarchicalPositionManager.doLayout called"); - System.out.println("Vertex count = " + layoutGraph.getVertices().size() + " Link count = " + layoutGraph.getLinks().size()); - } - - // Nothing to do => quit immediately - if (layoutGraph.getVertices().size() == 0) { - return; - } - - initTiming.start(); - - // Mapping vertex to Node in graph - nodeMap = new HashMap<Vertex, Node<NodeData, EdgeData>>(); - - graph = new Graph<NodeData, EdgeData>(); - - Set<Node<NodeData, EdgeData>> rootNodes = new HashSet<Node<NodeData, EdgeData>>(); - Set<Vertex> startRootVertices = new HashSet<Vertex>(); - - for (Vertex v : layoutGraph.getVertices()) { - if (v.isRoot()) { - startRootVertices.add(v); - } - } - - rootVertexTiming.start(); - Set<Vertex> rootVertices = layoutGraph.findRootVertices(startRootVertices); - rootVertexTiming.stop(); - - - for (Vertex node : layoutGraph.getVertices()) { - - NodeData data = new NodeData(node); - Node<NodeData, EdgeData> n = graph.createNode(data, node); - nodeMap.put(node, n); - - if (rootVertices.contains(node)) { - rootNodes.add(n); - } - } - - Set<? extends Link> links = layoutGraph.getLinks(); - Link[] linkArr = new Link[links.size()]; - links.toArray(linkArr); - - List<Link> linkList = new ArrayList<Link>(); - for (Link l : linkArr) { - linkList.add(l); - } - - createEdgesTiming.start(); - Collections.sort(linkList, new Comparator<Link>() { - - public int compare(Link o1, Link o2) { - int result = o1.getFrom().getVertex().compareTo(o2.getFrom().getVertex()); - if (result == 0) { - return o1.getTo().getVertex().compareTo(o2.getTo().getVertex()); - } else { - return result; - } - } - }); - - for (Link edge : linkList) { - EdgeData data = new EdgeData(edge); - graph.createEdge(graph.getNode(edge.getFrom().getVertex()), graph.getNode(edge.getTo().getVertex()), data, data); - if (importantLinksHint.size() > 0 && !importantLinksHint.contains(edge)) { - data.setImportant(false); - } - } - createEdgesTiming.stop(); - - initTiming.stop(); - - removeCyclesTiming.start(); - - // STEP 1: Remove cycles! - removeCycles(rootNodes); - if (ASSERT) { - assert checkRemoveCycles(); - } - - removeCyclesTiming.stop(); - - reversedEdgesTiming.start(); - - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - List<Edge<NodeData, EdgeData>> edges = new ArrayList<Edge<NodeData, EdgeData>>(n.getOutEdges()); - Collections.sort(edges, new Comparator<Edge<NodeData, EdgeData>>() { - - public int compare(Edge<NodeData, EdgeData> o1, Edge<NodeData, EdgeData> o2) { - return o2.getData().getRelativeEnd().x - o1.getData().getRelativeEnd().x; - } - }); - - - for (Edge<NodeData, EdgeData> e : edges) { - - if (e.getData().isReversed()) { - e.getSource().getData().addReversedEndEdge(e); - } - } - } - - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - List<Edge<NodeData, EdgeData>> edges = new ArrayList<Edge<NodeData, EdgeData>>(n.getInEdges()); - Collections.sort(edges, new Comparator<Edge<NodeData, EdgeData>>() { - - public int compare(Edge<NodeData, EdgeData> o1, Edge<NodeData, EdgeData> o2) { - return o2.getData().getRelativeStart().x - o1.getData().getRelativeStart().x; - } - }); - - - for (Edge<NodeData, EdgeData> e : edges) { - if (e.getData().isReversed()) { - e.getDest().getData().addReversedStartEdge(e); - } - } - } - - reversedEdgesTiming.stop(); - - assignLayersTiming.start(); - // STEP 2: Assign layers! - int maxLayer = assignLayers(rootNodes, firstLayerHint, lastLayerHint); - if (ASSERT) { - assert checkAssignLayers(); - } - - // Put into layer array - //int maxLayer = 0; - //for(Node<NodeData, EdgeData> n : graph.getNodes()) { - // maxLayer = Math.max(maxLayer, n.getData().getLayer()); - //} - - - @SuppressWarnings("unchecked") - ArrayList<Node<NodeData, EdgeData>> layers[] = (ArrayList<Node<NodeData, EdgeData>>[]) new ArrayList[maxLayer + 1]; - int layerSizes[] = new int[maxLayer + 1]; - for (int i = 0; i < maxLayer + 1; i++) { - layers[i] = new ArrayList<Node<NodeData, EdgeData>>(); - } - - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - int curLayer = n.getData().getLayer(); - layers[curLayer].add(n); - } - - assignLayersTiming.stop(); - - // STEP 3: Insert dummy nodes! - dummyNodesTiming.start(); - insertDummyNodes(layers); - if (ASSERT) { - assert checkDummyNodes(); - } - dummyNodesTiming.stop(); - - crossingReductionTiming.start(); - // STEP 4: Assign Y coordinates - assignLayerCoordinates(layers, layerSizes); - - // STEP 5: Crossing reduction - crossingReduction(layers); - crossingReductionTiming.stop(); - - // STEP 6: Assign Y coordinates - assignCoordinatesTiming.start(); - assignCoordinates(layers); - assignCoordinatesTiming.stop(); - - assignRealTiming.start(); - - // Assign coordinates of nodes to real objects - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - if (!n.getData().isDummy()) { - - Vertex node = n.getData().getNode(); - node.setPosition(new Point(n.getData().getX(), n.getData().getY())); - } - } - - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - if (!n.getData().isDummy()) { - - Vertex node = n.getData().getNode(); - - List<Edge<NodeData, EdgeData>> outEdges = n.getOutEdges(); - for (Edge<NodeData, EdgeData> e : outEdges) { - Node<NodeData, EdgeData> succ = e.getDest(); - if (succ.getData().isDummy()) { - //PositionedEdge edge = succ.getData().getEdge(); - List<Point> points = new ArrayList<Point>(); - assignToRealObjects(layerSizes, succ, points); - } else { - List<Point> points = new ArrayList<Point>(); - - EdgeData otherEdgeData = e.getData(); - points.addAll(otherEdgeData.getAbsoluteStartPoints()); - Link otherEdge = otherEdgeData.getEdge(); - Point relFrom = new Point(otherEdgeData.getRelativeStart()); - Point from = otherEdge.getFrom().getVertex().getPosition(); - relFrom.move(relFrom.x + from.x, relFrom.y + from.y); - points.add(relFrom); - - Point relTo = new Point(otherEdgeData.getRelativeEnd()); - Point to = otherEdge.getTo().getVertex().getPosition(); - relTo.move(relTo.x + to.x, relTo.y + to.y); - assert from != null; - assert to != null; - points.add(relTo); - points.addAll(otherEdgeData.getAbsoluteEndPoints()); - e.getData().getEdge().setControlPoints(points); - } - } - } - } - - assignRealTiming.stop(); - - initTiming.print(); - removeCyclesTiming.print(); - reversedEdgesTiming.print(); - assignLayersTiming.print(); - dummyNodesTiming.print(); - crossingReductionTiming.print(); - assignCoordinatesTiming.print(); - assignRealTiming.print(); - rootVertexTiming.print(); - createEdgesTiming.print(); - optimizeMedianTiming.print(); - } - - public boolean onOneLine(Point p1, Point p2, Point p3) { - int xoff1 = p1.x - p2.x; - int yoff1 = p1.y - p2.y; - int xoff2 = p3.x - p2.x; - int yoff2 = p3.y - p2.x; - - return (xoff1 * yoff2 - yoff1 * xoff2 == 0); - } - - private void assignToRealObjects(int layerSizes[], Node<NodeData, EdgeData> cur, List<Point> points) { - assert cur.getData().isDummy(); - - ArrayList<Point> otherPoints = new ArrayList<Point>(points); - - int size = layerSizes[cur.getData().getLayer()]; - otherPoints.add(new Point(cur.getData().getX(), cur.getData().getY() - size / 2)); - if (otherPoints.size() >= 3 && onOneLine(otherPoints.get(otherPoints.size() - 1), otherPoints.get(otherPoints.size() - 2), otherPoints.get(otherPoints.size() - 3))) { - otherPoints.remove(otherPoints.size() - 2); - } - otherPoints.add(new Point(cur.getData().getX(), cur.getData().getY() + size / 2)); - if (otherPoints.size() >= 3 && onOneLine(otherPoints.get(otherPoints.size() - 1), otherPoints.get(otherPoints.size() - 2), otherPoints.get(otherPoints.size() - 3))) { - otherPoints.remove(otherPoints.size() - 2); - } - - for (int i = 0; i < cur.getOutEdges().size(); i++) { - Node<NodeData, EdgeData> otherSucc = cur.getOutEdges().get(i).getDest(); - - if (otherSucc.getData().isDummy()) { - assignToRealObjects(layerSizes, otherSucc, otherPoints); - } else { - EdgeData otherEdgeData = cur.getOutEdges().get(i).getData(); - Link otherEdge = otherEdgeData.getEdge(); - - List<Point> middlePoints = new ArrayList<Point>(otherPoints); - if (cur.getOutEdges().get(i).getData().isReversed()) { - Collections.reverse(middlePoints); - } - - ArrayList<Point> copy = new ArrayList<Point>(); - Point relFrom = new Point(otherEdgeData.getRelativeStart()); - Point from = otherEdge.getFrom().getVertex().getPosition(); - //int moveUp = (size - otherEdge.getFrom().getVertex().getSize().height) / 2; - relFrom.move(relFrom.x + from.x, relFrom.y + from.y); - copy.addAll(otherEdgeData.getAbsoluteStartPoints()); - copy.add(relFrom); - copy.addAll(middlePoints); - - Point relTo = new Point(otherEdgeData.getRelativeEnd()); - Point to = otherEdge.getTo().getVertex().getPosition(); - relTo.move(relTo.x + to.x, relTo.y + to.y); - copy.add(relTo); - - copy.addAll(otherEdgeData.getAbsoluteEndPoints()); - - - otherEdge.setControlPoints(copy); - } - } - } - - private boolean checkDummyNodes() { - for (Edge<NodeData, EdgeData> e : graph.getEdges()) { - if (e.getSource().getData().getLayer() != e.getDest().getData().getLayer() - 1) { - return false; - } - } - - return true; - } - - private void insertDummyNodes(ArrayList<Node<NodeData, EdgeData>> layers[]) { - - int sum = 0; - List<Node<NodeData, EdgeData>> nodes = new ArrayList<Node<NodeData, EdgeData>>(graph.getNodes()); - int edgeCount = 0; - int innerMostLoop = 0; - - for (Node<NodeData, EdgeData> n : nodes) { - List<Edge<NodeData, EdgeData>> edges = new ArrayList<Edge<NodeData, EdgeData>>(n.getOutEdges()); - for (Edge<NodeData, EdgeData> e : edges) { - - edgeCount++; - Link edge = e.getData().getEdge(); - Node<NodeData, EdgeData> destNode = e.getDest(); - Node<NodeData, EdgeData> lastNode = n; - Edge<NodeData, EdgeData> lastEdge = e; - - boolean searchForNode = (combine != Combine.NONE); - for (int i = n.getData().getLayer() + 1; i < destNode.getData().getLayer(); i++) { - - Node<NodeData, EdgeData> foundNode = null; - if (searchForNode) { - for (Node<NodeData, EdgeData> sameLayerNode : layers[i]) { - innerMostLoop++; - - if (combine == Combine.SAME_OUTPUTS) { - if (sameLayerNode.getData().isDummy() && sameLayerNode.getData().getEdge().getFrom() == edge.getFrom()) { - foundNode = sameLayerNode; - break; - } - } else if (combine == Combine.SAME_INPUTS) { - if (sameLayerNode.getData().isDummy() && sameLayerNode.getData().getEdge().getTo() == edge.getTo()) { - foundNode = sameLayerNode; - break; - } - } - } - } - - if (foundNode == null) { - searchForNode = false; - NodeData intermediateData = new NodeData(edge); - Node<NodeData, EdgeData> curNode = graph.createNode(intermediateData, null); - curNode.getData().setLayer(i); - layers[i].add(0, curNode); - sum++; - lastEdge.remove(); - graph.createEdge(lastNode, curNode, e.getData(), null); - assert lastNode.getData().getLayer() == curNode.getData().getLayer() - 1; - lastEdge = graph.createEdge(curNode, destNode, e.getData(), null); - lastNode = curNode; - } else { - lastEdge.remove(); - lastEdge = graph.createEdge(foundNode, destNode, e.getData(), null); - lastNode = foundNode; - } - - } - } - } - - if (TRACE) { - System.out.println("Number of edges: " + edgeCount); - } - if (TRACE) { - System.out.println("Dummy nodes inserted: " + sum); - } - } - - private void assignLayerCoordinates(ArrayList<Node<NodeData, EdgeData>> layers[], int layerSizes[]) { - int cur = 0; - for (int i = 0; i < layers.length; i++) { - int maxHeight = 0; - for (Node<NodeData, EdgeData> n : layers[i]) { - maxHeight = Math.max(maxHeight, n.getData().getHeight()); - } - - layerSizes[i] = maxHeight; - for (Node<NodeData, EdgeData> n : layers[i]) { - int curCoordinate = cur + (maxHeight - n.getData().getHeight()) / 2; - n.getData().setLayerCoordinate(curCoordinate); - } - cur += maxHeight + layerOffset; - - } - } - - private void assignCoordinates(ArrayList<Node<NodeData, EdgeData>> layers[]) { - - for (int i = 0; i < layers.length; i++) { - ArrayList<Node<NodeData, EdgeData>> curArray = layers[i]; - int curY = 0; - for (Node<NodeData, EdgeData> n : curArray) { - - n.getData().setCoordinate(curY); - if (!n.getData().isDummy()) { - curY += n.getData().getWidth(); - } - curY += OFFSET; - - } - } - - int curSol = evaluateSolution(); - if (TRACE) { - System.out.println("First coordinate solution found: " + curSol); - } - - // Sort to correct order - for (int i = 0; i < layers.length; i++) { - Collections.sort(layers[i], new Comparator<Node<NodeData, EdgeData>>() { - - public int compare(Node<NodeData, EdgeData> o1, Node<NodeData, EdgeData> o2) { - if (o2.getData().isDummy()) { - return 1; - } else if (o1.getData().isDummy()) { - return -1; - } - return o2.getInEdges().size() + o2.getOutEdges().size() - o1.getInEdges().size() - o1.getOutEdges().size(); - } - }); - } - - - optimizeMedianTiming.start(); - for (int i = 0; i < 2; i++) { - optimizeMedian(layers); - curSol = evaluateSolution(); - if (TRACE) { - System.out.println("Current coordinate solution found: " + curSol); - } - } - optimizeMedianTiming.stop(); - normalizeCoordinate(); - - } - - private void normalizeCoordinate() { - - int min = Integer.MAX_VALUE; - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - min = Math.min(min, n.getData().getCoordinate()); - } - - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - n.getData().setCoordinate(n.getData().getCoordinate() - min); - } - - } - - private void optimizeMedian(ArrayList<Node<NodeData, EdgeData>> layers[]) { - - // Downsweep - for (int i = 1; i < layers.length; i++) { - - ArrayList<Node<NodeData, EdgeData>> processingList = layers[i]; - ArrayList<Node<NodeData, EdgeData>> alreadyAssigned = new ArrayList<Node<NodeData, EdgeData>>(); - for (Node<NodeData, EdgeData> n : processingList) { - - - ArrayList<Node<NodeData, EdgeData>> preds = new ArrayList<Node<NodeData, EdgeData>>(n.getPredecessors()); - int pos = n.getData().getCoordinate(); - if (preds.size() > 0) { - - Collections.sort(preds, new Comparator<Node<NodeData, EdgeData>>() { - - public int compare(Node<NodeData, EdgeData> o1, Node<NodeData, EdgeData> o2) { - return o1.getData().getCoordinate() - o2.getData().getCoordinate(); - } - }); - - if (preds.size() % 2 == 0) { - assert preds.size() >= 2; - pos = (preds.get(preds.size() / 2).getData().getCoordinate() - calcRelativeCoordinate(preds.get(preds.size() / 2), n) + preds.get(preds.size() / 2 - 1).getData().getCoordinate() - calcRelativeCoordinate(preds.get(preds.size() / 2 - 1), n)) / 2; - } else { - assert preds.size() >= 1; - pos = preds.get(preds.size() / 2).getData().getCoordinate() - calcRelativeCoordinate(preds.get(preds.size() / 2), n); - } - } - - tryAdding(alreadyAssigned, n, pos); - } - } - // Upsweep - for (int i = layers.length - 2; i >= 0; i--) { - ArrayList<Node<NodeData, EdgeData>> processingList = layers[i]; - ArrayList<Node<NodeData, EdgeData>> alreadyAssigned = new ArrayList<Node<NodeData, EdgeData>>(); - for (Node<NodeData, EdgeData> n : processingList) { - - ArrayList<Node<NodeData, EdgeData>> succs = new ArrayList<Node<NodeData, EdgeData>>(n.getSuccessors()); - int pos = n.getData().getCoordinate(); - if (succs.size() > 0) { - - Collections.sort(succs, new Comparator<Node<NodeData, EdgeData>>() { - - public int compare(Node<NodeData, EdgeData> o1, Node<NodeData, EdgeData> o2) { - return o1.getData().getCoordinate() - o2.getData().getCoordinate(); - } - }); - - if (succs.size() % 2 == 0) { - assert succs.size() >= 2; - pos = (succs.get(succs.size() / 2).getData().getCoordinate() - calcRelativeCoordinate(n, succs.get(succs.size() / 2)) + succs.get(succs.size() / 2 - 1).getData().getCoordinate() - calcRelativeCoordinate(n, succs.get(succs.size() / 2 - 1))) / 2; - } else { - assert succs.size() >= 1; - pos = succs.get(succs.size() / 2).getData().getCoordinate() - calcRelativeCoordinate(n, succs.get(succs.size() / 2)); - } - } - - tryAdding(alreadyAssigned, n, pos); - } - } - } - - private int median(ArrayList<Integer> arr) { - assert arr.size() > 0; - Collections.sort(arr); - if (arr.size() % 2 == 0) { - return (arr.get(arr.size() / 2) + arr.get(arr.size() / 2 - 1)) / 2; - } else { - return arr.get(arr.size() / 2); - } - } - - private int calcRelativeCoordinate(Node<NodeData, EdgeData> n, Node<NodeData, EdgeData> succ) { - - if (n.getData().isDummy() && succ.getData().isDummy()) { - return 0; - } - - int pos = 0; - int pos2 = 0; - ArrayList<Integer> coords2 = new ArrayList<Integer>(); - ArrayList<Integer> coords = new ArrayList<Integer>(); - /*if(!n.getData().isDummy())*/ { - for (Edge<NodeData, EdgeData> e : n.getOutEdges()) { - - //System.out.println("reversed: " + e.getData().isReversed()); - if (e.getDest() == succ) { - - if (e.getData().isReversed()) { - if (!n.getData().isDummy()) { - coords.add(e.getData().getRelativeEnd().x); - } - - if (!succ.getData().isDummy()) { - coords2.add(e.getData().getRelativeStart().x); - } - } else { - if (!n.getData().isDummy()) { - coords.add(e.getData().getRelativeStart().x); - } - - if (!succ.getData().isDummy()) { - coords2.add(e.getData().getRelativeEnd().x); - } - } - } - } - - // assert coords.size() > 0; - if (!n.getData().isDummy()) { - pos = median(coords); - } - - if (!succ.getData().isDummy()) { - pos2 = median(coords2); - } - } - //System.out.println("coords=" + coords); - //System.out.println("coords2=" + coords2); - - return pos - pos2; - } - - private boolean intersect(int v1, int w1, int v2, int w2) { - if (v1 >= v2 && v1 < v2 + w2) { - return true; - } - if (v1 + w1 > v2 && v1 + w1 < v2 + w2) { - return true; - } - if (v1 < v2 && v1 + w1 > v2) { - return true; - } - return false; - } - - private boolean intersect(Node<NodeData, EdgeData> n1, Node<NodeData, EdgeData> n2) { - return intersect(n1.getData().getCoordinate(), n1.getData().getWidth() + OFFSET, n2.getData().getCoordinate(), n2.getData().getWidth() + OFFSET); - } - - private void tryAdding(List<Node<NodeData, EdgeData>> alreadyAssigned, Node<NodeData, EdgeData> node, int pos) { - - boolean doesIntersect = false; - node.getData().setCoordinate(pos); - for (Node<NodeData, EdgeData> n : alreadyAssigned) { - if (n.getData().getCoordinate() + n.getData().getWidth() < pos) { - break; - } else if (intersect(node, n)) { - doesIntersect = true; - break; - } - - } - - if (!doesIntersect) { - - // Everything fine, just place the node - int z = 0; - for (Node<NodeData, EdgeData> n : alreadyAssigned) { - if (pos > n.getData().getCoordinate()) { - break; - } - z++; - } - - if (z == -1) { - z = alreadyAssigned.size(); - } - - - if (ASSERT) { - assert !findOverlap(alreadyAssigned, node); - } - alreadyAssigned.add(z, node); - - } else { - - assert alreadyAssigned.size() > 0; - - // Search for alternative location - int minOffset = Integer.MAX_VALUE; - int minIndex = -1; - int minPos = 0; - int w = node.getData().getWidth() + OFFSET; - - // Try top-most - minIndex = 0; - minPos = alreadyAssigned.get(0).getData().getCoordinate() + alreadyAssigned.get(0).getData().getWidth() + OFFSET; - minOffset = Math.abs(minPos - pos); - - // Try bottom-most - Node<NodeData, EdgeData> lastNode = alreadyAssigned.get(alreadyAssigned.size() - 1); - int lastPos = lastNode.getData().getCoordinate() - w; - int lastOffset = Math.abs(lastPos - pos); - if (lastOffset < minOffset) { - minPos = lastPos; - minOffset = lastOffset; - minIndex = alreadyAssigned.size(); - } - - // Try between - for (int i = 0; i < alreadyAssigned.size() - 1; i++) { - Node<NodeData, EdgeData> curNode = alreadyAssigned.get(i); - Node<NodeData, EdgeData> nextNode = alreadyAssigned.get(i + 1); - - int start = nextNode.getData().getCoordinate() + nextNode.getData().getWidth() + OFFSET; - int end = curNode.getData().getCoordinate() - OFFSET; - - int bestPoss = end - node.getData().getWidth(); - if (bestPoss < pos && pos - bestPoss > minOffset) { - // No better solution possible => break - break; - } - - if (end - start >= node.getData().getWidth()) { - // Node could fit here - int cand1 = start; - int cand2 = end - node.getData().getWidth(); - int off1 = Math.abs(cand1 - pos); - int off2 = Math.abs(cand2 - pos); - if (off1 < minOffset) { - minPos = cand1; - minOffset = off1; - minIndex = i + 1; - } - - if (off2 < minOffset) { - minPos = cand2; - minOffset = off2; - minIndex = i + 1; - } - } - } - - assert minIndex != -1; - node.getData().setCoordinate(minPos); - if (ASSERT) { - assert !findOverlap(alreadyAssigned, node); - } - alreadyAssigned.add(minIndex, node); - } - - } - - private boolean findOverlap(List<Node<NodeData, EdgeData>> nodes, Node<NodeData, EdgeData> node) { - - for (Node<NodeData, EdgeData> n1 : nodes) { - if (intersect(n1, node)) { - return true; - } - } - - return false; - } - - private int evaluateSolution() { - - int sum = 0; - for (Edge<NodeData, EdgeData> e : graph.getEdges()) { - Node<NodeData, EdgeData> source = e.getSource(); - Node<NodeData, EdgeData> dest = e.getDest(); - int offset = 0; - offset = Math.abs(source.getData().getCoordinate() - dest.getData().getCoordinate()); - sum += offset; - } - - return sum; - } - - private void crossingReduction(ArrayList<Node<NodeData, EdgeData>> layers[]) { - - for (int i = 0; i < layers.length - 1; i++) { - - ArrayList<Node<NodeData, EdgeData>> curNodes = layers[i]; - ArrayList<Node<NodeData, EdgeData>> nextNodes = layers[i + 1]; - for (Node<NodeData, EdgeData> n : curNodes) { - for (Node<NodeData, EdgeData> succ : n.getSuccessors()) { - if (ASSERT) { - assert nextNodes.contains(succ); - } - nextNodes.remove(succ); - nextNodes.add(succ); - } - } - - } - - } - - private void removeCycles(Set<Node<NodeData, EdgeData>> rootNodes) { - final List<Edge<NodeData, EdgeData>> reversedEdges = new ArrayList<Edge<NodeData, EdgeData>>(); - - - int removedCount = 0; - int reversedCount = 0; - - Graph<NodeData, EdgeData>.DFSTraversalVisitor visitor = graph.new DFSTraversalVisitor() { - - @Override - public boolean visitEdge(Edge<NodeData, EdgeData> e, boolean backEdge) { - if (backEdge) { - if (ASSERT) { - assert !reversedEdges.contains(e); - } - reversedEdges.add(e); - e.getData().setReversed(!e.getData().isReversed()); - } - - return e.getData().isImportant(); - } - }; - Set<Node<NodeData, EdgeData>> nodes = new HashSet<Node<NodeData, EdgeData>>(); - nodes.addAll(rootNodes); - - assert nodes.size() > 0; - - this.graph.traverseDFS(nodes, visitor); - - for (Edge<NodeData, EdgeData> e : reversedEdges) { - if (e.isSelfLoop()) { - e.remove(); - removedCount++; - } else { - e.reverse(); - reversedCount++; - } - } - } - - private boolean checkRemoveCycles() { - return !graph.hasCycles(); - } - // Only used by assignLayers - private int maxLayerTemp; - - private int assignLayers(Set<Node<NodeData, EdgeData>> rootNodes, Set<? extends Vertex> firstLayerHints, - Set<? extends Vertex> lastLayerHints) { - this.maxLayerTemp = -1; - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - n.getData().setLayer(-1); - } - - Graph<NodeData, EdgeData>.BFSTraversalVisitor traverser = graph.new BFSTraversalVisitor() { - - @Override - public void visitNode(Node<NodeData, EdgeData> n, int depth) { - if (depth > n.getData().getLayer()) { - n.getData().setLayer(depth); - maxLayerTemp = Math.max(maxLayerTemp, depth); - } - } - }; - - for (Node<NodeData, EdgeData> n : rootNodes) { - if (n.getData().getLayer() == -1) { - this.graph.traverseBFS(n, traverser, true); - } - } - - for (Vertex v : firstLayerHints) { - assert nodeMap.containsKey(v); - nodeMap.get(v).getData().setLayer(0); - } - - for (Vertex v : lastLayerHints) { - assert nodeMap.containsKey(v); - nodeMap.get(v).getData().setLayer(maxLayerTemp); - } - - return maxLayerTemp; - } - - private boolean checkAssignLayers() { - - for (Edge<NodeData, EdgeData> e : graph.getEdges()) { - Node<NodeData, EdgeData> source = e.getSource(); - Node<NodeData, EdgeData> dest = e.getDest(); - - - if (source.getData().getLayer() >= dest.getData().getLayer()) { - return false; - } - } - int maxLayer = 0; - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - assert n.getData().getLayer() >= 0; - if (n.getData().getLayer() > maxLayer) { - maxLayer = n.getData().getLayer(); - } - } - - int countPerLayer[] = new int[maxLayer + 1]; - for (Node<NodeData, EdgeData> n : graph.getNodes()) { - countPerLayer[n.getData().getLayer()]++; - } - - if (TRACE) { - System.out.println("Number of layers: " + maxLayer); - } - return true; - } -}
--- a/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java Sat Jan 28 00:16:17 2012 +0100 @@ -33,6 +33,8 @@ public interface Cluster extends Comparable<Cluster> { public Cluster getOuter(); + + public Rectangle getBounds(); public void setBounds(Rectangle r);
--- a/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java Sat Jan 28 00:16:17 2012 +0100 @@ -49,10 +49,10 @@ this.links = links; assert verify(); - vertices = new TreeSet<Vertex>(); - portLinks = new HashMap<Port, Set<Link>>(links.size()); - inputPorts = new HashMap<Vertex, Set<Port>>(links.size()); - outputPorts = new HashMap<Vertex, Set<Port>>(links.size()); + vertices = new TreeSet<>(); + portLinks = new HashMap<>(links.size()); + inputPorts = new HashMap<>(links.size()); + outputPorts = new HashMap<>(links.size()); for (Link l : links) { Port p = l.getFrom(); @@ -76,7 +76,7 @@ } if (!portLinks.containsKey(p)) { - HashSet<Link> hashSet = new HashSet<Link>(3); + HashSet<Link> hashSet = new HashSet<>(3); portLinks.put(p, hashSet); } @@ -152,7 +152,7 @@ // whole graph is visited. public Set<Vertex> findRootVertices(Set<Vertex> startingRoots) { - Set<Vertex> notRootSet = new HashSet<Vertex>(); + Set<Vertex> notRootSet = new HashSet<>(); for (Vertex v : startingRoots) { if (!notRootSet.contains(v)) { markNotRoot(notRootSet, v, v); @@ -174,7 +174,7 @@ } } - Set<Vertex> result = new HashSet<Vertex>(); + Set<Vertex> result = new HashSet<>(); for (Vertex v : tmpVertices) { if (!notRootSet.contains(v)) { result.add(v); @@ -190,7 +190,7 @@ public SortedSet<Cluster> getClusters() { - SortedSet<Cluster> clusters = new TreeSet<Cluster>(); + SortedSet<Cluster> clusters = new TreeSet<>(); for (Vertex v : getVertices()) { if (v.getCluster() != null) { clusters.add(v.getCluster());
--- a/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/src/com/sun/hotspot/igv/selectioncoordinator/SelectionCoordinator.java Sat Jan 28 00:16:17 2012 +0100 @@ -46,10 +46,10 @@ } private SelectionCoordinator() { - selectedChangedEvent = new ChangedEvent<SelectionCoordinator>(this); - highlightedChangedEvent = new ChangedEvent<SelectionCoordinator>(this); - selectedObjects = new HashSet<Object>(); - highlightedObjects = new HashSet<Object>(); + selectedChangedEvent = new ChangedEvent<>(this); + highlightedChangedEvent = new ChangedEvent<>(this); + selectedObjects = new HashSet<>(); + highlightedObjects = new HashSet<>(); } public Set<Object> getSelectedObjects() {
--- a/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Sat Jan 28 00:16:17 2012 +0100 @@ -50,8 +50,8 @@ private static class Node { public InputNode inputNode; - public Set<Node> succs = new HashSet<Node>(); - public List<Node> preds = new ArrayList<Node>(); + public Set<Node> succs = new HashSet<>(); + public List<Node> preds = new ArrayList<>(); public InputBlock block; public boolean isBlockProjection; public boolean isBlockStart; @@ -72,13 +72,13 @@ public void buildBlocks() { - blocks = new Vector<InputBlock>(); + blocks = new Vector<>(); Node root = findRoot(); if (root == null) { return; } - Stack<Node> stack = new Stack<Node>(); - Set<Node> visited = new HashSet<Node>(); + Stack<Node> stack = new Stack<>(); + Set<Node> visited = new HashSet<>(); stack.add(root); int blockCount = 0; InputBlock rootBlock = null; @@ -179,7 +179,7 @@ } int z = 0; - blockIndex = new HashMap<InputBlock, Integer>(blocks.size()); + blockIndex = new HashMap<>(blocks.size()); for (InputBlock b : blocks) { blockIndex.put(b, z); z++; @@ -196,7 +196,7 @@ } if (graph.getBlocks().size() > 0) { - Collection<InputNode> tmpNodes = new ArrayList<InputNode>(graph.getNodes()); + Collection<InputNode> tmpNodes = new ArrayList<>(graph.getNodes()); for (InputNode n : tmpNodes) { String block = getBlockName(n); if (graph.getBlock(n) == null) { @@ -206,8 +206,8 @@ } return graph.getBlocks(); } else { - nodes = new ArrayList<Node>(); - inputNodeToNode = new HashMap<InputNode, Node>(graph.getNodes().size()); + nodes = new ArrayList<>(); + inputNodeToNode = new HashMap<>(graph.getNodes().size()); this.graph = graph; buildUpGraph(); @@ -241,9 +241,9 @@ } // Mark all nodes reachable in backward traversal from root - Set<Node> reachable = new HashSet<Node>(); + Set<Node> reachable = new HashSet<>(); reachable.add(root); - Stack<Node> stack = new Stack<Node>(); + Stack<Node> stack = new Stack<>(); stack.push(root); while (!stack.isEmpty()) { Node cur = stack.pop(); @@ -255,7 +255,7 @@ } } - Set<Node> unscheduled = new HashSet<Node>(); + Set<Node> unscheduled = new HashSet<>(); for (Node n : this.nodes) { if (n.block == null && reachable.contains(n)) { unscheduled.add(n); @@ -265,7 +265,7 @@ while (unscheduled.size() > 0) { boolean progress = false; - Set<Node> newUnscheduled = new HashSet<Node>(); + Set<Node> newUnscheduled = new HashSet<>(); for (Node n : unscheduled) { InputBlock block = null; @@ -305,7 +305,7 @@ } } - Set<Node> curReachable = new HashSet<Node>(reachable); + Set<Node> curReachable = new HashSet<>(reachable); for (Node n : curReachable) { if (n.block != null) { for (Node s : n.succs) { @@ -320,7 +320,7 @@ private void markWithBlock(Node n, InputBlock b, Set<Node> reachable) { assert !reachable.contains(n); - Stack<Node> stack = new Stack<Node>(); + Stack<Node> stack = new Stack<>(); stack.push(n); n.block = b; b.addNode(n.inputNode.getId()); @@ -376,7 +376,7 @@ if (ba == bb) { return ba; } - Set<InputBlock> visited = new HashSet<InputBlock>(); + Set<InputBlock> visited = new HashSet<>(); while (ba != null) { visited.add(ba); ba = dominatorMap.get(ba); @@ -394,12 +394,12 @@ } public void buildDominators() { - dominatorMap = new HashMap<InputBlock, InputBlock>(graph.getBlocks().size()); + dominatorMap = new HashMap<>(graph.getBlocks().size()); if (blocks.size() == 0) { return; } - Vector<BlockIntermediate> intermediate = new Vector<BlockIntermediate>(graph.getBlocks().size()); - Map<InputBlock, BlockIntermediate> map = new HashMap<InputBlock, BlockIntermediate>(graph.getBlocks().size()); + Vector<BlockIntermediate> intermediate = new Vector<>(graph.getBlocks().size()); + Map<InputBlock, BlockIntermediate> map = new HashMap<>(graph.getBlocks().size()); int z = 0; for (InputBlock b : blocks) { BlockIntermediate bi = new BlockIntermediate(); @@ -410,16 +410,16 @@ bi.parent = -1; bi.label = z; bi.ancestor = -1; - bi.pred = new ArrayList<Integer>(); - bi.bucket = new ArrayList<Integer>(); + bi.pred = new ArrayList<>(); + bi.bucket = new ArrayList<>(); intermediate.add(bi); map.put(b, bi); z++; } - Stack<Integer> stack = new Stack<Integer>(); + Stack<Integer> stack = new Stack<>(); stack.add(0); - Vector<BlockIntermediate> array = new Vector<BlockIntermediate>(); + Vector<BlockIntermediate> array = new Vector<>(); intermediate.get(0).dominator = 0; int n = 0; @@ -597,7 +597,7 @@ inputNodeToNode.put(n, node); } - Map<Integer, List<InputEdge>> edgeMap = new HashMap<Integer, List<InputEdge>>(graph.getEdges().size()); + Map<Integer, List<InputEdge>> edgeMap = new HashMap<>(graph.getEdges().size()); for (InputEdge e : graph.getEdges()) { int to = e.getTo();
--- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java Sat Jan 28 00:16:17 2012 +0100 @@ -36,7 +36,7 @@ */ public class LookupHistory { - private static Map<Class, LookupHistoryImpl> cache = new HashMap<Class, LookupHistoryImpl>(); + private static Map<Class, LookupHistoryImpl> cache = new HashMap<>(); private static class LookupHistoryImpl<T> implements LookupListener { @@ -65,7 +65,7 @@ public static <T> void init(Class<T> klass) { if (!cache.containsKey(klass)) { - cache.put(klass, new LookupHistoryImpl<T>(klass)); + cache.put(klass, new LookupHistoryImpl<>(klass)); } }
--- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java Sat Jan 28 00:16:17 2012 +0100 @@ -65,14 +65,14 @@ public RangeSliderModel(List<String> positions) { assert positions.size() > 0; - this.changedEvent = new ChangedEvent<RangeSliderModel>(this); - this.colorChangedEvent = new ChangedEvent<RangeSliderModel>(this); + this.changedEvent = new ChangedEvent<>(this); + this.colorChangedEvent = new ChangedEvent<>(this); setPositions(positions); } protected void setPositions(List<String> positions) { this.positions = positions; - colors = new ArrayList<Color>(); + colors = new ArrayList<>(); for (int i = 0; i < positions.size(); i++) { colors.add(Color.black); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java Sat Jan 28 00:16:17 2012 +0100 @@ -27,9 +27,8 @@ import com.sun.hotspot.igv.data.Properties; import com.sun.hotspot.igv.data.services.Scheduler; import com.sun.hotspot.igv.graph.*; -import com.sun.hotspot.igv.hierarchicallayout.HierarchicalClusterLayoutManager; import com.sun.hotspot.igv.hierarchicallayout.HierarchicalLayoutManager; -import com.sun.hotspot.igv.hierarchicallayout.OldHierarchicalLayoutManager; +import com.sun.hotspot.igv.layout.Cluster; import com.sun.hotspot.igv.layout.LayoutGraph; import com.sun.hotspot.igv.selectioncoordinator.SelectionCoordinator; import com.sun.hotspot.igv.util.ColorIcon; @@ -165,6 +164,7 @@ } + @Override public void centerFigures(List<Figure> list) { boolean b = getUndoRedoEnabled(); @@ -174,7 +174,7 @@ } private Set<Object> getObjectsFromIdSet(Set<Object> set) { - Set<Object> selectedObjects = new HashSet<Object>(); + Set<Object> selectedObjects = new HashSet<>(); for (Figure f : getModel().getDiagramToView().getFigures()) { if (intersects(f.getSource().getSourceNodesAsSet(), set)) { selectedObjects.add(f); @@ -197,6 +197,7 @@ }; private ControllableChangedListener<SelectionCoordinator> selectedCoordinatorListener = new ControllableChangedListener<SelectionCoordinator>() { + @Override public void filteredChanged(SelectionCoordinator source) { DiagramScene.this.gotoSelection(source.getSelectedObjects()); DiagramScene.this.validate(); @@ -205,6 +206,7 @@ private RectangularSelectProvider rectangularSelectProvider = new RectangularSelectProvider() { + @Override public void performSelection(Rectangle rectangle) { if (rectangle.width < 0) { rectangle.x += rectangle.width; @@ -216,7 +218,7 @@ rectangle.height *= -1; } - Set<Object> selectedObjects = new HashSet<Object>(); + Set<Object> selectedObjects = new HashSet<>(); for (Figure f : getModel().getDiagramToView().getFigures()) { FigureWidget w = getWidget(f); if (w != null) { @@ -247,6 +249,7 @@ private MouseWheelListener mouseWheelListener = new MouseWheelListener() { + @Override public void mouseWheelMoved(MouseWheelEvent e) { if (e.isControlDown()) { DiagramScene.this.relayoutWithoutLayout(null); @@ -296,7 +299,7 @@ content.set(newSet, null); - Set<Integer> nodeSelection = new HashSet<Integer>(); + Set<Integer> nodeSelection = new HashSet<>(); for (Object o : newSet) { if (o instanceof Properties.Provider) { final Properties.Provider provider = (Properties.Provider) o; @@ -330,7 +333,7 @@ } public void highlightingChanged(ObjectSceneEvent e, Set<Object> oldSet, Set<Object> newSet) { - Set<Integer> nodeHighlighting = new HashSet<Integer>(); + Set<Integer> nodeHighlighting = new HashSet<>(); for (Object o : newSet) { if (o instanceof Figure) { nodeHighlighting.addAll(((Figure) o).getSource().getSourceNodesAsSet()); @@ -345,7 +348,7 @@ } public void hoverChanged(ObjectSceneEvent e, Object oldObject, Object newObject) { - Set<Object> newHighlightedObjects = new HashSet<Object>(DiagramScene.this.getHighlightedObjects()); + Set<Object> newHighlightedObjects = new HashSet<>(DiagramScene.this.getHighlightedObjects()); if (oldObject != null) { newHighlightedObjects.remove(oldObject); } @@ -485,7 +488,7 @@ rebuilding = true; - Collection<Object> objects = new ArrayList<Object>(this.getObjects()); + Collection<Object> objects = new ArrayList<>(this.getObjects()); for (Object o : objects) { this.removeObject(o); } @@ -569,7 +572,7 @@ Diagram diagram = getModel().getDiagramToView(); - HashSet<Figure> figures = new HashSet<Figure>(); + HashSet<Figure> figures = new HashSet<>(); for (Figure f : diagram.getFigures()) { FigureWidget w = getWidget(f); @@ -578,7 +581,7 @@ } } - HashSet<Connection> edges = new HashSet<Connection>(); + HashSet<Connection> edges = new HashSet<>(); for (Connection c : diagram.getConnections()) { if (isVisible(c)) { @@ -586,24 +589,28 @@ } } + HierarchicalLayoutManager manager = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS); + manager.setMaxLayerLength(10); + manager.doLayout(new LayoutGraph(edges, figures)); + + if (getModel().getShowBlocks()) { - HierarchicalClusterLayoutManager m = new HierarchicalClusterLayoutManager(OldHierarchicalLayoutManager.Combine.SAME_OUTPUTS); - HierarchicalLayoutManager manager = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS); - manager.setMaxLayerLength(9); - manager.setMinLayerDifference(3); - m.setManager(manager); - m.setSubManager(new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS)); - m.doLayout(new LayoutGraph(edges, figures)); - - } else { - HierarchicalLayoutManager manager = new HierarchicalLayoutManager(HierarchicalLayoutManager.Combine.SAME_OUTPUTS); - manager.setMaxLayerLength(10); - manager.doLayout(new LayoutGraph(edges, figures)); + for (Figure f : diagram.getFigures()) { + Cluster c = f.getCluster(); + Rectangle r = c.getBounds(); + Rectangle figureBounds = f.getBounds(); + figureBounds.grow(BORDER_SIZE, BORDER_SIZE); + if (r != null) { + figureBounds.add(r); + } + c.setBounds(figureBounds); + } } + relayoutWithoutLayout(oldVisibleWidgets); } - private Set<Pair<Point, Point>> lineCache = new HashSet<Pair<Point, Point>>(); + private Set<Pair<Point, Point>> lineCache = new HashSet<>(); private void relayoutWithoutLayout(Set<Widget> oldVisibleWidgets) { @@ -642,8 +649,12 @@ BlockWidget w = getWidget(b.getInputBlock()); if (w != null && w.isVisible()) { Rectangle r = b.getBounds(); - maxX = Math.max(maxX, r.x + r.width); - maxY = Math.max(maxY, r.y + r.height); + if (r == null) { + w.setVisible(false); + } else { + maxX = Math.max(maxX, r.x + r.width); + maxY = Math.max(maxY, r.y + r.height); + } } } } @@ -679,7 +690,7 @@ Set<Pair<Point, Point>> lastLineCache = lineCache; - lineCache = new HashSet<Pair<Point, Point>>(); + lineCache = new HashSet<>(); for (Figure f : diagram.getFigures()) { for (OutputSlot s : f.getOutputSlots()) { SceneAnimator anim = animator; @@ -726,7 +737,7 @@ private final Point specialNullPoint = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE); private void processOutputSlot(Set<Pair<Point, Point>> lastLineCache, OutputSlot s, List<Connection> connections, int controlPointIndex, Point lastPoint, LineWidget predecessor, int offx, int offy, SceneAnimator animator) { - Map<Point, List<Connection>> pointMap = new HashMap<Point, List<Connection>>(connections.size()); + Map<Point, List<Connection>> pointMap = new HashMap<>(connections.size()); for (Connection c : connections) { @@ -751,7 +762,7 @@ if (pointMap.containsKey(cur)) { pointMap.get(cur).add(c); } else { - List<Connection> newList = new ArrayList<Connection>(2); + List<Connection> newList = new ArrayList<>(2); newList.add(c); pointMap.put(cur, newList); } @@ -782,7 +793,7 @@ Point p1 = new Point(lastPoint.x + offx, lastPoint.y + offy); Point p2 = new Point(p.x + offx, p.y + offy); - Pair<Point, Point> curPair = new Pair<Point, Point>(p1, p2); + Pair<Point, Point> curPair = new Pair<>(p1, p2); SceneAnimator curAnimator = animator; if (lastLineCache.contains(curPair)) { curAnimator = null; @@ -811,7 +822,7 @@ private Set<Connection> connections; public ConnectionSet(Collection<Connection> connections) { - connections = new HashSet<Connection>(connections); + connections = new HashSet<>(connections); } public Set<Connection> getConnectionSet() { @@ -858,7 +869,7 @@ private Set<Object> idSetToObjectSet(Set<Object> ids) { - Set<Object> result = new HashSet<Object>(); + Set<Object> result = new HashSet<>(); for (Figure f : getModel().getDiagramToView().getFigures()) { if (DiagramScene.doesIntersect(f.getSource().getSourceNodesAsSet(), ids)) { result.add(f); @@ -876,7 +887,7 @@ public void gotoSelection(Set<Object> ids) { Rectangle overall = null; - Set<Integer> hiddenNodes = new HashSet<Integer>(this.getModel().getHiddenNodes()); + Set<Integer> hiddenNodes = new HashSet<>(this.getModel().getHiddenNodes()); hiddenNodes.removeAll(ids); this.getModel().showNot(hiddenNodes); @@ -945,7 +956,7 @@ } public void setSelection(Collection<Figure> list) { - super.setSelectedObjects(new HashSet<Figure>(list)); + super.setSelectedObjects(new HashSet<>(list)); } private UndoRedo.Manager getUndoRedoManager() { @@ -999,12 +1010,12 @@ private void updateHiddenNodes(Set<Integer> newHiddenNodes, boolean doRelayout) { System.out.println("newHiddenNodes: " + newHiddenNodes); - Set<InputBlock> visibleBlocks = new HashSet<InputBlock>(); + Set<InputBlock> visibleBlocks = new HashSet<>(); Diagram diagram = getModel().getDiagramToView(); assert diagram != null; - Set<Widget> oldVisibleWidgets = new HashSet<Widget>(); + Set<Widget> oldVisibleWidgets = new HashSet<>(); for (Figure f : diagram.getFigures()) { FigureWidget w = getWidget(f); @@ -1040,11 +1051,11 @@ } if (getModel().getShowNodeHull()) { - List<FigureWidget> boundaries = new ArrayList<FigureWidget>(); + List<FigureWidget> boundaries = new ArrayList<>(); for (Figure f : diagram.getFigures()) { FigureWidget w = getWidget(f); if (!w.isVisible()) { - Set<Figure> set = new HashSet<Figure>(f.getPredecessorSet()); + Set<Figure> set = new HashSet<>(f.getPredecessorSet()); set.addAll(f.getSuccessorSet()); boolean b = false; @@ -1097,7 +1108,7 @@ } private void showFigure(Figure f) { - HashSet<Integer> newHiddenNodes = new HashSet<Integer>(getModel().getHiddenNodes()); + HashSet<Integer> newHiddenNodes = new HashSet<>(getModel().getHiddenNodes()); newHiddenNodes.removeAll(f.getSource().getSourceNodesAsSet()); updateHiddenNodes(newHiddenNodes, true); } @@ -1107,7 +1118,7 @@ } public void setSelectedObjects(Object... args) { - Set<Object> set = new HashSet<Object>(); + Set<Object> set = new HashSet<>(); for (Object o : args) { set.add(o); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java Sat Jan 28 00:16:17 2012 +0100 @@ -147,16 +147,16 @@ this.filterChain = filterChain; assert sequenceFilterChain != null; this.sequenceFilterChain = sequenceFilterChain; - hiddenNodes = new HashSet<Integer>(); - onScreenNodes = new HashSet<Integer>(); - selectedNodes = new HashSet<Integer>(); + hiddenNodes = new HashSet<>(); + onScreenNodes = new HashSet<>(); + selectedNodes = new HashSet<>(); super.getChangedEvent().addListener(this); - diagramChangedEvent = new ChangedEvent<DiagramViewModel>(this); - viewChangedEvent = new ChangedEvent<DiagramViewModel>(this); - hiddenNodesChangedEvent = new ChangedEvent<DiagramViewModel>(this); - viewPropertiesChangedEvent = new ChangedEvent<DiagramViewModel>(this); + diagramChangedEvent = new ChangedEvent<>(this); + viewChangedEvent = new ChangedEvent<>(this); + hiddenNodesChangedEvent = new ChangedEvent<>(this); + viewPropertiesChangedEvent = new ChangedEvent<>(this); - groupChangedEvent = new ChangedEvent<DiagramViewModel>(this); + groupChangedEvent = new ChangedEvent<>(this); groupChangedEvent.addListener(groupChangedListener); groupChangedEvent.fire(); @@ -214,7 +214,7 @@ public void setSelectedNodes(Set<Integer> nodes) { this.selectedNodes = nodes; - List<Color> colors = new ArrayList<Color>(); + List<Color> colors = new ArrayList<>(); for (String s : getPositions()) { colors.add(Color.black); } @@ -259,7 +259,7 @@ } public void showFigures(Collection<Figure> f) { - HashSet<Integer> newHiddenNodes = new HashSet<Integer>(getHiddenNodes()); + HashSet<Integer> newHiddenNodes = new HashSet<>(getHiddenNodes()); for (Figure fig : f) { newHiddenNodes.removeAll(fig.getSource().getSourceNodesAsSet()); } @@ -268,7 +268,7 @@ public Set<Figure> getSelectedFigures() { - Set<Figure> result = new HashSet<Figure>(); + Set<Figure> result = new HashSet<>(); for (Figure f : diagram.getFigures()) { for (InputNode node : f.getSource().getSourceNodes()) { if (getSelectedNodes().contains(node.getId())) { @@ -284,7 +284,7 @@ } public void showOnly(final Set<Integer> nodes) { - final HashSet<Integer> allNodes = new HashSet<Integer>(getGraphToView().getGroup().getAllNodes()); + final HashSet<Integer> allNodes = new HashSet<>(getGraphToView().getGroup().getAllNodes()); allNodes.removeAll(nodes); setHiddenNodes(allNodes); } @@ -331,7 +331,7 @@ } private static List<String> calculateStringList(Group g) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); for (InputGraph graph : g.getGraphs()) { result.add(graph.getName()); } @@ -396,7 +396,7 @@ } void setSelectedFigures(List<Figure> list) { - Set<Integer> newSelectedNodes = new HashSet<Integer>(); + Set<Integer> newSelectedNodes = new HashSet<>(); for (Figure f : list) { newSelectedNodes.addAll(f.getSource().getSourceNodesAsSet()); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java Sat Jan 28 00:16:17 2012 +0100 @@ -170,7 +170,7 @@ } }; - private ChangedEvent<DiagramProvider> diagramChangedEvent = new ChangedEvent<DiagramProvider>(diagramProvider); + private ChangedEvent<DiagramProvider> diagramChangedEvent = new ChangedEvent<>(diagramProvider); private void updateDisplayName() { @@ -445,7 +445,7 @@ public void changed(DiagramViewModel source) { updateDisplayName(); - Collection<Object> list = new ArrayList<Object>(); + Collection<Object> list = new ArrayList<>(); list.add(new EditorInputGraphProvider(EditorTopComponent.this)); graphContent.set(list, null); diagramProvider.getChangedEvent().fire(); @@ -459,7 +459,7 @@ public void setSelection(PropertyMatcher matcher) { - Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<Figure>(getModel().getDiagramToView().getFigures()); + Properties.PropertySelector<Figure> selector = new Properties.PropertySelector<>(getModel().getDiagramToView().getFigures()); List<Figure> list = selector.selectMultiple(matcher); setSelectedFigures(list); } @@ -471,8 +471,8 @@ public void setSelectedNodes(Set<InputNode> nodes) { - List<Figure> list = new ArrayList<Figure>(); - Set<Integer> ids = new HashSet<Integer>(); + List<Figure> list = new ArrayList<>(); + Set<Integer> ids = new HashSet<>(); for (InputNode n : nodes) { ids.add(n.getId()); } @@ -520,14 +520,14 @@ public void hideNodes() { Set<Integer> selectedNodes = this.getModel().getSelectedNodes(); - HashSet<Integer> nodes = new HashSet<Integer>(getModel().getHiddenNodes()); + HashSet<Integer> nodes = new HashSet<>(getModel().getHiddenNodes()); nodes.addAll(selectedNodes); this.getModel().showNot(nodes); } public void expandPredecessors() { Set<Figure> oldSelection = getModel().getSelectedFigures(); - Set<Figure> figures = new HashSet<Figure>(); + Set<Figure> figures = new HashSet<>(); for (Figure f : this.getDiagramModel().getDiagramToView().getFigures()) { boolean ok = false; @@ -552,7 +552,7 @@ public void expandSuccessors() { Set<Figure> oldSelection = getModel().getSelectedFigures(); - Set<Figure> figures = new HashSet<Figure>(); + Set<Figure> figures = new HashSet<>(); for (Figure f : this.getDiagramModel().getDiagramToView().getFigures()) { boolean ok = false;
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java Sat Jan 28 00:16:17 2012 +0100 @@ -83,7 +83,7 @@ List<InputNode> matches = null; try { RegexpPropertyMatcher matcher = new RegexpPropertyMatcher(name, value, Pattern.CASE_INSENSITIVE); - Properties.PropertySelector<InputNode> selector = new Properties.PropertySelector<InputNode>(p.getGraph().getNodes()); + Properties.PropertySelector<InputNode> selector = new Properties.PropertySelector<>(p.getGraph().getNodes()); matches = selector.selectMultiple(matcher); } catch (Exception e) { @@ -101,7 +101,7 @@ } if (matches != null) { - final Set<InputNode> set = new HashSet<InputNode>(matches); + final Set<InputNode> set = new HashSet<>(matches); response.addResult(new Runnable() { public void run() { final EditorTopComponent comp = EditorTopComponent.getActive(); @@ -120,7 +120,7 @@ public void run() { final EditorTopComponent comp = EditorTopComponent.getActive(); if (comp != null) { - final Set<InputNode> tmpSet = new HashSet<InputNode>(); + final Set<InputNode> tmpSet = new HashSet<>(); tmpSet.add(n); comp.setSelectedNodes(tmpSet); comp.requestActive();
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java Sat Jan 28 00:16:17 2012 +0100 @@ -53,7 +53,7 @@ putValue(Action.SHORT_DESCRIPTION, "Export current graph as SVG file"); putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK)); lookup = Utilities.actionsGlobalContext(); - result = lookup.lookup(new Lookup.Template<ExportCookie>(ExportCookie.class)); + result = lookup.lookup(new Lookup.Template<>(ExportCookie.class)); result.addLookupListener(this); resultChanged(null); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java Sat Jan 28 00:16:17 2012 +0100 @@ -122,7 +122,7 @@ middleWidget.getActions().addAction(new DoubleClickAction(this)); middleWidget.setCheckClipping(true); - labelWidgets = new ArrayList<LabelWidget>(); + labelWidgets = new ArrayList<>(); String[] strings = figure.getLines(); @@ -351,16 +351,16 @@ public void handleDoubleClick(Widget w, WidgetAction.WidgetMouseEvent e) { if (diagramScene.isAllVisible()) { - final Set<Integer> hiddenNodes = new HashSet<Integer>(diagramScene.getModel().getGraphToView().getGroup().getAllNodes()); + final Set<Integer> hiddenNodes = new HashSet<>(diagramScene.getModel().getGraphToView().getGroup().getAllNodes()); hiddenNodes.removeAll(this.getFigure().getSource().getSourceNodesAsSet()); this.diagramScene.getModel().showNot(hiddenNodes); } else if (isBoundary()) { - final Set<Integer> hiddenNodes = new HashSet<Integer>(diagramScene.getModel().getHiddenNodes()); + final Set<Integer> hiddenNodes = new HashSet<>(diagramScene.getModel().getHiddenNodes()); hiddenNodes.removeAll(this.getFigure().getSource().getSourceNodesAsSet()); this.diagramScene.getModel().showNot(hiddenNodes); } else { - final Set<Integer> hiddenNodes = new HashSet<Integer>(diagramScene.getModel().getHiddenNodes()); + final Set<Integer> hiddenNodes = new HashSet<>(diagramScene.getModel().getHiddenNodes()); hiddenNodes.addAll(this.getFigure().getSource().getSourceNodesAsSet()); this.diagramScene.getModel().showNot(hiddenNodes); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java Sat Jan 28 00:16:17 2012 +0100 @@ -84,7 +84,7 @@ this.from = from; this.to = to; this.predecessor = predecessor; - this.successors = new ArrayList<LineWidget>(); + this.successors = new ArrayList<>(); if (predecessor != null) { predecessor.addSuccessor(this); } @@ -138,7 +138,7 @@ } public void select(Widget arg0, Point arg1, boolean arg2) { - Set<Figure> set = new HashSet<Figure>(); + Set<Figure> set = new HashSet<>(); for (Connection c : LineWidget.this.connections) { set.add(c.getInputSlot().getFigure()); set.add(c.getOutputSlot().getFigure()); @@ -241,8 +241,8 @@ private void setHighlighted(boolean b) { this.highlighted = b; - Set<Object> highlightedObjects = new HashSet<Object>(scene.getHighlightedObjects()); - Set<Object> highlightedObjectsChange = new HashSet<Object>(); + Set<Object> highlightedObjects = new HashSet<>(scene.getHighlightedObjects()); + Set<Object> highlightedObjectsChange = new HashSet<>(); for (Connection c : connections) { highlightedObjectsChange.add(c.getInputSlot().getFigure()); highlightedObjectsChange.add(c.getInputSlot());
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java Fri Jan 27 23:57:47 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java Sat Jan 28 00:16:17 2012 +0100 @@ -156,9 +156,9 @@ } public void handleDoubleClick(Widget w, WidgetAction.WidgetMouseEvent e) { - Set<Integer> hiddenNodes = new HashSet<Integer>(diagramScene.getModel().getHiddenNodes()); + Set<Integer> hiddenNodes = new HashSet<>(diagramScene.getModel().getHiddenNodes()); if (diagramScene.isAllVisible()) { - hiddenNodes = new HashSet<Integer>(diagramScene.getModel().getGraphToView().getGroup().getAllNodes()); + hiddenNodes = new HashSet<>(diagramScene.getModel().getGraphToView().getGroup().getAllNodes()); } boolean progress = false;