Mercurial > hg > graal-jvmci-8
changeset 23356:a95267ab6955
Import pure whitespace changes from JDK9 IGV
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java Thu Apr 28 09:29:35 2016 -0700 @@ -61,7 +61,7 @@ if (batikJar == null) { return null; } - // Load batik in it's own class loader since some it's support jars interfere with the JDK + // Load batik in it's own class loader since some it's support jars interfere with the JDK URL url = new File(batikJar).toURI().toURL(); ClassLoader cl = new URLClassLoader(new URL[] { url }); Class<?> classGenericDOMImplementation = cl.loadClass("org.apache.batik.dom.GenericDOMImplementation");
--- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java Thu Apr 28 09:29:35 2016 -0700 @@ -64,11 +64,11 @@ } displayName += " (" + nodes.size() + " nodes)"; } - + if (bytecode.getComment() != null) { displayName += " // " + bytecode.getComment(); } - + this.setDisplayName(displayName); }
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java Thu Apr 28 09:29:35 2016 -0700 @@ -43,7 +43,7 @@ private static final Stroke BOLD_STROKE = new BasicStroke(2.5f); private static final Stroke DASHED_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f, new float[]{5, 5}, 0); private static final Stroke BOLD_DASHED_STROKE = new BasicStroke(2.5f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f, new float[]{5, 5}, 0); - + private BlockWidget from; private BlockWidget to; private Port inputSlot; @@ -113,7 +113,7 @@ public String toString() { return "Connection[ " + from.toString() + " - " + to.toString() + "]"; } - + @Override public boolean isVIP() { return isBold;
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Thu Apr 28 09:29:35 2016 -0700 @@ -79,7 +79,7 @@ edgeLayer = new LayerWidget(this); this.addChild(edgeLayer); - + selectLayer = new LayerWidget(this); this.addChild(selectLayer);
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java Thu Apr 28 09:29:35 2016 -0700 @@ -40,7 +40,7 @@ import org.openide.windows.WindowManager; /** - * + * * @author Thomas Wuerthinger */ final class ControlFlowTopComponent extends TopComponent implements LookupListener {
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java Thu Apr 28 09:29:35 2016 -0700 @@ -31,7 +31,7 @@ /** * Selection action that acts on double-click only. Does not support aiming. - * + * * @author Peter Hofer */ public class DoubleClickSelectAction extends WidgetAction.LockedAdapter {
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java Thu Apr 28 09:29:35 2016 -0700 @@ -76,7 +76,7 @@ public void setControlPoints(List<Point> list) { // Do nothing for now } - + public boolean isVIP() { return false; } @@ -142,7 +142,7 @@ } 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>();
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java Thu Apr 28 09:29:35 2016 -0700 @@ -69,7 +69,7 @@ public void addNotify() { this.setKeys(folder.getElements()); } - + @Override public void changed(Object source) { addNotify();
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java Thu Apr 28 09:29:35 2016 -0700 @@ -80,7 +80,7 @@ // Action for cloning to the current graph content.add(new GraphCloneCookie(viewer, graph)); - + this.addNodeListener(new NodeAdapter() { @Override public void childrenRemoved(NodeMemberEvent ev) {
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java Thu Apr 28 09:29:35 2016 -0700 @@ -50,7 +50,7 @@ import org.openide.windows.WindowManager; /** - * + * * @author Thomas Wuerthinger */ public final class OutlineTopComponent extends TopComponent implements ExplorerManager.Provider, LookupListener { @@ -98,7 +98,7 @@ toolbar.add(((NodeAction) RemoveAction.get(RemoveAction.class)).createContextAwareInstance(this.getLookup())); toolbar.add(RemoveAllAction.get(RemoveAllAction.class)); - + toolbar.add(GarbageCollectAction.get(GarbageCollectAction.class).getToolbarPresenter()); for (Toolbar tb : ToolbarPool.getDefault().getToolbars()) { @@ -117,7 +117,7 @@ } } }; - + server = new Server(getDocument(), callback, false); binaryServer = new Server(getDocument(), callback, true); }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java Thu Apr 28 09:29:35 2016 -0700 @@ -30,27 +30,27 @@ */ public abstract class ControllableChangedListener<T> implements ChangedListener<T>{ - private boolean enabled; + private boolean enabled; + - - public ControllableChangedListener() { - enabled = true; - } + public ControllableChangedListener() { + enabled = true; + } - public boolean isEnabled() { - return enabled; - } + public boolean isEnabled() { + return enabled; + } - public void setEnabled(boolean b) { - enabled = b; - } + public void setEnabled(boolean b) { + enabled = b; + } @Override - public void changed(T source) { - if(enabled) { - filteredChanged(source); - } - } + public void changed(T source) { + if(enabled) { + filteredChanged(source); + } + } - public abstract void filteredChanged(T source); + public abstract void filteredChanged(T source); }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java Thu Apr 28 09:29:35 2016 -0700 @@ -35,7 +35,7 @@ private List<L> listener; private boolean fireEvents; private boolean eventWasFired; - + public Event() { listener = new ArrayList<>(); fireEvents = true; @@ -77,6 +77,6 @@ fire(); } } - + protected abstract void fire(L l); }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Folder.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Folder.java Thu Apr 28 09:29:35 2016 -0700 @@ -1,33 +1,33 @@ -/* - * Copyright (c) 2012, 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.data; - -import java.util.List; - -public interface Folder { - List<? extends FolderElement> getElements(); - void removeElement(FolderElement element); - void addElement(FolderElement group); - ChangedEvent<? extends Folder> getChangedEvent(); -} +/* + * Copyright (c) 2012, 2015, 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.data; + +import java.util.List; + +public interface Folder { + List<? extends FolderElement> getElements(); + void removeElement(FolderElement element); + void addElement(FolderElement group); + ChangedEvent<? extends Folder> getChangedEvent(); +}
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/FolderElement.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/FolderElement.java Thu Apr 28 09:29:35 2016 -0700 @@ -1,31 +1,31 @@ -/* - * Copyright (c) 2012, 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.data; - -public interface FolderElement { - - Folder getParent(); - String getName(); - void setParent(Folder parent); -} +/* + * Copyright (c) 2012, 2015, 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.data; + +public interface FolderElement { + + Folder getParent(); + String getName(); + void setParent(Folder parent); +}
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java Thu Apr 28 09:29:35 2016 -0700 @@ -74,14 +74,14 @@ public int getGraphsCount() { return elements.size(); } - + @Override public void addElement(FolderElement element) { elements.add(element); if (element instanceof InputGraph) { graphs.add((InputGraph) element); } else { - + } element.setParent(this); changedEvent.fire(); @@ -116,7 +116,7 @@ public String getType() { return getProperties().get("type"); - + } InputGraph getPrev(InputGraph graph) {
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java Thu Apr 28 09:29:35 2016 -0700 @@ -51,7 +51,7 @@ if (o == null || (!(o instanceof InputBlock))) { return false; } - + final InputBlock b = (InputBlock)o; final boolean result = b.nodes.equals(nodes) && b.name.equals(name) && b.successors.size() == successors.size(); if (!result) {
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java Thu Apr 28 09:29:35 2016 -0700 @@ -39,7 +39,7 @@ NEW, DELETED } - + public static final Comparator<InputEdge> OUTGOING_COMPARATOR = new Comparator<InputEdge>(){ @Override @@ -50,8 +50,7 @@ return o1.getFromIndex() - o2.getFromIndex(); } }; - - + public static final Comparator<InputEdge> INGOING_COMPARATOR = new Comparator<InputEdge>(){ @Override @@ -128,7 +127,7 @@ public char getToIndex() { return toIndex; } - + public char getFromIndex() { return fromIndex; } @@ -148,7 +147,7 @@ public String getLabel() { return label; } - + public String getType() { return type; }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java Thu Apr 28 09:29:35 2016 -0700 @@ -47,7 +47,7 @@ blockEdges = new ArrayList<>(); nodeToBlock = new LinkedHashMap<>(); } - + @Override public void setParent(Folder parent) { this.parent = parent; @@ -63,29 +63,29 @@ left.addSuccessor(right); return edge; } - + public List<InputNode> findRootNodes() { List<InputNode> result = new ArrayList<>(); Set<Integer> nonRoot = new HashSet<>(); for(InputEdge curEdges : getEdges()) { nonRoot.add(curEdges.getTo()); } - + for(InputNode node : getNodes()) { if(!nonRoot.contains(node.getId())) { result.add(node); } } - + return result; } - + public Map<InputNode, List<InputEdge>> findAllOutgoingEdges() { Map<InputNode, List<InputEdge>> result = new HashMap<>(getNodes().size()); for(InputNode n : this.getNodes()) { result.put(n, new ArrayList<InputEdge>()); } - + for(InputEdge e : this.edges) { int from = e.getFrom(); InputNode fromNode = this.getNode(from); @@ -93,21 +93,21 @@ assert fromList != null; fromList.add(e); } - + for(InputNode n : this.getNodes()) { List<InputEdge> list = result.get(n); Collections.sort(list, InputEdge.OUTGOING_COMPARATOR); } - + return result; } - + public Map<InputNode, List<InputEdge>> findAllIngoingEdges() { Map<InputNode, List<InputEdge>> result = new HashMap<>(getNodes().size()); for(InputNode n : this.getNodes()) { result.put(n, new ArrayList<InputEdge>()); } - + for(InputEdge e : this.edges) { int to = e.getTo(); InputNode toNode = this.getNode(to); @@ -115,26 +115,26 @@ assert toList != null; toList.add(e); } - + for(InputNode n : this.getNodes()) { List<InputEdge> list = result.get(n); Collections.sort(list, InputEdge.INGOING_COMPARATOR); } - + return result; } - + public List<InputEdge> findOutgoingEdges(InputNode n) { List<InputEdge> result = new ArrayList<>(); - + for(InputEdge e : this.edges) { if(e.getFrom() == n.getId()) { result.add(e); } } - + Collections.sort(result, InputEdge.OUTGOING_COMPARATOR); - + return result; } @@ -142,11 +142,11 @@ blocks.clear(); nodeToBlock.clear(); } - + public void setEdge(int fromIndex, int toIndex, int from, int to) { assert fromIndex == ((char)fromIndex) : "Downcast must be safe"; assert toIndex == ((char)toIndex) : "Downcast must be safe"; - + InputEdge edge = new InputEdge((char)fromIndex, (char)toIndex, from, to); if(!this.getEdges().contains(edge)) { this.addEdge(edge);
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java Thu Apr 28 09:29:35 2016 -0700 @@ -71,7 +71,7 @@ if (r != null) { b2 = r.equals(obj.r); } - + return b1 && b2; }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java Thu Apr 28 09:29:35 2016 -0700 @@ -242,7 +242,7 @@ private String name; private Pattern valuePattern; - + public RegexpPropertyMatcher(String name, String value) { this(name, value, 0); }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/ParseMonitor.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/ParseMonitor.java Thu Apr 28 09:29:35 2016 -0700 @@ -29,5 +29,5 @@ public void updateProgress(); public void setState(String state); - + }
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java Thu Apr 28 09:29:35 2016 -0700 @@ -175,7 +175,7 @@ writer.startTag(Parser.CONTROL_FLOW_ELEMENT); for (InputBlock b : graph.getBlocks()) { writer.startTag(Parser.BLOCK_ELEMENT, new Properties(Parser.BLOCK_NAME_PROPERTY, b.getName())); - + if (b.getSuccessors().size() > 0) { writer.startTag(Parser.SUCCESSORS_ELEMENT); for (InputBlock s : b.getSuccessors()) { @@ -191,7 +191,7 @@ } writer.endTag(); } - + writer.endTag(); } @@ -223,7 +223,7 @@ b.append(code.getName()); b.append("\n"); } - + b.append("]]>"); w.write(b.toString()); w.endTag();
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java Thu Apr 28 09:29:35 2016 -0700 @@ -190,7 +190,7 @@ @Override public void setDocumentLocator(Locator locator) { - + } @Override
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -92,4 +92,4 @@ } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ControllableChangedListenerTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -90,4 +90,4 @@ l.changed(1); assertTrue(hasFired[0]); } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/GroupTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/GroupTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -71,4 +71,4 @@ graph2.addNode(new InputNode(3)); assertEquals(g.getAllNodes(), new HashSet(Arrays.asList(1, 2, 3))); } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputGraphTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -69,7 +69,7 @@ emptyGraph = new InputGraph("emptyGraph"); group.addElement(emptyGraph); - + referenceGraph = new InputGraph("referenceGraph"); group.addElement(referenceGraph); referenceGraph.addNode(N1); @@ -208,4 +208,4 @@ assertEquals(b, c.getPrev()); assertEquals(null, c.getNext()); } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/InputMethodTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -90,4 +90,4 @@ } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PairTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PairTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -95,4 +95,4 @@ assertTrue(p2.hashCode() == p3.hashCode()); assertTrue(p2.equals(p3)); } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -42,7 +42,7 @@ public class PropertiesTest extends TestCase { - + public PropertiesTest(String testName) { super(testName); } @@ -64,7 +64,7 @@ Properties a = new Properties(); assertFalse(a.equals(null)); assertTrue(a.equals(a)); - + Properties b = new Properties(); assertTrue(a.equals(b)); assertTrue(a.hashCode() == b.hashCode()); @@ -99,11 +99,11 @@ * Test of selectSingle method, of class Properties. */ public void testSelectSingle() { - + final boolean[] called = new boolean[1]; final String v = "2"; final String n = "p2"; - + PropertyMatcher matcher = new PropertyMatcher() { @Override @@ -198,14 +198,14 @@ b.add(c); assertTrue(a.equals(b)); - + b.setProperty("p3", null); assertTrue(a.equals(b)); - + Properties empty = new Properties(); b.add(empty); assertTrue(a.equals(b)); - + empty.add(b); assertTrue(a.equals(empty)); } @@ -344,7 +344,7 @@ assertFalse(matcher2.match(" C")); assertFalse(matcher2.match("c")); assertFalse(matcher2.match("asdfC")); - + try { matcher2.match(null); fail(); @@ -364,7 +364,7 @@ new RegexpPropertyMatcher("p1", null); fail(); } catch(IllegalArgumentException e) {} - + final InvertPropertyMatcher matcher3 = new InvertPropertyMatcher(matcher); assertTrue(matcher3.getName().equals("p1")); assertFalse(matcher3.match("1")); @@ -388,7 +388,7 @@ p3.setProperty("p2", "2"); p3.setProperty("p1", "1"); assertEquals(p3.toString(), "[p1=1, p2=2]"); - + p3.setProperty("p0", "0"); assertEquals(p3.toString(), "[p0=0, p1=1, p2=2]");
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertyTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertyTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -108,9 +108,9 @@ final Property p4 = new Property("name", "value"); assertEquals(p, p4); assertEquals(p.hashCode(), p4.hashCode()); - + final Property p5 = new Property("value", "name"); assertFalse(p.equals(p5)); assertTrue(p.hashCode() != p5.hashCode()); } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/SourceTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -76,4 +76,4 @@ assertEquals(s.getSourceNodes(), Arrays.asList(N1, N2)); assertEquals(s.getSourceNodesAsSet(), new LinkedHashSet<>(Arrays.asList(1, 2))); } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/Util.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/Util.java Thu Apr 28 09:29:35 2016 -0700 @@ -106,15 +106,15 @@ } public static void assertGraphEquals(InputGraph a, InputGraph b) { - + if(!a.getNodesAsSet().equals(b.getNodesAsSet())) { fail(); } - + if (!a.getEdges().equals(b.getEdges())) { fail(); } - + if (a.getBlocks().equals(b.getBlocks())) { fail(); }
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/serialization/ParserTest.java Thu Apr 28 09:29:35 2016 -0700 @@ -128,7 +128,7 @@ graph.addEdge(new InputEdge((char)0, (char)0, 1, 2)); test(doc); - + graph.addEdge(new InputEdge((char)0, (char)0, 2, 3)); test(doc); @@ -160,58 +160,58 @@ Util.assertGraphDocumentEquals(doc, new GraphDocument()); } - @Test - public void testSimpleExport() { - GraphDocument document = new GraphDocument(); - Group g = new Group(document); - document.addElement(g); - - InputGraph graph = new InputGraph("TestGraph"); - g.addElement(graph); - graph.getProperties().setProperty("testName", "testValue"); - - InputNode n1 = new InputNode(0); - InputNode n2 = new InputNode(1); - InputEdge e1 = new InputEdge((char)0, 0, 1); - InputEdge e2 = new InputEdge((char)1, 0, 1); - graph.addNode(n1); - graph.addNode(n2); - graph.addEdge(e1); - graph.addEdge(e2); - - test(document); - } - - @Test - public void testComplexExport() { + @Test + public void testSimpleExport() { + GraphDocument document = new GraphDocument(); + Group g = new Group(document); + document.addElement(g); - GraphDocument document = new GraphDocument(); - Group g = new Group(document); - document.addElement(g); - - InputGraph graph = new InputGraph("TestGraph"); + InputGraph graph = new InputGraph("TestGraph"); g.addElement(graph); - graph.getProperties().setProperty("testName", "testValue"); + graph.getProperties().setProperty("testName", "testValue"); - InputNode n1 = new InputNode(0); - InputNode n2 = new InputNode(1); - InputEdge e1 = new InputEdge((char)0, 0, 0); - InputEdge e2 = new InputEdge((char)1, 1, 1); - graph.addNode(n1); - graph.addNode(n2); - graph.addEdge(e1); - graph.addEdge(e2); - - InputGraph graph2 = new InputGraph("TestGraph2"); - g.addElement(graph2); - graph2.addNode(n1); - InputNode n3 = new InputNode(2); - graph2.addNode(n3); - InputEdge e3 = new InputEdge((char)0, 0, 2); - graph2.addEdge(e3); + InputNode n1 = new InputNode(0); + InputNode n2 = new InputNode(1); + InputEdge e1 = new InputEdge((char)0, 0, 1); + InputEdge e2 = new InputEdge((char)1, 0, 1); + graph.addNode(n1); + graph.addNode(n2); + graph.addEdge(e1); + graph.addEdge(e2); test(document); - } + } + + @Test + public void testComplexExport() { + + GraphDocument document = new GraphDocument(); + Group g = new Group(document); + document.addElement(g); + + InputGraph graph = new InputGraph("TestGraph"); + g.addElement(graph); + graph.getProperties().setProperty("testName", "testValue"); + + InputNode n1 = new InputNode(0); + InputNode n2 = new InputNode(1); + InputEdge e1 = new InputEdge((char)0, 0, 0); + InputEdge e2 = new InputEdge((char)1, 1, 1); + graph.addNode(n1); + graph.addNode(n2); + graph.addEdge(e1); + graph.addEdge(e2); + + InputGraph graph2 = new InputGraph("TestGraph2"); + g.addElement(graph2); + graph2.addNode(n1); + InputNode n3 = new InputNode(2); + graph2.addNode(n3); + InputEdge e3 = new InputEdge((char)0, 0, 2); + graph2.addEdge(e3); + + test(document); + } /** @@ -222,4 +222,4 @@ testBoth(new GraphDocument(), "<graphDocument></graphDocument>"); } -} \ No newline at end of file +}
--- a/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java Thu Apr 28 09:29:35 2016 -0700 @@ -207,7 +207,7 @@ InputNode nodeTo = inputNodeMap.get(a.getNode(to)); char fromIndex = e.getFromIndex(); char toIndex = e.getToIndex(); - + if (nodeFrom == null || nodeTo == null) { System.out.println("Unexpected edge : " + from + " -> " + to); } else {
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java Thu Apr 28 09:29:35 2016 -0700 @@ -137,17 +137,17 @@ }// </editor-fold>//GEN-END:initComponents private void okButtonClicked(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonClicked - this.customFilter.setName(this.nameTextField.getText()); - this.customFilter.setCode(this.sourceTextArea.getText()); - accepted = true; - setVisible(false); + this.customFilter.setName(this.nameTextField.getText()); + this.customFilter.setCode(this.sourceTextArea.getText()); + accepted = true; + setVisible(false); }//GEN-LAST:event_okButtonClicked private void cancelButtonClicked(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonClicked - setVisible(false); + setVisible(false); }//GEN-LAST:event_cancelButtonClicked - - + + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton cancelButton; private javax.swing.JScrollPane jScrollPane1; @@ -157,5 +157,5 @@ private javax.swing.JLabel sourceLabel; private javax.swing.JTextArea sourceTextArea; // End of variables declaration//GEN-END:variables - + }
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java Thu Apr 28 09:29:35 2016 -0700 @@ -39,7 +39,7 @@ private List<Filter> filters; private transient ChangedEvent<FilterChain> changedEvent; - + private ChangedListener<Filter> changedListener = new ChangedListener<Filter>() { @Override public void changed(Filter source) {
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java Thu Apr 28 09:29:35 2016 -0700 @@ -33,7 +33,7 @@ /** * Filter that colors nodes using a customizable color gradient, based on how * a numeric property is located in a specified interval. - * + * * @author Peter Hofer */ public class GradientColorFilter extends AbstractFilter {
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java Thu Apr 28 09:29:35 2016 -0700 @@ -46,13 +46,13 @@ public String getName() { return name; } - + @Override public void apply(Diagram d) { List<Figure> list = selector.selected(d); for (Figure f : list) { - + for (InputSlot is : f.getInputSlots()) { for (Connection c : is.getConnections()) { OutputSlot os = c.getOutputSlot();
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java Thu Apr 28 09:29:35 2016 -0700 @@ -76,7 +76,7 @@ FilterTopComponent.findInstance().getFilterSettingsChangedEvent().addListener(this); resultChanged(null); - + setShortDescription("Double-click to open filter"); }
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java Thu Apr 28 09:29:35 2016 -0700 @@ -57,7 +57,7 @@ import org.openide.windows.WindowManager; /** - * + * * @author Thomas Wuerthinger */ public final class FilterTopComponent extends TopComponent implements LookupListener, ExplorerManager.Provider {
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java Thu Apr 28 09:29:35 2016 -0700 @@ -31,7 +31,7 @@ import java.util.List; public class GraalColoringFilter extends AbstractFilter { - + private String colorName; public GraalColoringFilter(String colorName) {
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java Thu Apr 28 09:29:35 2016 -0700 @@ -62,7 +62,7 @@ if (type == "Association" && "EndNode".equals(c.getOutputSlot().getFigure().getProperties().get("class"))) { type = "Successor"; } - + if (type != null) { Color typeColor = usageColor.get(type); if (typeColor == null) { @@ -86,11 +86,11 @@ public void setUsageColor(String type, Color usageColor) { this.usageColor.put(type, usageColor); } - + public Color getOtherUsageColor() { return otherUsageColor; } - + public void setOtherUsageColor(Color otherUsageColor) { this.otherUsageColor = otherUsageColor; }
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java Thu Apr 28 09:29:35 2016 -0700 @@ -77,4 +77,4 @@ return inputBlock.getName(); } } - +
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java Thu Apr 28 09:29:35 2016 -0700 @@ -107,7 +107,7 @@ public String getLabel() { return label; } - + public String getType() { return type; }
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java Thu Apr 28 09:29:35 2016 -0700 @@ -58,7 +58,7 @@ public Font getBoldFont() { return boldFont; } - + private Diagram() { figures = new ArrayList<>(); blocks = new LinkedHashMap<>(8); @@ -67,7 +67,7 @@ this.slotFont = new Font("Arial", Font.PLAIN, 10); this.boldFont = this.font.deriveFont(Font.BOLD); } - + public Block getBlock(InputBlock b) { assert blocks.containsKey(b); return blocks.get(b); @@ -76,7 +76,7 @@ public String getNodeText() { return nodeText; } - + public void updateBlocks() { blocks.clear(); for (InputBlock b : graph.getBlocks()) { @@ -88,7 +88,7 @@ public Diagram getNext() { return Diagram.createDiagram(graph.getNext(), nodeText); } - + public Collection<Block> getBlocks() { return Collections.unmodifiableCollection(blocks.values()); } @@ -113,20 +113,20 @@ assert outputSlot.getFigure().getDiagram() == this; return new Connection(inputSlot, outputSlot, label, type); } - + public Map<InputNode, Set<Figure>> calcSourceToFigureRelation() { Map<InputNode, Set<Figure>> map = new HashMap<>(); - + for(InputNode node : this.getGraph().getNodes()) { map.put(node, new HashSet<Figure>()); } - + for(Figure f : this.getFigures()) { for(InputNode node : f.getSource().getSourceNodes()) { map.get(node).add(f); } } - + return map; } @@ -138,7 +138,7 @@ Diagram d = new Diagram(); d.graph = graph; d.nodeText = nodeText; - + d.updateBlocks(); Collection<InputNode> nodes = graph.getNodes(); @@ -157,7 +157,7 @@ int to = e.getTo(); Figure fromFigure = figureHash.get(from); Figure toFigure = figureHash.get(to); - + if(fromFigure == null || toFigure == null) continue; assert fromFigure != null && toFigure != null;
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java Thu Apr 28 09:29:35 2016 -0700 @@ -69,7 +69,7 @@ } return heightCash; } - + public static <T> List<T> getAllBefore(List<T> inputList, T tIn) { List<T> result = new ArrayList<>(); for(T t : inputList) { @@ -80,7 +80,7 @@ } return result; } - + public static int getSlotsWidth(Collection<? extends Slot> slots) { int result = Figure.SLOT_OFFSET; for(Slot s : slots) { @@ -249,7 +249,7 @@ public List<InputSlot> getInputSlots() { return Collections.unmodifiableList(inputSlots); } - + public Set<Slot> getSlots() { Set<Slot> result = new HashSet<>(); result.addAll(getInputSlots()); @@ -326,8 +326,8 @@ if (VERTICAL_LAYOUT) { int width = Math.max(getWidth(), Figure.SLOT_WIDTH * (Math.max(inputSlots.size(), outputSlots.size()) + 1)); int height = getHeight() + 2 * Figure.SLOT_WIDTH - 2 * Figure.OVERLAPPING; - - + + return new Dimension(width, height); } else { int width = getWidth() + 2 * Figure.SLOT_WIDTH - 2*Figure.OVERLAPPING; @@ -340,7 +340,7 @@ public String toString() { return idString; } - + public Cluster getCluster() { if (getSource().getSourceNodes().size() == 0) { assert false : "Should never reach here, every figure must have at least one source node!"; @@ -356,7 +356,7 @@ @Override public boolean isRoot() { - + List<InputNode> sourceNodes = source.getSourceNodes(); if (sourceNodes.size() > 0 && sourceNodes.get(0).getProperties().get("name") != null) { return source.getSourceNodes().get(0).getProperties().get("name").equals("Root");
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java Thu Apr 28 09:29:35 2016 -0700 @@ -27,7 +27,7 @@ import java.util.List; /** - * + * * @author Thomas Wuerthinger */ public class InputSlot extends Slot {
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java Thu Apr 28 09:29:35 2016 -0700 @@ -26,7 +26,7 @@ import java.awt.Point; /** - * + * * @author Thomas Wuerthinger */ public class OutputSlot extends Slot {
--- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java Thu Apr 28 09:29:35 2016 -0700 @@ -40,157 +40,157 @@ import java.util.List; /** - * + * * @author Thomas Wuerthinger */ public abstract class Slot implements Port, Source.Provider, Properties.Provider { - private int wantedIndex; - private Source source; - protected List<Connection> connections; - private InputNode associatedNode; - private Color color; - private String text; - private String shortName; - private Figure figure; + private int wantedIndex; + private Source source; + protected List<Connection> connections; + private InputNode associatedNode; + private Color color; + private String text; + private String shortName; + private Figure figure; - protected Slot(Figure figure, int wantedIndex) { - this.figure = figure; - connections = new ArrayList<>(2); - source = new Source(); - this.wantedIndex = wantedIndex; - text = ""; - shortName = ""; - assert figure != null; - } + protected Slot(Figure figure, int wantedIndex) { + this.figure = figure; + connections = new ArrayList<>(2); + source = new Source(); + this.wantedIndex = wantedIndex; + text = ""; + shortName = ""; + assert figure != null; + } @Override - public Properties getProperties() { - Properties p = new Properties(); - if (source.getSourceNodes().size() > 0) { - for (InputNode n : source.getSourceNodes()) { - p.add(n.getProperties()); - } - } else { - p.setProperty("name", "Slot"); - p.setProperty("figure", figure.getProperties().get("name")); - p.setProperty("connectionCount", Integer.toString(connections.size())); - } - return p; - } - public static final Comparator<Slot> slotIndexComparator = new Comparator<Slot>() { + public Properties getProperties() { + Properties p = new Properties(); + if (source.getSourceNodes().size() > 0) { + for (InputNode n : source.getSourceNodes()) { + p.add(n.getProperties()); + } + } else { + p.setProperty("name", "Slot"); + p.setProperty("figure", figure.getProperties().get("name")); + p.setProperty("connectionCount", Integer.toString(connections.size())); + } + return p; + } + public static final Comparator<Slot> slotIndexComparator = new Comparator<Slot>() { @Override - public int compare(Slot o1, Slot o2) { - return o1.wantedIndex - o2.wantedIndex; - } - }; - public static final Comparator<Slot> slotFigureComparator = new Comparator<Slot>() { + public int compare(Slot o1, Slot o2) { + return o1.wantedIndex - o2.wantedIndex; + } + }; + public static final Comparator<Slot> slotFigureComparator = new Comparator<Slot>() { @Override - public int compare(Slot o1, Slot o2) { - return o1.figure.getId() - o2.figure.getId(); - } - }; + public int compare(Slot o1, Slot o2) { + return o1.figure.getId() - o2.figure.getId(); + } + }; - public InputNode getAssociatedNode() { - return associatedNode; - } + public InputNode getAssociatedNode() { + return associatedNode; + } - public void setAssociatedNode(InputNode node) { - associatedNode = node; - } + public void setAssociatedNode(InputNode node) { + associatedNode = node; + } - public int getWidth() { - if (shortName == null || shortName.length() <= 1) { - return Figure.SLOT_WIDTH; - } else { - BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB); - Graphics g = image.getGraphics(); - g.setFont(figure.getDiagram().getSlotFont().deriveFont(Font.BOLD)); - FontMetrics metrics = g.getFontMetrics(); - return Math.max(Figure.SLOT_WIDTH, metrics.stringWidth(shortName) + 6); - } - } + public int getWidth() { + if (shortName == null || shortName.length() <= 1) { + return Figure.SLOT_WIDTH; + } else { + BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB); + Graphics g = image.getGraphics(); + g.setFont(figure.getDiagram().getSlotFont().deriveFont(Font.BOLD)); + FontMetrics metrics = g.getFontMetrics(); + return Math.max(Figure.SLOT_WIDTH, metrics.stringWidth(shortName) + 6); + } + } - public int getWantedIndex() { - return wantedIndex; - } + public int getWantedIndex() { + return wantedIndex; + } @Override - public Source getSource() { - return source; - } + public Source getSource() { + return source; + } - public String getText() { - return text; - } + public String getText() { + return text; + } - public void setShortName(String s) { - assert s != null; + public void setShortName(String s) { + assert s != null; // assert s.length() <= 2; - this.shortName = s; + this.shortName = s; - } + } - public String getShortName() { - return shortName; - } + public String getShortName() { + return shortName; + } - public String getToolTipText() { - StringBuilder sb = new StringBuilder(); - sb.append(text); + public String getToolTipText() { + StringBuilder sb = new StringBuilder(); + sb.append(text); - for (InputNode n : getSource().getSourceNodes()) { - sb.append(StringUtils.escapeHTML("Node (ID=" + n.getId() + "): " + n.getProperties().get("name"))); - sb.append("<br>"); - } + for (InputNode n : getSource().getSourceNodes()) { + sb.append(StringUtils.escapeHTML("Node (ID=" + n.getId() + "): " + n.getProperties().get("name"))); + sb.append("<br>"); + } - return sb.toString(); - } + return sb.toString(); + } - public boolean shouldShowName() { - return getShortName() != null && getShortName().length() > 0; - } + public boolean shouldShowName() { + return getShortName() != null && getShortName().length() > 0; + } - public void setText(String s) { - if (s == null) { - s = ""; - } - this.text = s; - } + public void setText(String s) { + if (s == null) { + s = ""; + } + this.text = s; + } - public Figure getFigure() { - assert figure != null; - return figure; - } + public Figure getFigure() { + assert figure != null; + return figure; + } - public Color getColor() { - return this.color; - } + public Color getColor() { + return this.color; + } - public void setColor(Color c) { - color = c; - } + public void setColor(Color c) { + color = c; + } - public List<Connection> getConnections() { - return Collections.unmodifiableList(connections); - } + public List<Connection> getConnections() { + return Collections.unmodifiableList(connections); + } - public void removeAllConnections() { - List<Connection> connectionsCopy = new ArrayList<>(this.connections); - for (Connection c : connectionsCopy) { - c.remove(); - } - } + public void removeAllConnections() { + List<Connection> connectionsCopy = new ArrayList<>(this.connections); + for (Connection c : connectionsCopy) { + c.remove(); + } + } @Override - public Vertex getVertex() { - return figure; - } + public Vertex getVertex() { + return figure; + } - public abstract int getPosition(); + public abstract int getPosition(); - public abstract void setPosition(int position); + public abstract void setPosition(int position); }
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java Thu Apr 28 09:29:35 2016 -0700 @@ -60,7 +60,7 @@ public List<Point> getControlPoints() { return points; } - + public boolean isVIP() { return false; }
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java Thu Apr 28 09:29:35 2016 -0700 @@ -73,7 +73,7 @@ public List<Point> getControlPoints() { return controlPoints; } - + public boolean isVIP() { return false; }
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java Thu Apr 28 09:29:35 2016 -0700 @@ -65,7 +65,7 @@ public List<Point> getControlPoints() { return intermediatePoints; } - + public boolean isVIP() { return false; }
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java Thu Apr 28 09:29:35 2016 -0700 @@ -56,7 +56,7 @@ public void doLayout(LayoutGraph graph) { doLayout(graph, new HashSet<Vertex>(), new HashSet<Vertex>(), new HashSet<Link>()); } - + public void doLayout(LayoutGraph graph, Set<? extends Link> importantLinks) { doLayout(graph); }
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java Thu Apr 28 09:29:35 2016 -0700 @@ -1707,7 +1707,7 @@ if (l1.isVIP() && !l2.isVIP()) { return -1; } - + if (!l1.isVIP() && l2.isVIP()) { return 1; }
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java Thu Apr 28 09:29:35 2016 -0700 @@ -73,7 +73,7 @@ public String toString() { return "InterClusterConnection[from=" + getFrom() + ", to=" + getTo() + "]"; } - + public boolean isVIP() { return false; }
--- a/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java Thu Apr 28 09:29:35 2016 -0700 @@ -144,7 +144,7 @@ // Returns a set of vertices with the following properties: // - All Vertices in the set startingRoots are elements of the set. - // - When starting a DFS at every vertex in the set, every vertex of the + // - When starting a DFS at every vertex in the set, every vertex of the // whole graph is visited. public Set<Vertex> findRootVertices(Set<Vertex> startingRoots) { @@ -183,7 +183,7 @@ public Set<Vertex> findRootVertices() { return findRootVertices(new HashSet<Vertex>()); } - + public SortedSet<Cluster> getClusters() { SortedSet<Cluster> clusters = new TreeSet<Cluster>();
--- a/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java Thu Apr 28 09:29:35 2016 -0700 @@ -35,7 +35,7 @@ public Port getFrom(); public Port getTo(); - + public boolean isVIP(); public List<Point> getControlPoints();
--- a/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java Thu Apr 28 09:29:35 2016 -0700 @@ -39,6 +39,6 @@ public void setPosition(Point p); public boolean isRoot(); - + public Cluster getCluster(); }
--- a/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java Thu Apr 28 09:29:35 2016 -0700 @@ -54,6 +54,8 @@ if (binary) { new BinaryParser(channel, null, rootDocument, callback).parse(); } else { + // signal readiness to client VM (old protocol) + channel.socket().getOutputStream().write('y'); new Parser(channel, null, callback).parse(); } } catch (IOException ex) {
--- a/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Thu Apr 28 09:29:35 2016 -0700 @@ -215,7 +215,7 @@ noBlock = graph.addBlock("(no block)"); blocks.add(noBlock); } - + graph.setBlock(n, noBlock); } assert graph.getBlock(n) != null;
--- a/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml Thu Apr 28 09:29:35 2016 -0700 @@ -2,7 +2,6 @@ <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd"> <filesystem> <folder name="Filters"> - <!-- <file name="C2 Basic Coloring" url="filters/color.filter"> <attr name="enabled" boolvalue="false"/> </file> @@ -26,6 +25,5 @@ <attr name="enabled" boolvalue="false"/> <attr name="after" stringvalue="C2 Remove Filter"/> </file> - --> </folder> </filesystem>
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java Thu Apr 28 09:29:35 2016 -0700 @@ -87,18 +87,18 @@ private DiagramViewModel modelCopy; private WidgetAction zoomAction; private boolean rebuilding; - + /** * The alpha level of partially visible figures. */ public static final float ALPHA = 0.4f; - + /** * The offset of the graph to the border of the window showing it. */ public static final int BORDER_SIZE = 20; - - + + public static final int UNDOREDO_LIMIT = 100; public static final int SCROLL_UNIT_INCREMENT = 80; public static final int SCROLL_BLOCK_INCREMENT = 400; @@ -107,7 +107,7 @@ public static final float ZOOM_INCREMENT = 1.5f; public static final int SLOT_OFFSET = 8; public static final int ANIMATION_LIMIT = 40; - + private PopupMenuProvider popupMenuProvider = new PopupMenuProvider() { @Override @@ -430,7 +430,7 @@ this.getActions().addAction(zoomAction); this.getView().addMouseWheelListener(mouseWheelListener); this.getActions().addAction(ActionFactory.createPopupMenuAction(popupMenuProvider)); - + this.getActions().addAction(ActionFactory.createWheelPanAction()); LayerWidget selectLayer = new LayerWidget(this); @@ -456,7 +456,7 @@ public Component getComponent() { return scrollPane; } - + public boolean isAllVisible() { return getModel().getHiddenNodes().isEmpty(); } @@ -505,7 +505,7 @@ private void update() { mainLayer.removeChildren(); blockLayer.removeChildren(); - + rebuilding = true; Collection<Object> objects = new ArrayList<>(this.getObjects()); @@ -514,7 +514,7 @@ } Diagram d = getModel().getDiagramToView(); - + if (d.getGraph().getBlocks().isEmpty()) { Scheduler s = Lookup.getDefault().lookup(Scheduler.class); d.getGraph().clearBlocks(); @@ -548,7 +548,7 @@ sw.getActions().addAction(selectAction); } } - + if (getModel().getShowBlocks()) { for (InputBlock bn : d.getGraph().getBlocks()) { BlockWidget w = new BlockWidget(this, d, bn); @@ -557,11 +557,11 @@ blockLayer.addChild(w); } } - + rebuilding = false; this.smallUpdate(true); } - + public boolean isRebuilding() { return rebuilding; } @@ -618,7 +618,7 @@ manager.setMaxLayerLength(10); manager.doLayout(new LayoutGraph(edges, figures)); } - + relayoutWithoutLayout(oldVisibleWidgets); } private Set<Pair<Point, Point>> lineCache = new HashSet<>(); @@ -652,7 +652,7 @@ } } } - + if (getModel().getShowBlocks()) { for (Block b : diagram.getBlocks()) { BlockWidget w = getWidget(b.getInputBlock()); @@ -719,14 +719,14 @@ } } } - + if (getModel().getShowBlocks()) { for (Block b : diagram.getBlocks()) { BlockWidget w = getWidget(b.getInputBlock()); if (w != null && w.isVisible()) { Point location = new Point(b.getBounds().x + offx2, b.getBounds().y + offy2); Rectangle r = new Rectangle(location.x, location.y, b.getBounds().width, b.getBounds().height); - + if ((visibleFigureCount <= ANIMATION_LIMIT && oldVisibleWidgets != null && oldVisibleWidgets.contains(w))) { animator.animatePreferredBounds(w, r); } else { @@ -1032,7 +1032,7 @@ oldVisibleWidgets.add(w); } } - + if (getModel().getShowBlocks()) { for (InputBlock b : diagram.getGraph().getBlocks()) { BlockWidget w = getWidget(b); @@ -1092,7 +1092,7 @@ } } } - + if (getModel().getShowBlocks()) { for (InputBlock b : diagram.getGraph().getBlocks()) { @@ -1154,7 +1154,7 @@ public JPopupMenu createPopupMenu() { JPopupMenu menu = new JPopupMenu(); - + Action[] currentActions = actionsWithSelection; if (this.getSelectedObjects().isEmpty()) { currentActions = actions;
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java Thu Apr 28 09:29:35 2016 -0700 @@ -73,7 +73,7 @@ result.setData(this); return result; } - + public Group getGroup() { return group; } @@ -121,7 +121,7 @@ viewChangedEvent.fire(); } } - + public boolean getShowBlocks() { return showBlocks; }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewer.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewer.java Thu Apr 28 09:29:35 2016 -0700 @@ -63,11 +63,11 @@ public void componentShowing(); public void initialize(); - + public void setSelection(Collection<Figure> list); public void centerFigures(List<Figure> list); - + public void setInteractionMode(InteractionMode mode); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java Thu Apr 28 09:29:35 2016 -0700 @@ -36,11 +36,11 @@ public class EditorInputGraphProvider implements InputGraphProvider { private EditorTopComponent editor; - + public EditorInputGraphProvider(EditorTopComponent editor) { this.editor = editor; } - + @Override public InputGraph getGraph() { return editor.getDiagramModel().getGraphToView();
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java Thu Apr 28 09:29:35 2016 -0700 @@ -181,7 +181,7 @@ ZoomOutAction.get(ZoomOutAction.class), }; - + Action[] actionsWithSelection = new Action[]{ ExtractAction.get(ExtractAction.class), ShowAllAction.get(HideAction.class), @@ -235,7 +235,7 @@ toolBar.addSeparator(); toolBar.add(ShowAllAction.get(ZoomInAction.class)); toolBar.add(ShowAllAction.get(ZoomOutAction.class)); - + blockLayoutAction = new EnableBlockLayoutAction(); JToggleButton button = new JToggleButton(blockLayoutAction); button.setSelected(false);
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java Thu Apr 28 09:29:35 2016 -0700 @@ -98,10 +98,10 @@ image = this.createImage(imageWidth, imageHeight); Graphics2D ig = (Graphics2D) image.getGraphics(); ig.scale(scale, scale); - double oldFactor = scene.getZoomFactor(); - scene.setZoomFactor(scale); + double oldFactor = scene.getZoomFactor(); + scene.setZoomFactor(scale); scene.paint(ig); - scene.setZoomFactor(oldFactor); + scene.setZoomFactor(oldFactor); } gr.drawImage(image, vx, vy, this);
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java Thu Apr 28 09:29:35 2016 -0700 @@ -39,7 +39,7 @@ @Override public void view(InputGraph graph, boolean clone) { - + if (!clone) { WindowManager manager = WindowManager.getDefault(); for (Mode m : manager.getModes()) { @@ -55,7 +55,7 @@ } } } - + Diagram diagram = Diagram.createDiagram(graph, Settings.get().get(Settings.NODE_TEXT, Settings.NODE_TEXT_DEFAULT)); EditorTopComponent tc = new EditorTopComponent(diagram); tc.open();
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java Thu Apr 28 09:29:35 2016 -0700 @@ -61,11 +61,11 @@ */ public class CustomizablePanAction extends WidgetAction.LockedAdapter { private boolean enabled = true; - + private Scene scene; private JScrollPane scrollPane; private Point lastLocation; - + private final int modifiersExMask; private final int modifiersEx; @@ -78,12 +78,12 @@ protected boolean isLocked() { return scrollPane != null; } - + public void setEnabled(boolean enabled) { if (this.enabled != enabled) { if (isLocked()) throw new IllegalStateException(); - + this.enabled = enabled; } }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java Thu Apr 28 09:29:35 2016 -0700 @@ -246,7 +246,7 @@ public JPopupMenu getPopupMenu(Widget widget, Point point) { JPopupMenu menu = diagramScene.createPopupMenu(); menu.addSeparator(); - + build(menu, getFigure(), this, false, diagramScene); menu.addSeparator(); build(menu, getFigure(), this, true, diagramScene);
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java Thu Apr 28 09:29:35 2016 -0700 @@ -52,7 +52,7 @@ public InputSlot getInputSlot() { return inputSlot; } - + @Override protected int calculateSlotWidth() { List<InputSlot> slots = getSlot().getFigure().getInputSlots();
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java Thu Apr 28 09:29:35 2016 -0700 @@ -239,20 +239,20 @@ private void setHighlighted(boolean b) { this.highlighted = b; - Set<Object> highlightedObjects = new HashSet<>(scene.getHighlightedObjects()); - Set<Object> highlightedObjectsChange = new HashSet<>(); + 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()); - highlightedObjectsChange.add(c.getOutputSlot().getFigure()); - highlightedObjectsChange.add(c.getOutputSlot()); + highlightedObjectsChange.add(c.getInputSlot().getFigure()); + highlightedObjectsChange.add(c.getInputSlot()); + highlightedObjectsChange.add(c.getOutputSlot().getFigure()); + highlightedObjectsChange.add(c.getOutputSlot()); } - if(b) { - highlightedObjects.addAll(highlightedObjectsChange); - } else { - highlightedObjects.removeAll(highlightedObjectsChange); - } - scene.setHighlightedObjects(highlightedObjects); + if(b) { + highlightedObjects.addAll(highlightedObjectsChange); + } else { + highlightedObjects.removeAll(highlightedObjectsChange); + } + scene.setHighlightedObjects(highlightedObjects); this.revalidate(true); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java Thu Apr 28 09:29:22 2016 -0700 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java Thu Apr 28 09:29:35 2016 -0700 @@ -56,6 +56,6 @@ List<OutputSlot> slots = getSlot().getFigure().getOutputSlots(); assert slots.contains(getSlot()); return calculateWidth(slots.size()); - + } }