# HG changeset patch # User Thomas Wuerthinger # Date 1327706244 -3600 # Node ID c1524c0d538f815006ea0a452d30c8ebfbe4825e # Parent f22dc0a63f03ca370987f805ad6c60896d189906 Use @Override annotation consistently. diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java --- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ super(NbBundle.getMessage(BytecodeViewAction.class, "CTL_BytecodeViewAction")); } + @Override public void actionPerformed(ActionEvent evt) { TopComponent win = BytecodeViewTopComponent.findInstance(); win.open(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java --- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java Sat Jan 28 00:17:24 2012 +0100 @@ -149,6 +149,7 @@ return PREFERRED_ID; } + @Override public ExplorerManager getExplorerManager() { return manager; } @@ -171,10 +172,12 @@ return super.requestFocusInWindow(temporary); } + @Override public void resultChanged(LookupEvent lookupEvent) { final InputGraphProvider p = LookupHistory.getLast(InputGraphProvider.class);//)Utilities.actionsGlobalContext().lookup(InputGraphProvider.class); if (p != null) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { InputGraph graph = p.getGraph(); if (graph != null) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java --- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java Sat Jan 28 00:17:24 2012 +0100 @@ -50,6 +50,7 @@ this.graph = graph; } + @Override protected Node[] createNodes(InputBytecode bc) { if (bc.getInlined() == null) { return new Node[]{new BytecodeNode(bc, graph, bciString)}; diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java --- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ */ public final class SelectBytecodesAction extends CookieAction { + @Override protected void performAction(Node[] activatedNodes) { SelectBytecodesCookie c = activatedNodes[0].getCookie(SelectBytecodesCookie.class); InputGraphProvider p = LookupHistory.getLast(InputGraphProvider.class);//Utilities.actionsGlobalContext().lookup(InputGraphProvider.class); @@ -45,14 +46,17 @@ } } + @Override protected int mode() { return CookieAction.MODE_EXACTLY_ONE; } + @Override public String getName() { return NbBundle.getMessage(SelectBytecodesAction.class, "CTL_SelectBytecodesAction"); } + @Override protected Class[] cookieClasses() { return new Class[]{ SelectBytecodesCookie.class @@ -65,6 +69,7 @@ putValue("noIconInMenu", Boolean.TRUE); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java Sat Jan 28 00:17:24 2012 +0100 @@ -68,10 +68,12 @@ return edge; } + @Override public Port getTo() { return inputSlot; } + @Override public Port getFrom() { return outputSlot; } @@ -100,6 +102,7 @@ setStroke(stroke); } + @Override public void setControlPoints(List p) { this.points = p; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java Sat Jan 28 00:17:24 2012 +0100 @@ -100,6 +100,7 @@ return block; } + @Override public Dimension getSize() { Rectangle bounds = getBounds(); if (bounds != null) { @@ -109,6 +110,7 @@ } } + @Override public void setPosition(Point p) { this.setPreferredLocation(p); } @@ -118,14 +120,17 @@ return block.getName(); } + @Override public Point getPosition() { return this.getPreferredLocation(); } + @Override public Cluster getCluster() { return cluster; } + @Override public boolean isRoot() { return root; } @@ -138,6 +143,7 @@ root = b; } + @Override public int compareTo(Vertex o) { return toString().compareTo(o.toString()); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -38,6 +38,7 @@ super(NbBundle.getMessage(ControlFlowAction.class, "CTL_ControlFlowAction")); } + @Override public void actionPerformed(ActionEvent evt) { TopComponent win = ControlFlowTopComponent.findInstance(); win.open(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Sat Jan 28 00:17:24 2012 +0100 @@ -155,14 +155,17 @@ selectionChanged(); } + @Override public boolean isAimingAllowed(Widget widget, Point point, boolean b) { return false; } + @Override public boolean isSelectionAllowed(Widget widget, Point point, boolean b) { return true; } + @Override public void select(Widget widget, Point point, boolean change) { if (widget == this) { clearSelection(); @@ -185,16 +188,20 @@ } } + @Override public void movementStarted(Widget widget) { } + @Override public void movementFinished(Widget widget) { } + @Override public Point getOriginalLocation(Widget widget) { return widget.getPreferredLocation(); } + @Override public void setNewLocation(Widget widget, Point location) { if (selection.contains(widget)) { // move entire selection @@ -211,6 +218,7 @@ } } + @Override public Widget createSelectionWidget() { Widget widget = new Widget(this); widget.setOpaque(false); @@ -219,6 +227,7 @@ return widget; } + @Override public void performSelection(Rectangle rectangle) { if (rectangle.width < 0) { @@ -257,6 +266,7 @@ } + @Override protected Widget attachNodeWidget(InputBlock node) { BlockWidget w = new BlockWidget(this, node); mainLayer.addChild(w); @@ -266,6 +276,7 @@ return w; } + @Override protected Widget attachEdgeWidget(InputBlockEdge edge) { BlockConnectionWidget w = new BlockConnectionWidget(this, edge); switch (edge.getState()) { @@ -282,6 +293,7 @@ return w; } + @Override protected void attachEdgeSourceAnchor(InputBlockEdge edge, InputBlock oldSourceNode, InputBlock sourceNode) { Widget w = this.findWidget(edge); assert w instanceof ConnectionWidget; @@ -290,6 +302,7 @@ } + @Override protected void attachEdgeTargetAnchor(InputBlockEdge edge, InputBlock oldTargetNode, InputBlock targetNode) { Widget w = this.findWidget(edge); assert w instanceof ConnectionWidget; diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java Sat Jan 28 00:17:24 2012 +0100 @@ -134,11 +134,13 @@ result = null; } + @Override public void resultChanged(LookupEvent lookupEvent) { final InputGraphProvider p = LookupHistory.getLast(InputGraphProvider.class);//Utilities.actionsGlobalContext().lookup(InputGraphProvider.class); if (p != null) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { InputGraph g = p.getGraph(); if (g != null) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/DoubleClickSelectAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -42,6 +42,7 @@ this.provider = provider; } + @Override protected boolean isLocked() { return false; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java --- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java Sat Jan 28 00:17:24 2012 +0100 @@ -61,18 +61,22 @@ this.to = to; } + @Override public Port getFrom() { return from.getSlot(); } + @Override public Port getTo() { return to.getSlot(); } + @Override public List getControlPoints() { return new ArrayList<>(); } + @Override public void setControlPoints(List list) { // Do nothing for now } @@ -91,10 +95,12 @@ final VertexWrapper vertex = this; this.slot = new Port() { + @Override public Vertex getVertex() { return vertex; } + @Override public Point getRelativePosition() { return new Point((int) (vertex.getSize().getWidth() / 2), (int) (vertex.getSize().getHeight() / 2)); } @@ -104,28 +110,34 @@ this.position = w.getPreferredLocation(); } + @Override public Cluster getCluster() { return null; } + @Override public Dimension getSize() { Widget w = graph.getScene().findWidget(node); return w.getBounds().getSize(); } + @Override public Point getPosition() { return position; } + @Override public void setPosition(Point p) { HierarchicalGraphLayout.this.setResolvedNodeLocation(graph, node, p); position = p; } + @Override public boolean isRoot() { return false; } + @Override public int compareTo(Vertex o) { @SuppressWarnings("unchecked") VertexWrapper vw = (VertexWrapper) o; @@ -137,6 +149,7 @@ } } + @Override protected void performGraphLayout(UniversalGraph graph) { Set links = new LinkedHashSet<>(); @@ -162,6 +175,7 @@ m.doLayout(layoutGraph); } + @Override protected void performNodesLayout(UniversalGraph graph, Collection nodes) { throw new UnsupportedOperationException(); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java Sat Jan 28 00:17:24 2012 +0100 @@ -68,6 +68,7 @@ this.setKeys(folder.getElements()); } + @Override public void changed(Object source) { addNotify(); } @@ -90,6 +91,7 @@ final FolderElement folderElement = (FolderElement) folder; this.setDisplayName(folderElement.getName()); content.add(new RemoveCookie() { + @Override public void remove() { folderElement.getParent().removeElement(folderElement); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -35,12 +35,14 @@ */ public final class DiffGraphAction extends CookieAction { + @Override protected void performAction(Node[] activatedNodes) { DiffGraphCookie c = activatedNodes[0].getCookie(DiffGraphCookie.class); assert c != null; c.openDiff(); } + @Override protected int mode() { return CookieAction.MODE_EXACTLY_ONE; } @@ -58,10 +60,12 @@ return false; } + @Override public String getName() { return NbBundle.getMessage(DiffGraphAction.class, "CTL_DiffGraphAction"); } + @Override protected Class[] cookieClasses() { return new Class[]{ DiffGraphCookie.class @@ -73,6 +77,7 @@ return "com/sun/hotspot/igv/coordinator/images/diff.png"; } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphOpenCookie.java Sat Jan 28 00:17:24 2012 +0100 @@ -40,6 +40,7 @@ this.graph = graph; } + @Override public void open() { viewer.view(graph); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/GraphRemoveCookie.java Sat Jan 28 00:17:24 2012 +0100 @@ -36,6 +36,7 @@ this.graph = graph; } + @Override public void remove() { graph.getGroup().removeElement(graph); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -60,10 +60,12 @@ public static FileFilter getFileFilter() { return new FileFilter() { + @Override public boolean accept(File f) { return f.getName().toLowerCase().endsWith(".xml") || f.isDirectory(); } + @Override public String getDescription() { return "XML files (*.xml)"; } @@ -155,6 +157,7 @@ } } + @Override public String getName() { return NbBundle.getMessage(ImportAction.class, "CTL_ImportAction"); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -40,6 +40,7 @@ super(NbBundle.getMessage(OutlineAction.class, "CTL_OutlineAction")); } + @Override public void actionPerformed(ActionEvent evt) { TopComponent win = OutlineTopComponent.findInstance(); win.open(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -36,6 +36,7 @@ */ public final class RemoveAction extends NodeAction { + @Override protected void performAction(Node[] activatedNodes) { for (Node n : activatedNodes) { RemoveCookie removeCookie = n.getCookie(RemoveCookie.class); @@ -49,6 +50,7 @@ putValue(Action.SHORT_DESCRIPTION, "Remove selected graphs and groups"); } + @Override public String getName() { return NbBundle.getMessage(RemoveAction.class, "CTL_RemoveAction"); } @@ -58,6 +60,7 @@ return "com/sun/hotspot/igv/coordinator/images/remove.png"; } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } @@ -67,6 +70,7 @@ return false; } + @Override protected boolean enable(Node[] nodes) { return nodes.length > 0; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -40,6 +40,7 @@ public final class RemoveAllAction extends CallableSystemAction { + @Override public String getName() { return NbBundle.getMessage(RemoveAllAction.class, "CTL_RemoveAllAction"); } @@ -54,6 +55,7 @@ return "com/sun/hotspot/igv/coordinator/images/removeall.png"; } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -39,11 +39,13 @@ */ public final class SaveAllAction extends CallableSystemAction { + @Override public void performAction() { final OutlineTopComponent component = OutlineTopComponent.findInstance(); SaveAsAction.save(component.getDocument()); } + @Override public String getName() { return NbBundle.getMessage(SaveAllAction.class, "CTL_SaveAllAction"); } @@ -58,6 +60,7 @@ return "com/sun/hotspot/igv/coordinator/images/saveall.gif"; } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java --- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -52,6 +52,7 @@ putValue(Action.SHORT_DESCRIPTION, "Save selected groups to XML file..."); } + @Override protected void performAction(Node[] activatedNodes) { GraphDocument doc = new GraphDocument(); @@ -97,6 +98,7 @@ return CookieAction.MODE_SOME; } + @Override public String getName() { return NbBundle.getMessage(SaveAsAction.class, "CTL_SaveAsAction"); } @@ -106,6 +108,7 @@ return "com/sun/hotspot/igv/coordinator/images/save.png"; } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } @@ -115,6 +118,7 @@ return false; } + @Override protected boolean enable(Node[] nodes) { int cnt = 0; diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java Sat Jan 28 00:17:24 2012 +0100 @@ -39,6 +39,7 @@ this.object = object; } + @Override protected void fire(ChangedListener l) { l.changed(object); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ControllableChangedListener.java Sat Jan 28 00:17:24 2012 +0100 @@ -45,6 +45,7 @@ enabled = b; } + @Override public void changed(T source) { if(enabled) { filteredChanged(source); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java Sat Jan 28 00:17:24 2012 +0100 @@ -46,6 +46,7 @@ getChangedEvent().fire(); } + @Override public ChangedEvent getChangedEvent() { return changedEvent; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java Sat Jan 28 00:17:24 2012 +0100 @@ -61,10 +61,12 @@ return method; } + @Override public ChangedEvent getChangedEvent() { return changedEvent; } + @Override public List getElements() { return Collections.unmodifiableList(elements); } @@ -73,6 +75,7 @@ return elements.size(); } + @Override public void addElement(FolderElement element) { elements.add(element); if (element instanceof InputGraph) { @@ -106,6 +109,7 @@ return sb.toString(); } + @Override public String getName() { return getProperties().get("name"); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java Sat Jan 28 00:17:24 2012 +0100 @@ -40,6 +40,7 @@ public static final Comparator OUTGOING_COMPARATOR = new Comparator(){ + @Override public int compare(InputEdge o1, InputEdge o2) { if(o1.getFromIndex() == o2.getFromIndex()) { return o1.getTo() - o2.getTo(); @@ -51,6 +52,7 @@ public static final Comparator INGOING_COMPARATOR = new Comparator(){ + @Override public int compare(InputEdge o1, InputEdge o2) { if(o1.getToIndex() == o2.getToIndex()) { return o1.getFrom() - o2.getFrom(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputGraph.java Sat Jan 28 00:17:24 2012 +0100 @@ -57,6 +57,7 @@ nodeToBlock = new LinkedHashMap<>(); } + @Override public void setParent(Folder parent) { this.parent = parent; if (parent instanceof Group) { @@ -212,6 +213,7 @@ this.getProperties().setProperty("name", name); } + @Override public String getName() { return getProperties().get("name"); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java Sat Jan 28 00:17:24 2012 +0100 @@ -34,6 +34,7 @@ private int id; public static final Comparator COMPARATOR = new Comparator() { + @Override public int compare(InputNode o1, InputNode o2) { return o1.getId() - o2.getId(); } @@ -42,6 +43,7 @@ public static Comparator getPropertyComparator(final String propertyName) { return new Comparator() { + @Override public int compare(InputNode o1, InputNode o2) { int i1 = 0; diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java Sat Jan 28 00:17:24 2012 +0100 @@ -119,6 +119,7 @@ properties = new Properties(object.getProperties()); } + @Override public Properties getProperties() { return properties; } @@ -139,10 +140,12 @@ this.matcher = matcher; } + @Override public String getName() { return matcher.getName(); } + @Override public boolean match(String p) { if (p == null) { return false; @@ -167,10 +170,12 @@ this.value = value; } + @Override public String getName() { return name; } + @Override public boolean match(String p) { if (p == null) { throw new IllegalArgumentException("Property value must not be null!"); @@ -207,10 +212,12 @@ } } + @Override public String getName() { return name; } + @Override public boolean match(String p) { if (p == null) { throw new IllegalArgumentException("Property value must not be null!"); @@ -252,6 +259,7 @@ } Collections.sort(pairs, new Comparator() { + @Override public int compare(String[] o1, String[] o2) { assert o1.length == 2; assert o2.length == 2; @@ -358,6 +366,7 @@ int index; + @Override public boolean hasNext() { while (index < map.length && map[index + 1] == null) { index += 2; @@ -365,6 +374,7 @@ return index < map.length; } + @Override public Property next() { if (index < map.length) { index += 2; @@ -373,11 +383,13 @@ return null; } + @Override public void remove() { throw new UnsupportedOperationException("Not supported yet."); } } + @Override public Iterator iterator() { return new PropertiesIterator(); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java Sat Jan 28 00:17:24 2012 +0100 @@ -195,6 +195,7 @@ this.stack.push(rootHandler); } + @Override public void setDocumentLocator(Locator locator) { if (monitor != null) { monitor.setState("Starting parsing"); @@ -235,6 +236,7 @@ stack.push(null); } + @Override public void endElement(String uri, String localName, String qName) throws SAXException { ElementHandler handler = stack.pop(); if (handler != null) { @@ -242,6 +244,7 @@ } } + @Override public void characters(char[] ch, int start, int length) throws SAXException { assert !stack.isEmpty(); @@ -253,12 +256,15 @@ } } + @Override public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { } + @Override public void processingInstruction(String target, String data) throws SAXException { } + @Override public void skippedEntity(String name) throws SAXException { } } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java --- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java Sat Jan 28 00:17:24 2012 +0100 @@ -49,6 +49,7 @@ write(arr, 0, arr.length); } + @Override public void write(char[] cbuf, int off, int len) throws IOException { for (int i = off; i < off + len; i++) { char c = cbuf[i]; @@ -64,10 +65,12 @@ } } + @Override public void flush() throws IOException { inner.flush(); } + @Override public void close() throws IOException { inner.close(); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java --- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java Sat Jan 28 00:17:24 2012 +0100 @@ -66,6 +66,7 @@ final int[] fireCount = new int[1]; e.addListener(new ChangedListener() { + @Override public void changed(Integer s) { assertEquals(s.intValue(), 5); fireCount[0]++; diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java --- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/PropertiesTest.java Sat Jan 28 00:17:24 2012 +0100 @@ -106,12 +106,14 @@ PropertyMatcher matcher = new PropertyMatcher() { + @Override public String getName() { assertFalse(called[0]); called[0] = true; return n; } + @Override public boolean match(String value) { assertTrue(v.equals(value)); return true; @@ -129,12 +131,14 @@ called[0] = false; PropertyMatcher matcher2 = new PropertyMatcher() { + @Override public String getName() { assertFalse(called[0]); called[0] = true; return n; } + @Override public boolean match(String value) { return false; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -42,14 +42,17 @@ properties = new Properties(); } + @Override public Properties getProperties() { return properties; } + @Override public OpenCookie getEditor() { return null; } + @Override public ChangedEvent getChangedEvent() { return changedEvent; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -48,10 +48,12 @@ colorRules = new ArrayList<>(); } + @Override public String getName() { return name; } + @Override public void apply(Diagram diagram) { Properties.PropertySelector
selector = new Properties.PropertySelector<>(diagram.getFigures()); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -49,10 +49,12 @@ rules = new ArrayList<>(); } + @Override public String getName() { return name; } + @Override public void apply(Diagram diagram) { Properties.PropertySelector
selector = new Properties.PropertySelector<>(diagram.getFigures()); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -47,10 +47,12 @@ connectionStyleRules = new ArrayList<>(); } + @Override public String getName() { return name; } + @Override public void apply(Diagram diagram) { Properties.PropertySelector
selector = new Properties.PropertySelector<>(diagram.getFigures()); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -59,6 +59,7 @@ getProperties().setProperty("name", name); } + @Override public String getName() { return name; } @@ -81,6 +82,7 @@ public OpenCookie getEditor() { return new OpenCookie() { + @Override public void open() { openInEditor(); } @@ -125,6 +127,7 @@ return sb.toString(); } + @Override public void apply(Diagram d) { try { ScriptEngineManager sem = new ScriptEngineManager(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EdgeColorIndexFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -48,10 +48,12 @@ this.colors = color; } + @Override public String getName() { return "Edge Color Index Filter"; } + @Override public void apply(Diagram d) { List
figures = d.getFigures(); for (Figure f : figures) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java Sat Jan 28 00:17:24 2012 +0100 @@ -41,5 +41,6 @@ OpenCookie getEditor(); + @Override ChangedEvent getChangedEvent(); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java Sat Jan 28 00:17:24 2012 +0100 @@ -41,6 +41,7 @@ private transient ChangedEvent changedEvent; private ChangedListener changedListener = new ChangedListener() { + @Override public void changed(Filter source) { changedEvent.fire(); } @@ -56,6 +57,7 @@ changedEvent = new ChangedEvent<>(this); } + @Override public ChangedEvent getChangedEvent() { return changedEvent; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/GradientColorFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -53,10 +53,12 @@ private int shadeCount = 8; private String mode = LINEAR; + @Override public String getName() { return "Gradient Color Filter"; } + @Override public void apply(Diagram d) { boolean logarithmic = mode.equalsIgnoreCase(LOGARITHMIC); if (!logarithmic && !mode.equalsIgnoreCase(LINEAR)) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -45,10 +45,12 @@ rules = new ArrayList<>(); } + @Override public String getName() { return name; } + @Override public void apply(Diagram diagram) { for (RemoveRule r : rules) { List
selected = r.getSelector().selected(diagram); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -46,10 +46,12 @@ rules = new ArrayList<>(); } + @Override public String getName() { return name; } + @Override public void apply(Diagram diagram) { for (RemoveInputsRule r : rules) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -44,10 +44,12 @@ this.name = name; } + @Override public String getName() { return name; } + @Override public void apply(Diagram d) { for (Figure f : d.getFigures()) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -47,10 +47,12 @@ this.propertyName = propertyName; } + @Override public String getName() { return name; } + @Override public void apply(Diagram d) { List
list = selector.selected(d); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java --- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/UnconnectedSlotFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -44,10 +44,12 @@ this.removeOutputs = outputs; } + @Override public String getName() { return "Unconnected Slot Filter"; } + @Override public void apply(Diagram d) { if (!removeInputs && !removeOutputs) { return; diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java Sat Jan 28 00:17:24 2012 +0100 @@ -65,6 +65,7 @@ startBackground = this.getBackground(); } + @Override public Component getListCellRendererComponent(final JList list, Object value, final int index, boolean isSelected, boolean cellHasFocus) { setText(value.toString()); CheckNode node = ((CheckNodeListModel) list.getModel()).getCheckNodeAt(index); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java Sat Jan 28 00:17:24 2012 +0100 @@ -32,10 +32,12 @@ */ public class FilterChainProviderImplementation implements FilterChainProvider { + @Override public FilterChain getFilterChain() { return FilterTopComponent.findInstance().getFilterChain(); } + @Override public FilterChain getSequence() { return FilterTopComponent.findInstance().getSequence(); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java Sat Jan 28 00:17:24 2012 +0100 @@ -62,6 +62,7 @@ this.filter = filter; filter.getChangedEvent().addListener(new ChangedListener() { + @Override public void changed(Filter source) { update(); } @@ -104,10 +105,12 @@ return OpenAction.get(OpenAction.class).createContextAwareInstance(Utilities.actionsGlobalContext()); } + @Override public void resultChanged(LookupEvent lookupEvent) { changed(FilterTopComponent.findInstance()); } + @Override public void changed(FilterTopComponent source) { setSelected(source.getFilterChain().containsFilter(filter)); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java Sat Jan 28 00:17:24 2012 +0100 @@ -106,6 +106,7 @@ private ChangedEvent filterSettingsChangedEvent; private ActionListener comboBoxActionListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { comboBoxSelectionChanged(); } @@ -204,6 +205,7 @@ // Sort alphabetically Collections.sort(filterSettings, new Comparator() { + @Override public int compare(FilterSetting o1, FilterSetting o2) { return o1.getName().compareTo(o2.getName()); } @@ -272,6 +274,7 @@ private HashMap nodeHash = new HashMap<>(); + @Override protected Node[] createNodes(Filter filter) { if (nodeHash.containsKey(filter)) { return new Node[]{nodeHash.get(filter)}; @@ -286,6 +289,7 @@ public FilterChildren() { sequence.getChangedEvent().addListener(new ChangedListener() { + @Override public void changed(FilterChain source) { addNotify(); } @@ -300,6 +304,7 @@ updateSelection(); } + @Override public void changed(CheckNode source) { FilterNode node = (FilterNode) source; Filter f = node.getFilter(); @@ -394,6 +399,7 @@ filter = cf; } + @Override public void changed(Filter source) { try { if (!fileObject.getName().equals(filter.getName())) { @@ -556,6 +562,7 @@ return PREFERRED_ID; } + @Override public ExplorerManager getExplorerManager() { return manager; } @@ -573,6 +580,7 @@ result = null; } + @Override public void resultChanged(LookupEvent lookupEvent) { setChain(Utilities.actionsGlobalContext().lookup(FilterChain.class)); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -39,6 +39,7 @@ super(NbBundle.getMessage(FilterAction.class, "CTL_FilterAction")); } + @Override public void actionPerformed(ActionEvent evt) { TopComponent win = FilterTopComponent.findInstance(); win.open(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ */ public final class MoveFilterDownAction extends CookieAction { + @Override protected void performAction(Node[] activatedNodes) { for (Node n : activatedNodes) { Filter c = n.getLookup().lookup(Filter.class); @@ -44,6 +45,7 @@ } } + @Override protected int mode() { return CookieAction.MODE_EXACTLY_ONE; } @@ -53,10 +55,12 @@ putValue(Action.SHORT_DESCRIPTION, "Move selected filter downwards"); } + @Override public String getName() { return NbBundle.getMessage(MoveFilterUpAction.class, "CTL_MoveFilterDownAction"); } + @Override protected Class[] cookieClasses() { return new Class[]{ Filter.class @@ -74,6 +78,7 @@ putValue("noIconInMenu", Boolean.TRUE); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ */ public final class MoveFilterUpAction extends CookieAction { + @Override protected void performAction(Node[] activatedNodes) { for (Node n : activatedNodes) { Filter c = n.getLookup().lookup(Filter.class); @@ -44,6 +45,7 @@ } } + @Override protected int mode() { return CookieAction.MODE_EXACTLY_ONE; } @@ -52,10 +54,12 @@ putValue(Action.SHORT_DESCRIPTION, "Move selected filter upwards"); } + @Override public String getName() { return NbBundle.getMessage(MoveFilterUpAction.class, "CTL_MoveFilterUpAction"); } + @Override protected Class[] cookieClasses() { return new Class[]{ Filter.class @@ -73,6 +77,7 @@ putValue("noIconInMenu", Boolean.TRUE); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -39,10 +39,12 @@ putValue(Action.SHORT_DESCRIPTION, "Create new filter"); } + @Override public void performAction() { FilterTopComponent.findInstance().newFilter(); } + @Override public String getName() { return NbBundle.getMessage(SaveFilterSettingsAction.class, "CTL_NewFilterAction"); } @@ -52,6 +54,7 @@ super.initialize(); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -39,6 +39,7 @@ */ public final class RemoveFilterAction extends CookieAction { + @Override protected void performAction(Node[] activatedNodes) { Object[] options = {"Yes", "No", @@ -59,10 +60,12 @@ } } + @Override protected int mode() { return CookieAction.MODE_ALL; } + @Override public String getName() { return NbBundle.getMessage(RemoveFilterAction.class, "CTL_RemoveFilterAction"); } @@ -71,6 +74,7 @@ putValue(Action.SHORT_DESCRIPTION, "Remove selected filter"); } + @Override protected Class[] cookieClasses() { return new Class[]{ Filter.class @@ -88,6 +92,7 @@ return "com/sun/hotspot/igv/filterwindow/images/minus.png"; } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -35,10 +35,12 @@ */ public final class RemoveFilterSettingsAction extends CallableSystemAction { + @Override public void performAction() { FilterTopComponent.findInstance().removeFilterSetting(); } + @Override public String getName() { return NbBundle.getMessage(RemoveFilterSettingsAction.class, "CTL_RemoveFilterSettingsAction"); } @@ -52,6 +54,7 @@ super.initialize(); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -35,10 +35,12 @@ */ public final class SaveFilterSettingsAction extends CallableSystemAction { + @Override public void performAction() { FilterTopComponent.findInstance().addFilterSetting(); } + @Override public String getName() { return NbBundle.getMessage(SaveFilterSettingsAction.class, "CTL_SaveFilterSettingsAction"); } @@ -52,6 +54,7 @@ putValue(Action.SHORT_DESCRIPTION, "Save filter configuration as profile..."); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java --- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -34,10 +34,12 @@ public class GraalCFGFilter extends AbstractFilter { + @Override public String getName() { return "Graal CFG Filter"; } + @Override public void apply(Diagram d) { Set
figuresToRemove = new HashSet<>(); Set connectionsToRemove = new HashSet<>(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java --- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalColoringFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -38,10 +38,12 @@ this.colorName = colorName; } + @Override public String getName() { return "Graal Coloring Filter (" + colorName + ")"; } + @Override public void apply(Diagram d) { List
figures = d.getFigures(); int colors = 0; diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java --- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java Sat Jan 28 00:17:24 2012 +0100 @@ -46,10 +46,12 @@ public GraalEdgeColorFilter() { } + @Override public String getName() { return "Graal Edge Color Filter"; } + @Override public void apply(Diagram d) { List
figures = d.getFigures(); for (Figure f : figures) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java Sat Jan 28 00:17:24 2012 +0100 @@ -40,6 +40,7 @@ this.selector2 = s2; } + @Override public List
selected(Diagram d) { List
l1 = selector1.selected(d); List
l2 = selector2.selected(d); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java Sat Jan 28 00:17:24 2012 +0100 @@ -44,6 +44,7 @@ this.diagram = diagram; } + @Override public Cluster getOuter() { return null; } @@ -52,6 +53,7 @@ return inputBlock; } + @Override public Set getSuccessors() { Set succs = new HashSet<>(); for (InputBlock b : inputBlock.getSuccessors()) { @@ -60,14 +62,17 @@ return succs; } + @Override public void setBounds(Rectangle r) { this.bounds = r; } + @Override public Rectangle getBounds() { return bounds; } + @Override public int compareTo(Cluster o) { return toString().compareTo(o.toString()); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java Sat Jan 28 00:17:24 2012 +0100 @@ -92,6 +92,7 @@ style = s; } + @Override public Source getSource() { return source; } @@ -125,18 +126,22 @@ return "Connection('" + label + "', " + getFrom().getVertex() + " to " + getTo().getVertex() + ")"; } + @Override public Port getFrom() { return outputSlot; } + @Override public Port getTo() { return inputSlot; } + @Override public List getControlPoints() { return controlPoints; } + @Override public void setControlPoints(List list) { controlPoints = list; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java Sat Jan 28 00:17:24 2012 +0100 @@ -281,6 +281,7 @@ List
figuresSorted = new ArrayList<>(tmpFigures); Collections.sort(figuresSorted, new Comparator
() { + @Override public int compare(Figure a, Figure b) { return b.getPredecessors().size() + b.getSuccessors().size() - a.getPredecessors().size() - a.getSuccessors().size(); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java Sat Jan 28 00:17:24 2012 +0100 @@ -183,10 +183,12 @@ successors.remove(f); } + @Override public void setPosition(Point p) { this.position = p; } + @Override public Point getPosition() { return position; } @@ -195,6 +197,7 @@ return diagram; } + @Override public Source getSource() { return source; } @@ -316,6 +319,7 @@ return sb.toString(); } + @Override public Dimension getSize() { if (VERTICAL_LAYOUT) { int width = Math.max(getWidth(), Figure.SLOT_WIDTH * (Math.max(inputSlots.size(), outputSlots.size()) + 1)); @@ -335,6 +339,7 @@ return idString; } + @Override public Cluster getCluster() { if (getSource().getSourceNodes().size() == 0) { assert false : "Should never reach here, every figure must have at least one source node!"; @@ -348,6 +353,7 @@ } } + @Override public boolean isRoot() { List sourceNodes = source.getSourceNodes(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java Sat Jan 28 00:17:24 2012 +0100 @@ -36,15 +36,18 @@ super(figure, wantedIndex); } + @Override public int getPosition() { return getFigure().getInputSlots().indexOf(this); } + @Override public void setPosition(int position) { List inputSlots = getFigure().inputSlots; InputSlot s = inputSlots.remove(position); inputSlots.add(position, s); } + @Override public Point getRelativePosition() { int gap = getFigure().getWidth() - Figure.getSlotsWidth(getFigure().getInputSlots()); double gapRatio = (double)gap / (double)(getFigure().getInputSlots().size() + 1); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java Sat Jan 28 00:17:24 2012 +0100 @@ -38,6 +38,7 @@ this.selector = selector; } + @Override public List
selected(Diagram d) { List
result = new ArrayList<>(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java Sat Jan 28 00:17:24 2012 +0100 @@ -39,6 +39,7 @@ this.matcher = matcher; } + @Override public List
selected(Diagram d) { Properties.PropertySelector
selector = new Properties.PropertySelector<>(d.getFigures()); List
list = selector.selectMultiple(matcher); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java Sat Jan 28 00:17:24 2012 +0100 @@ -40,6 +40,7 @@ this.selector2 = s2; } + @Override public List
selected(Diagram d) { List
l1 = selector1.selected(d); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java Sat Jan 28 00:17:24 2012 +0100 @@ -35,15 +35,18 @@ super(figure, wantedIndex); } + @Override public int getPosition() { return getFigure().getOutputSlots().indexOf(this); } + @Override public void setPosition(int position) { OutputSlot s = getFigure().outputSlots.remove(position); getFigure().outputSlots.add(position, s); } + @Override public Point getRelativePosition() { int gap = getFigure().getWidth() - Figure.getSlotsWidth(getFigure().getOutputSlots()); if(gap < 0) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java Sat Jan 28 00:17:24 2012 +0100 @@ -38,6 +38,7 @@ this.innerSelector = innerSelector; } + @Override public List
selected(Diagram d) { List
inner = innerSelector.selected(d); List
result = new ArrayList<>(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java Sat Jan 28 00:17:24 2012 +0100 @@ -63,6 +63,7 @@ assert figure != null; } + @Override public Properties getProperties() { Properties p = new Properties(); if (source.getSourceNodes().size() > 0) { @@ -78,12 +79,14 @@ } public static final Comparator slotIndexComparator = new Comparator() { + @Override public int compare(Slot o1, Slot o2) { return o1.wantedIndex - o2.wantedIndex; } }; public static final Comparator slotFigureComparator = new Comparator() { + @Override public int compare(Slot o1, Slot o2) { return o1.figure.getId() - o2.figure.getId(); } @@ -113,6 +116,7 @@ return wantedIndex; } + @Override public Source getSource() { return source; } @@ -179,6 +183,7 @@ } } + @Override public Vertex getVertex() { return figure; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java --- a/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java Sat Jan 28 00:17:24 2012 +0100 @@ -38,6 +38,7 @@ this.innerSelector = innerSelector; } + @Override public List
selected(Diagram d) { List
inner = innerSelector.selected(d); List
result = new ArrayList<>(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java Sat Jan 28 00:17:24 2012 +0100 @@ -45,18 +45,22 @@ this.to = to; } + @Override public Port getTo() { return to.getInputSlot(); } + @Override public Port getFrom() { return from.getInputSlot(); } + @Override public void setControlPoints(List p) { this.points = p; } + @Override public List getControlPoints() { return points; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java Sat Jan 28 00:17:24 2012 +0100 @@ -58,18 +58,22 @@ return inputSlotNode; } + @Override public Port getTo() { return inputSlot; } + @Override public Port getFrom() { return outputSlot; } + @Override public void setControlPoints(List p) { this.controlPoints = p; } + @Override public List getControlPoints() { return controlPoints; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java Sat Jan 28 00:17:24 2012 +0100 @@ -69,10 +69,12 @@ outputSlot = new Port() { + @Override public Point getRelativePosition() { return new Point(0, 0); } + @Override public Vertex getVertex() { return thisNode; } @@ -85,6 +87,7 @@ inputSlot = new Port() { + @Override public Point getRelativePosition() { Point p = new Point(thisNode.getPosition()); p.x += ClusterNode.BORDER; @@ -92,6 +95,7 @@ return p; } + @Override public Vertex getVertex() { return thisBlockNode; } @@ -115,14 +119,17 @@ return outputSlot; } + @Override public Dimension getSize() { return new Dimension(SIZE, SIZE); } + @Override public void setPosition(Point p) { this.position = p; } + @Override public Point getPosition() { return position; } @@ -131,14 +138,17 @@ this.interBlockConnection = interBlockConnection; } + @Override public Cluster getCluster() { return cluster; } + @Override public boolean isRoot() { return true; } + @Override public int compareTo(Vertex o) { return toString().compareTo(o.toString()); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java Sat Jan 28 00:17:24 2012 +0100 @@ -81,10 +81,12 @@ final ClusterNode widget = this; inputSlot = new Port() { + @Override public Point getRelativePosition() { return new Point(size.width / 2, 0); } + @Override public Vertex getVertex() { return widget; } @@ -92,10 +94,12 @@ outputSlot = new Port() { + @Override public Point getRelativePosition() { return new Point(size.width / 2, 0);//size.height); } + @Override public Vertex getVertex() { return widget; } @@ -164,14 +168,17 @@ return outputSlot; } + @Override public Dimension getSize() { return size; } + @Override public Point getPosition() { return position; } + @Override public void setPosition(Point pos) { this.position = pos; @@ -198,6 +205,7 @@ } } + @Override public Cluster getCluster() { return cluster; } @@ -214,10 +222,12 @@ root = b; } + @Override public boolean isRoot() { return root; } + @Override public int compareTo(Vertex o) { return toString().compareTo(o.toString()); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java Sat Jan 28 00:17:24 2012 +0100 @@ -50,18 +50,22 @@ inputSlot = outputSlotNode.getInputSlot(); } + @Override public Port getTo() { return inputSlot; } + @Override public Port getFrom() { return outputSlot; } + @Override public void setControlPoints(List p) { this.intermediatePoints = p; } + @Override public List getControlPoints() { return intermediatePoints; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java Sat Jan 28 00:17:24 2012 +0100 @@ -69,10 +69,12 @@ inputSlot = new Port() { + @Override public Point getRelativePosition() { return new Point(0, 0); } + @Override public Vertex getVertex() { return thisNode; } @@ -85,6 +87,7 @@ outputSlot = new Port() { + @Override public Point getRelativePosition() { Point p = new Point(thisNode.getPosition()); p.x += ClusterNode.BORDER; @@ -92,6 +95,7 @@ return p; } + @Override public Vertex getVertex() { return thisBlockNode; } @@ -103,14 +107,17 @@ }; } + @Override public Dimension getSize() { return new Dimension(SIZE, SIZE); } + @Override public void setPosition(Point p) { this.position = p; } + @Override public Point getPosition() { return position; } @@ -131,14 +138,17 @@ root = b; } + @Override public Cluster getCluster() { return cluster; } + @Override public boolean isRoot() { return root; } + @Override public int compareTo(Vertex o) { return toString().compareTo(o.toString()); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java Sat Jan 28 00:17:24 2012 +0100 @@ -83,6 +83,7 @@ dest.addInEdge(this); } + @Override public String toString() { return "Edge (" + source + " -- " + dest + "): " + data; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java Sat Jan 28 00:17:24 2012 +0100 @@ -189,11 +189,13 @@ minLayerDifference = v; } + @Override public void doLayout(LayoutGraph graph) { doLayout(graph, new HashSet(), new HashSet(), new HashSet()); } + @Override public void doLayout(LayoutGraph graph, Set firstLayerHint, Set lastLayerHint, Set importantLinks) { this.importantLinks = importantLinks; @@ -263,6 +265,7 @@ private int pointCount; + @Override protected void run() { HashMap vertexPositions = new HashMap<>(); @@ -505,6 +508,7 @@ } private static final Comparator segmentComparator = new Comparator() { + @Override public int compare(Segment s1, Segment s2) { return s1.orderNumber - s2.orderNumber; } @@ -520,17 +524,20 @@ } private static final Comparator regionComparator = new Comparator() { + @Override public int compare(Region r1, Region r2) { return r1.minOrderNumber - r2.minOrderNumber; } }; private static final Comparator nodePositionComparator = new Comparator() { + @Override public int compare(LayoutNode n1, LayoutNode n2) { return n1.pos - n2.pos; } }; private static final Comparator nodeProcessingDownComparator = new Comparator() { + @Override public int compare(LayoutNode n1, LayoutNode n2) { if (n1.vertex == null) { if (n2.vertex == null) { @@ -546,6 +553,7 @@ }; private static final Comparator nodeProcessingUpComparator = new Comparator() { + @Override public int compare(LayoutNode n1, LayoutNode n2) { if (n1.vertex == null) { if (n2.vertex == null) { @@ -579,6 +587,7 @@ upProcessingOrder = new ArrayList[layers.length]; } + @Override protected void run() { createArrays(); @@ -1080,6 +1089,7 @@ } } + @Override protected void run() { generateSegments(); @@ -1100,6 +1110,7 @@ } private static Comparator crossingNodeComparator = new Comparator() { + @Override public int compare(LayoutNode n1, LayoutNode n2) { return n1.crossingNumber - n2.crossingNumber; } @@ -1123,6 +1134,7 @@ } } + @Override protected void run() { createLayers(); @@ -1324,6 +1336,7 @@ private class AssignYCoordinates extends AlgorithmPart { + @Override protected void run() { int curY = 0; @@ -1380,6 +1393,7 @@ } } + @Override protected void run() { oldNodeCount = nodes.size(); @@ -1388,6 +1402,7 @@ Comparator comparator = new Comparator() { + @Override public int compare(LayoutEdge e1, LayoutEdge e2) { return e1.to.layer - e2.to.layer; } @@ -1612,6 +1627,7 @@ } } + @Override protected void run() { List insertOrder = new ArrayList<>(); @@ -1718,6 +1734,7 @@ private HashSet visited; private HashSet active; + @Override protected void run() { // Remove self-edges @@ -1981,6 +1998,7 @@ } private Comparator linkComparator = new Comparator() { + @Override public int compare(Link l1, Link l2) { int result = l1.getFrom().getVertex().compareTo(l2.getFrom().getVertex()); @@ -2002,6 +2020,7 @@ private class BuildDatastructure extends AlgorithmPart { + @Override protected void run() { // Set up nodes List vertices = new ArrayList<>(graph.getVertices()); @@ -2072,6 +2091,7 @@ } } + @Override public void doRouting(LayoutGraph graph) { // Do nothing for now } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java --- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java Sat Jan 28 00:17:24 2012 +0100 @@ -53,18 +53,22 @@ return outputSlotNode; } + @Override public Port getTo() { return inputSlot; } + @Override public Port getFrom() { return outputSlot; } + @Override public void setControlPoints(List p) { this.intermediatePoints = p; } + @Override public List getControlPoints() { return intermediatePoints; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java --- a/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java Sat Jan 28 00:17:24 2012 +0100 @@ -48,6 +48,7 @@ this.socket = socket; } + @Override public void run() { try { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java --- a/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java Sat Jan 28 00:17:24 2012 +0100 @@ -53,6 +53,7 @@ Settings.get().addPreferenceChangeListener(this); } + @Override public void preferenceChange(PreferenceChangeEvent e) { int curPort = Integer.parseInt(Settings.get().get(Settings.PORT, Settings.PORT_DEFAULT)); @@ -75,6 +76,7 @@ Runnable runnable = new Runnable() { + @Override public void run() { while (true) { try { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java --- a/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java Sat Jan 28 00:17:24 2012 +0100 @@ -65,6 +65,7 @@ private InputBlock[][] commonDominator; private static final Comparator edgeComparator = new Comparator() { + @Override public int compare(InputEdge o1, InputEdge o2) { return o1.getToIndex() - o2.getToIndex(); } @@ -190,6 +191,7 @@ return n.getProperties().get("block"); } + @Override public Collection schedule(InputGraph graph) { if (graph.getNodes().isEmpty()) { return Collections.emptyList(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java --- a/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java Sat Jan 28 00:17:24 2012 +0100 @@ -41,14 +41,17 @@ return new ImageIcon(ImageUtilities.loadImage("com/sun/hotspot/igv/settings/settings.png")); } + @Override public String getCategoryName() { return NbBundle.getMessage(ViewOptionsCategory.class, "OptionsCategory_Name_View"); } + @Override public String getTitle() { return NbBundle.getMessage(ViewOptionsCategory.class, "OptionsCategory_Title_View"); } + @Override public OptionsPanelController create() { return new ViewOptionsPanelController(); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java --- a/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java Sat Jan 28 00:17:24 2012 +0100 @@ -40,40 +40,49 @@ private final PropertyChangeSupport pcs = new PropertyChangeSupport(this); private boolean changed; + @Override public void update() { getPanel().load(); changed = false; } + @Override public void applyChanges() { getPanel().store(); changed = false; } + @Override public void cancel() { // need not do anything special, if no changes have been persisted yet } + @Override public boolean isValid() { return getPanel().valid(); } + @Override public boolean isChanged() { return changed; } + @Override public HelpCtx getHelpCtx() { return null; // new HelpCtx("...ID") if you have a help set } + @Override public JComponent getComponent(Lookup masterLookup) { return getPanel(); } + @Override public void addPropertyChangeListener(PropertyChangeListener l) { pcs.addPropertyChangeListener(l); } + @Override public void removePropertyChangeListener(PropertyChangeListener l) { pcs.removePropertyChangeListener(l); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java --- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java Sat Jan 28 00:17:24 2012 +0100 @@ -40,15 +40,18 @@ color = c; } + @Override public void paintIcon(Component c, Graphics g, int x, int y) { g.setColor(color); g.fillRect(x, y, 16, 16); } + @Override public int getIconWidth() { return 16; } + @Override public int getIconHeight() { return 16; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java --- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -56,6 +56,7 @@ resultChanged(null); } + @Override public void resultChanged(LookupEvent e) { if (result.allItems().size() != 0) { update(result.allInstances().iterator().next()); @@ -71,6 +72,7 @@ // Ensure it's AWT event thread EventQueue.invokeLater(new Runnable() { + @Override public void run() { performAction(t); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java --- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java Sat Jan 28 00:17:24 2012 +0100 @@ -118,27 +118,34 @@ } } + @Override public void mouseClicked(MouseEvent e) { } + @Override public void mousePressed(MouseEvent e) { moveVisibleRect(e.getPoint()); } + @Override public void mouseReleased(MouseEvent e) { moveVisibleRect(e.getPoint()); } + @Override public void mouseEntered(MouseEvent e) { } + @Override public void mouseExited(MouseEvent e) { } + @Override public void mouseDragged(MouseEvent e) { moveVisibleRect(e.getPoint()); } + @Override public void mouseMoved(MouseEvent e) { } @@ -170,26 +177,33 @@ } + @Override public void sceneRepaint() { } + @Override public void sceneValidating() { } + @Override public void sceneValidated() { } + @Override public void componentResized(ComponentEvent e) { repaint(); } + @Override public void componentMoved(ComponentEvent e) { repaint(); } + @Override public void componentShown(ComponentEvent e) { } + @Override public void componentHidden(ComponentEvent e) { } } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java --- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java Sat Jan 28 00:17:24 2012 +0100 @@ -55,6 +55,7 @@ return last; } + @Override public void resultChanged(LookupEvent ev) { T current = Utilities.actionsGlobalContext().lookup(klass); if (current != null) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java --- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java Sat Jan 28 00:17:24 2012 +0100 @@ -105,6 +105,7 @@ return d; } + @Override public void changed(RangeSliderModel source) { update(); } @@ -240,6 +241,7 @@ return false; } + @Override public void mouseDragged(MouseEvent e) { if (state == State.DragBar) { int firstX = this.getStartXPosition(model.getFirstPosition()); @@ -294,6 +296,7 @@ return result; } + @Override public void mouseMoved(MouseEvent e) { isOverBar = false; if (model == null) { @@ -313,6 +316,7 @@ repaint(); } + @Override public void mouseClicked(MouseEvent e) { if (e.getClickCount() > 1) { // Double click @@ -321,6 +325,7 @@ } } + @Override public void mousePressed(MouseEvent e) { if (model == null) { return; @@ -341,6 +346,7 @@ tempModel = model.copy(); } + @Override public void mouseReleased(MouseEvent e) { if (model == null || tempModel == null) { return; @@ -350,9 +356,11 @@ tempModel = null; } + @Override public void mouseEntered(MouseEvent e) { } + @Override public void mouseExited(MouseEvent e) { isOverBar = false; repaint(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java --- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java Sat Jan 28 00:17:24 2012 +0100 @@ -130,6 +130,7 @@ return colorChangedEvent; } + @Override public ChangedEvent getChangedEvent() { return changedEvent; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java Sat Jan 28 00:17:24 2012 +0100 @@ -105,12 +105,14 @@ private PopupMenuProvider popupMenuProvider = new PopupMenuProvider() { + @Override public JPopupMenu getPopupMenu(Widget widget, Point localLocation) { return DiagramScene.this.createPopupMenu(); } }; private RectangularSelectDecorator rectangularSelectDecorator = new RectangularSelectDecorator() { + @Override public Widget createSelectionWidget() { Widget widget = new Widget(DiagramScene.this); widget.setBorder(BorderFactory.createLineBorder(Color.black, 2)); @@ -140,6 +142,7 @@ return false; } + @Override public void zoomOut() { double zoom = getZoomFactor(); Point viewPosition = getScrollPane().getViewport().getViewPosition(); @@ -151,6 +154,7 @@ } } + @Override public void zoomIn() { double zoom = getZoomFactor(); @@ -190,6 +194,7 @@ } private ControllableChangedListener highlightedCoordinatorListener = new ControllableChangedListener() { + @Override public void filteredChanged(SelectionCoordinator source) { DiagramScene.this.setHighlightedObjects(getObjectsFromIdSet(source.getHighlightedObjects())); DiagramScene.this.validate(); @@ -282,15 +287,19 @@ } private ObjectSceneListener selectionChangedListener = new ObjectSceneListener() { + @Override public void objectAdded(ObjectSceneEvent arg0, Object arg1) { } + @Override public void objectRemoved(ObjectSceneEvent arg0, Object arg1) { } + @Override public void objectStateChanged(ObjectSceneEvent e, Object o, ObjectState oldState, ObjectState newState) { } + @Override public void selectionChanged(ObjectSceneEvent e, Set oldSet, Set newSet) { DiagramScene scene = (DiagramScene) e.getObjectScene(); if (scene.isRebuilding()) { @@ -332,6 +341,7 @@ } + @Override public void highlightingChanged(ObjectSceneEvent e, Set oldSet, Set newSet) { Set nodeHighlighting = new HashSet<>(); for (Object o : newSet) { @@ -347,6 +357,7 @@ highlightedCoordinatorListener.setEnabled(true); } + @Override public void hoverChanged(ObjectSceneEvent e, Object oldObject, Object newObject) { Set newHighlightedObjects = new HashSet<>(DiagramScene.this.getHighlightedObjects()); if (oldObject != null) { @@ -358,6 +369,7 @@ DiagramScene.this.setHighlightedObjects(newHighlightedObjects); } + @Override public void focusChanged(ObjectSceneEvent arg0, Object arg1, Object arg2) { } }; @@ -433,6 +445,7 @@ return scrollPane; } + @Override public Component getComponent() { return scrollPane; } @@ -445,6 +458,7 @@ final DiagramScene diagramScene = this; Action a = new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { diagramScene.gotoFigure(f); } @@ -811,6 +825,7 @@ } } + @Override public void setInteractionMode(InteractionMode mode) { panAction.setEnabled(mode == InteractionMode.PANNING); // When panAction is not enabled, it does not consume the event @@ -835,6 +850,7 @@ return lookup; } + @Override public void initialize() { Figure f = getModel().getDiagramToView().getRootFigure(); if (f != null) { @@ -955,6 +971,7 @@ } } + @Override public void setSelection(Collection
list) { super.setSelectedObjects(new HashSet<>(list)); } @@ -968,6 +985,7 @@ return undoRedoManager; } + @Override public UndoRedo getUndoRedo() { return getUndoRedoManager(); } @@ -997,11 +1015,13 @@ return false; } + @Override public void componentHidden() { SelectionCoordinator.getInstance().getHighlightedChangedEvent().removeListener(highlightedCoordinatorListener); SelectionCoordinator.getInstance().getSelectedChangedEvent().removeListener(selectedCoordinatorListener); } + @Override public void componentShowing() { SelectionCoordinator.getInstance().getHighlightedChangedEvent().addListener(highlightedCoordinatorListener); SelectionCoordinator.getInstance().getSelectedChangedEvent().addListener(selectedCoordinatorListener); @@ -1193,6 +1213,7 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { scene.setScrollPosition(oldScrollPosition); } @@ -1201,6 +1222,7 @@ scene.setUndoRedoEnabled(b); } + @Override public void changed(DiagramViewModel source) { scene.getModel().getViewChangedEvent().removeListener(this); if (oldModel.getHiddenNodes().equals(newModel.getHiddenNodes())) { @@ -1221,6 +1243,7 @@ } private final ChangedListener fullChange = new ChangedListener() { + @Override public void changed(DiagramViewModel source) { assert source == model : "Receive only changed event from current model!"; assert source != null; @@ -1229,6 +1252,7 @@ }; private final ChangedListener hiddenNodesChange = new ChangedListener() { + @Override public void changed(DiagramViewModel source) { assert source == model : "Receive only changed event from current model!"; assert source != null; @@ -1237,6 +1261,7 @@ }; private final ChangedListener selectionChange = new ChangedListener() { + @Override public void changed(DiagramViewModel source) { assert source == model : "Receive only changed event from current model!"; assert source != null; diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java Sat Jan 28 00:17:24 2012 +0100 @@ -67,6 +67,7 @@ private boolean showNodeHull; private ChangedListener filterChainChangedListener = new ChangedListener() { + @Override public void changed(FilterChain source) { diagramChanged(); } @@ -167,6 +168,7 @@ private Group oldGroup; + @Override public void changed(DiagramViewModel source) { if (oldGroup != null) { oldGroup.getChangedEvent().removeListener(groupContentChangedListener); @@ -177,6 +179,7 @@ }; private final ChangedListener groupContentChangedListener = new ChangedListener() { + @Override public void changed(Group source) { assert source == group; setPositions(calculateStringList(source)); @@ -390,6 +393,7 @@ return inputGraph; } + @Override public void changed(RangeSliderModel source) { inputGraph = null; diagramChanged(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java Sat Jan 28 00:17:24 2012 +0100 @@ -41,10 +41,12 @@ this.editor = editor; } + @Override public InputGraph getGraph() { return editor.getDiagramModel().getGraphToView(); } + @Override public void setSelectedNodes(Set nodes) { editor.setSelectedNodes(nodes); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java Sat Jan 28 00:17:24 2012 +0100 @@ -127,6 +127,7 @@ private DiagramViewModel rangeSliderModel; private ExportCookie exportCookie = new ExportCookie() { + @Override public void export(File f) { Graphics2D svgGenerator = BatikSVG.createGraphicsObject(); @@ -161,10 +162,12 @@ private DiagramProvider diagramProvider = new DiagramProvider() { + @Override public Diagram getDiagram() { return getModel().getDiagramToView(); } + @Override public ChangedEvent getChangedEvent() { return diagramChangedEvent; } @@ -309,14 +312,17 @@ scene.getComponent().addHierarchyBoundsListener(new HierarchyBoundsListener() { + @Override public void ancestorMoved(HierarchyEvent e) { } + @Override public void ancestorResized(HierarchyEvent e) { if (!notFirstTime && scene.getComponent().getBounds().width > 0) { notFirstTime = true; SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { EditorTopComponent.this.scene.initialize(); } @@ -333,9 +339,11 @@ } private KeyListener keyListener = new KeyListener() { + @Override public void keyTyped(KeyEvent e) { } + @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_S) { EditorTopComponent.this.overviewButton.setSelected(true); @@ -343,6 +351,7 @@ } } + @Override public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_S) { EditorTopComponent.this.overviewButton.setSelected(false); @@ -443,6 +452,7 @@ private ChangedListener diagramChangedListener = new ChangedListener() { + @Override public void changed(DiagramViewModel source) { updateDisplayName(); Collection list = new ArrayList<>(); @@ -489,6 +499,7 @@ setSelectedFigures(list); } + @Override public void propertyChange(PropertyChangeEvent evt) { if (evt.getSource() == this.predSuccAction) { boolean b = (Boolean) predSuccAction.getValue(PredSuccAction.STATE); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java Sat Jan 28 00:17:24 2012 +0100 @@ -48,6 +48,7 @@ addMouseMotionListener(this); } + @Override public void addNotify() { super.addNotify(); scene.addSceneListener(this); @@ -59,6 +60,7 @@ repaint(); } + @Override public void removeNotify() { scene.getView().removeComponentListener(this); scene.removeSceneListener(this); @@ -74,6 +76,7 @@ } } + @Override public void paint(Graphics g) { Graphics2D gr = (Graphics2D) g; super.paint(g); @@ -122,27 +125,34 @@ } } + @Override public void mouseClicked(MouseEvent e) { } + @Override public void mousePressed(MouseEvent e) { moveVisibleRect(e.getPoint()); } + @Override public void mouseReleased(MouseEvent e) { moveVisibleRect(e.getPoint()); } + @Override public void mouseEntered(MouseEvent e) { } + @Override public void mouseExited(MouseEvent e) { } + @Override public void mouseDragged(MouseEvent e) { moveVisibleRect(e.getPoint()); } + @Override public void mouseMoved(MouseEvent e) { } @@ -175,27 +185,34 @@ this.repaint(); } + @Override public void sceneRepaint() { //repaint (); } + @Override public void sceneValidating() { } + @Override public void sceneValidated() { } + @Override public void componentResized(ComponentEvent e) { repaint(); } + @Override public void componentMoved(ComponentEvent e) { repaint(); } + @Override public void componentShown(ComponentEvent e) { } + @Override public void componentHidden(ComponentEvent e) { } } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java Sat Jan 28 00:17:24 2012 +0100 @@ -34,6 +34,7 @@ */ public class GraphViewerImplementation implements GraphViewer { + @Override public void view(InputGraph graph) { Diagram diagram = Diagram.createDiagram(graph, Settings.get().get(Settings.NODE_TEXT, Settings.NODE_TEXT_DEFAULT)); EditorTopComponent tc = new EditorTopComponent(diagram); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java Sat Jan 28 00:17:24 2012 +0100 @@ -55,6 +55,7 @@ * @param request Search request object that contains information what to search for * @param response Search response object that stores search results. Note that it's important to react to return value of SearchResponse.addResult(...) method and stop computation if false value is returned. */ + @Override public void evaluate(SearchRequest request, SearchResponse response) { String query = request.getText(); if (query.trim().isEmpty()) { @@ -89,6 +90,7 @@ } catch (Exception e) { final String msg = e.getMessage(); response.addResult(new Runnable() { + @Override public void run() { Message desc = new NotifyDescriptor.Message("An exception occurred during the search, " + "perhaps due to a malformed query string:\n" + msg, @@ -103,6 +105,7 @@ if (matches != null) { final Set set = new HashSet<>(matches); response.addResult(new Runnable() { + @Override public void run() { final EditorTopComponent comp = EditorTopComponent.getActive(); if (comp != null) { @@ -117,6 +120,7 @@ // Single matches for (final InputNode n : matches) { response.addResult(new Runnable() { + @Override public void run() { final EditorTopComponent comp = EditorTopComponent.getActive(); if (comp != null) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/CustomizablePanAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -74,6 +74,7 @@ this.modifiersEx = modifiersEx; } + @Override protected boolean isLocked() { return scrollPane != null; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -45,6 +45,7 @@ putValue(Action.SHORT_DESCRIPTION, "Cluster nodes into blocks"); } + @Override public void actionPerformed(ActionEvent ev) { this.state = !state; this.putValue(STATE, state); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -33,6 +33,7 @@ */ public final class ExpandPredecessorsAction extends CallableSystemAction { + @Override public void performAction() { EditorTopComponent editor = EditorTopComponent.getActive(); if (editor != null) { @@ -40,6 +41,7 @@ } } + @Override public String getName() { return "Expand Above"; } @@ -49,6 +51,7 @@ super.initialize(); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -33,6 +33,7 @@ */ public final class ExpandSuccessorsAction extends CallableSystemAction { + @Override public void performAction() { EditorTopComponent editor = EditorTopComponent.getActive(); if (editor != null) { @@ -40,6 +41,7 @@ } } + @Override public String getName() { return "Expand Below"; } @@ -49,6 +51,7 @@ super.initialize(); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -58,19 +58,23 @@ resultChanged(null); } + @Override public void resultChanged(LookupEvent e) { super.setEnabled(result.allInstances().size() > 0); } + @Override public void performAction() { JFileChooser fc = new JFileChooser(); fc.setFileFilter(new FileFilter() { + @Override public boolean accept(File f) { return true; } + @Override public String getDescription() { return "SVG files (*.svg)"; } @@ -97,6 +101,7 @@ } } + @Override public String getName() { return NbBundle.getMessage(ExportAction.class, "CTL_ExportAction"); } @@ -106,6 +111,7 @@ return "com/sun/hotspot/igv/view/images/export.png"; } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ */ public final class ExtractAction extends CallableSystemAction { + @Override public void performAction() { EditorTopComponent editor = EditorTopComponent.getActive(); if (editor != null) { @@ -49,6 +50,7 @@ putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.CTRL_MASK, false)); } + @Override public String getName() { return "Extract action"; } @@ -58,6 +60,7 @@ super.initialize(); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ */ public final class HideAction extends CallableSystemAction { + @Override public void performAction() { EditorTopComponent editor = EditorTopComponent.getActive(); if (editor != null) { @@ -49,6 +50,7 @@ putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_H, Event.CTRL_MASK, false)); } + @Override public String getName() { return "Hide"; } @@ -58,6 +60,7 @@ super.initialize(); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -51,10 +51,12 @@ putValue(Action.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage("com/sun/hotspot/igv/view/images/next_diagram.png"))); } + @Override public String getName() { return NbBundle.getMessage(NextDiagramAction.class, "CTL_NextDiagramAction"); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } @@ -96,10 +98,12 @@ return model.getSecondPosition() != model.getPositions().size() - 1; } + @Override public Action createContextAwareInstance(Lookup arg0) { return new NextDiagramAction(arg0); } + @Override public void changed(DiagramViewModel source) { update(source); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -44,6 +44,7 @@ setState(false); } + @Override public void actionPerformed(ActionEvent ev) { setState(!state); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PanModeAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -53,6 +53,7 @@ return "com/sun/hotspot/igv/view/images/pan_mode.png"; } + @Override public void actionPerformed(ActionEvent e) { } } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -45,6 +45,7 @@ putValue(Action.SHORT_DESCRIPTION, "Show neighboring nodes of fully visible nodes semi-transparent"); } + @Override public void actionPerformed(ActionEvent ev) { this.state = !state; this.putValue(STATE, state); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -51,10 +51,12 @@ putValue(Action.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage("com/sun/hotspot/igv/view/images/prev_diagram.png"))); } + @Override public String getName() { return NbBundle.getMessage(PrevDiagramAction.class, "CTL_PrevDiagramAction"); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } @@ -96,10 +98,12 @@ return model.getFirstPosition() != 0; } + @Override public Action createContextAwareInstance(Lookup arg0) { return new PrevDiagramAction(arg0); } + @Override public void changed(DiagramViewModel source) { update(source); } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/SelectionModeAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -51,6 +51,7 @@ return "com/sun/hotspot/igv/view/images/selection_mode.png"; } + @Override public void actionPerformed(ActionEvent e) { } } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ */ public final class ShowAllAction extends CallableSystemAction { + @Override public void performAction() { EditorTopComponent editor = EditorTopComponent.getActive(); if (editor != null) { @@ -49,6 +50,7 @@ putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK)); } + @Override public String getName() { return "Show all"; } @@ -58,6 +60,7 @@ super.initialize(); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ */ public final class ZoomInAction extends CallableSystemAction { + @Override public void performAction() { EditorTopComponent editor = EditorTopComponent.getActive(); if (editor != null) { @@ -44,6 +45,7 @@ } } + @Override public String getName() { return "Zoom in"; } @@ -53,6 +55,7 @@ putValue(Action.SHORT_DESCRIPTION, "Zoom in"); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java Sat Jan 28 00:17:24 2012 +0100 @@ -37,6 +37,7 @@ */ public final class ZoomOutAction extends CallableSystemAction { + @Override public void performAction() { EditorTopComponent editor = EditorTopComponent.getActive(); if (editor != null) { @@ -50,6 +51,7 @@ putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, Event.CTRL_MASK, false)); } + @Override public String getName() { return "Zoom out"; } @@ -59,6 +61,7 @@ super.initialize(); } + @Override public HelpCtx getHelpCtx() { return HelpCtx.DEFAULT_HELP; } diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java Sat Jan 28 00:17:24 2012 +0100 @@ -228,6 +228,7 @@ return getProperties().get("name"); } + @Override public Properties getProperties() { return figure.getProperties(); } @@ -269,6 +270,7 @@ } } + @Override public JPopupMenu getPopupMenu(Widget widget, Point point) { JPopupMenu menu = diagramScene.createPopupMenu(); menu.addSeparator(); @@ -299,6 +301,7 @@ this.successors = successors; } + @Override public void menuSelected(MenuEvent e) { if (menu.getItemCount() > 0) { // already built before @@ -339,15 +342,18 @@ } } + @Override public void menuDeselected(MenuEvent e) { // ignore } + @Override public void menuCanceled(MenuEvent e) { // ignore } } + @Override public void handleDoubleClick(Widget w, WidgetAction.WidgetMouseEvent e) { if (diagramScene.isAllVisible()) { diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java Sat Jan 28 00:17:24 2012 +0100 @@ -53,6 +53,7 @@ return inputSlot; } + @Override protected int calculateSlotWidth() { List slots = getSlot().getFigure().getInputSlots(); assert slots.contains(getSlot()); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java Sat Jan 28 00:17:24 2012 +0100 @@ -129,14 +129,17 @@ this.getActions().addAction(ActionFactory.createSelectAction(new SelectProvider() { + @Override public boolean isAimingAllowed(Widget arg0, Point arg1, boolean arg2) { return true; } + @Override public boolean isSelectionAllowed(Widget arg0, Point arg1, boolean arg2) { return true; } + @Override public void select(Widget arg0, Point arg1, boolean arg2) { Set
set = new HashSet<>(); for (Connection c : LineWidget.this.connections) { @@ -311,6 +314,7 @@ } } + @Override public JPopupMenu getPopupMenu(Widget widget, Point localLocation) { JPopupMenu menu = new JPopupMenu(); menu.add(scene.createGotoAction(outputSlot.getFigure())); @@ -324,14 +328,17 @@ final LineWidget w = this; menu.addPopupMenuListener(new PopupMenuListener() { + @Override public void popupMenuWillBecomeVisible(PopupMenuEvent e) { w.setRecursivePopupVisible(true); } + @Override public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { w.setRecursivePopupVisible(false); } + @Override public void popupMenuCanceled(PopupMenuEvent e) { } }); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java Sat Jan 28 00:17:24 2012 +0100 @@ -55,6 +55,7 @@ return outputSlot; } + @Override protected int calculateSlotWidth() { List slots = getSlot().getFigure().getOutputSlots(); diff -r f22dc0a63f03 -r c1524c0d538f src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java --- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java Sat Jan 28 00:16:17 2012 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java Sat Jan 28 00:17:24 2012 +0100 @@ -155,6 +155,7 @@ return getFigureWidget().getFigure().getWidth() / count; } + @Override public void handleDoubleClick(Widget w, WidgetAction.WidgetMouseEvent e) { Set hiddenNodes = new HashSet<>(diagramScene.getModel().getHiddenNodes()); if (diagramScene.isAllVisible()) {