Mercurial > hg > truffle
changeset 2955:bf4f8817e3bd
IdealGraphVisualizer: eliminate compiler warnings by replacing calls to deprecated API methods, introducing generics parameters where missing, and when absolutely necessary adding @SuppressWarnings annotations
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java Wed Jun 15 14:30:40 2011 +0200 @@ -44,7 +44,7 @@ private static Method createDefaultMethod; private static Method getDOMImplementationMethod; private static Method setEmbeddedFontsOnMethod; - private static Class classSVGGraphics2D; + private static Class<?> classSVGGraphics2D; /** * Creates a graphics object that allows to be exported to SVG data using the {@link #printToStream(Graphics2D, Writer, boolean) printToStream} method. @@ -54,8 +54,8 @@ try { if (SVGGraphics2DConstructor == null) { ClassLoader cl = BatikSVG.class.getClassLoader(); - Class classGenericDOMImplementation = cl.loadClass("org.apache.batik.dom.GenericDOMImplementation"); - Class classSVGGeneratorContext = cl.loadClass("org.apache.batik.svggen.SVGGeneratorContext"); + Class<?> classGenericDOMImplementation = cl.loadClass("org.apache.batik.dom.GenericDOMImplementation"); + Class<?> classSVGGeneratorContext = cl.loadClass("org.apache.batik.svggen.SVGGeneratorContext"); classSVGGraphics2D = cl.loadClass("org.apache.batik.svggen.SVGGraphics2D"); getDOMImplementationMethod = classGenericDOMImplementation.getDeclaredMethod("getDOMImplementation", new Class[0]); createDefaultMethod = classSVGGeneratorContext.getDeclaredMethod("createDefault", new Class[]{org.w3c.dom.Document.class});
--- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java Wed Jun 15 14:30:40 2011 +0200 @@ -29,7 +29,6 @@ import com.sun.hotspot.igv.data.Properties; import com.sun.hotspot.igv.data.Properties.StringPropertyMatcher; import java.awt.Image; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -37,7 +36,7 @@ import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Node; -import org.openide.util.Utilities; +import org.openide.util.ImageUtilities; /** * @@ -70,9 +69,9 @@ @Override public Image getIcon(int i) { if (nodes != null) { - return Utilities.loadImage("com/sun/hotspot/igv/bytecodes/images/link.gif"); + return ImageUtilities.loadImage("com/sun/hotspot/igv/bytecodes/images/link.gif"); } else { - return Utilities.loadImage("com/sun/hotspot/igv/bytecodes/images/bytecode.gif"); + return ImageUtilities.loadImage("com/sun/hotspot/igv/bytecodes/images/bytecode.gif"); } } @@ -92,6 +91,7 @@ } @Override + @SuppressWarnings("unchecked") public <T extends Node.Cookie> T getCookie(Class<T> aClass) { if (aClass == SelectBytecodesCookie.class && nodes != null) { return (T) (new SelectBytecodesCookie(nodes));
--- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java Wed Jun 15 14:30:40 2011 +0200 @@ -128,7 +128,7 @@ @Override public void componentOpened() { - Lookup.Template tpl = new Lookup.Template(InputGraphProvider.class); + Lookup.Template<InputGraphProvider> tpl = new Lookup.Template<InputGraphProvider>(InputGraphProvider.class); result = Utilities.actionsGlobalContext().lookup(tpl); result.addLookupListener(this); }
--- a/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java Wed Jun 15 14:30:40 2011 +0200 @@ -30,7 +30,7 @@ import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Node; -import org.openide.util.Utilities; +import org.openide.util.ImageUtilities; /** * @@ -38,7 +38,7 @@ */ public class MethodNode extends AbstractNode { - private static class MethodNodeChildren extends Children.Keys { + private static class MethodNodeChildren extends Children.Keys<InputBytecode> { private InputMethod method; private InputGraph graph; @@ -50,9 +50,7 @@ this.graph = graph; } - protected Node[] createNodes(Object object) { - assert object instanceof InputBytecode; - InputBytecode bc = (InputBytecode) object; + protected Node[] createNodes(InputBytecode bc) { if (bc.getInlined() == null) { return new Node[]{new BytecodeNode(bc, graph, bciString)}; } else { @@ -84,7 +82,7 @@ @Override public Image getIcon(int i) { - return Utilities.loadImage("com/sun/hotspot/igv/bytecodes/images/method.gif"); + return ImageUtilities.loadImage("com/sun/hotspot/igv/bytecodes/images/method.gif"); } @Override
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowScene.java Wed Jun 15 14:30:40 2011 +0200 @@ -24,7 +24,6 @@ package com.sun.hotspot.igv.controlflow; import com.sun.hotspot.igv.data.InputBlock; -import com.sun.hotspot.igv.controlflow.InputBlockEdge; import com.sun.hotspot.igv.data.InputGraph; import com.sun.hotspot.igv.data.services.InputGraphProvider; import com.sun.hotspot.igv.data.InputNode; @@ -44,15 +43,14 @@ import org.netbeans.api.visual.action.WidgetAction; import org.netbeans.api.visual.anchor.AnchorFactory; import org.netbeans.api.visual.anchor.AnchorShape; -import org.netbeans.api.visual.layout.LayoutFactory; import org.netbeans.api.visual.router.RouterFactory; import org.netbeans.api.visual.widget.LayerWidget; import org.netbeans.api.visual.widget.Widget; import org.netbeans.api.visual.graph.GraphScene; import org.netbeans.api.visual.graph.layout.GraphLayout; +import org.netbeans.api.visual.layout.LayoutFactory; import org.netbeans.api.visual.layout.SceneLayout; import org.netbeans.api.visual.widget.ConnectionWidget; -import org.openide.util.Utilities; /** * @@ -121,7 +119,7 @@ } } - GraphLayout layout = new HierarchicalGraphLayout();//GridGraphLayout(); + GraphLayout<InputBlock, InputBlockEdge> layout = new HierarchicalGraphLayout<InputBlock, InputBlockEdge>();//GridGraphLayout(); SceneLayout sceneLayout = LayoutFactory.createSceneGraphLayout(this, layout); sceneLayout.invokeLayout();
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java Wed Jun 15 14:30:40 2011 +0200 @@ -123,7 +123,7 @@ @Override public void componentOpened() { - Lookup.Template tpl = new Lookup.Template(InputGraphProvider.class); + Lookup.Template<InputGraphProvider> tpl = new Lookup.Template<InputGraphProvider>(InputGraphProvider.class); result = Utilities.actionsGlobalContext().lookup(tpl); result.addLookupListener(this); }
--- a/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java Wed Jun 15 14:30:40 2011 +0200 @@ -34,7 +34,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -128,6 +127,7 @@ } public int compareTo(Vertex o) { + @SuppressWarnings("unchecked") VertexWrapper vw = (VertexWrapper) o; return node.toString().compareTo(vw.node.toString()); }
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java Wed Jun 15 14:30:40 2011 +0200 @@ -36,7 +36,7 @@ import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Node; -import org.openide.util.Utilities; +import org.openide.util.ImageUtilities; import org.openide.util.lookup.AbstractLookup; import org.openide.util.lookup.InstanceContent; @@ -52,7 +52,7 @@ private List<String> subFolders; private FolderChildren children; - private static class FolderChildren extends Children.Keys implements ChangedListener<Group> { + private static class FolderChildren extends Children.Keys<Pair<String, List<Group>>> implements ChangedListener<Group> { private FolderNode parent; private List<Group> registeredGroups; @@ -68,14 +68,13 @@ } @Override - protected Node[] createNodes(Object arg0) { + protected Node[] createNodes(Pair<String, List<Group>> p) { for(Group g : registeredGroups) { g.getChangedEvent().removeListener(this); } registeredGroups.clear(); - Pair<String, List<Group>> p = (Pair<String, List<Group>>) arg0; if (p.getLeft().length() == 0) { List<Node> curNodes = new ArrayList<Node>(); @@ -116,7 +115,7 @@ @Override public Image getIcon(int i) { - return Utilities.loadImage("com/sun/hotspot/igv/coordinator/images/folder.gif"); + return ImageUtilities.loadImage("com/sun/hotspot/igv/coordinator/images/folder.gif"); } protected FolderNode(GraphDocument document, String name, GroupOrganizer organizer, List<String> subFolders, List<Group> groups) {
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java Wed Jun 15 14:30:40 2011 +0200 @@ -37,8 +37,8 @@ import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.nodes.Sheet; +import org.openide.util.ImageUtilities; import org.openide.util.Lookup; -import org.openide.util.Utilities; import org.openide.util.lookup.AbstractLookup; import org.openide.util.lookup.InstanceContent; @@ -98,7 +98,7 @@ @Override public Image getIcon(int i) { - return Utilities.loadImage("com/sun/hotspot/igv/coordinator/images/graph.gif"); + return ImageUtilities.loadImage("com/sun/hotspot/igv/coordinator/images/graph.gif"); } @Override
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/StructuredViewAction.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/StructuredViewAction.java Wed Jun 15 14:30:40 2011 +0200 @@ -51,8 +51,8 @@ import javax.swing.event.PopupMenuListener; import org.openide.awt.DropDownButtonFactory; import org.openide.util.HelpCtx; +import org.openide.util.ImageUtilities; import org.openide.util.Lookup; -import org.openide.util.Utilities; import org.openide.util.actions.CallableSystemAction; public class StructuredViewAction extends CallableSystemAction { @@ -71,7 +71,7 @@ @Override public Component getToolbarPresenter() { - Image iconImage = Utilities.loadImage("com/sun/hotspot/igv/coordinator/images/structure.gif"); + Image iconImage = ImageUtilities.loadImage("com/sun/hotspot/igv/coordinator/images/structure.gif"); ImageIcon icon = new ImageIcon(iconImage); popup = new JPopupMenu();
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java Wed Jun 15 14:30:40 2011 +0200 @@ -32,7 +32,6 @@ import com.sun.hotspot.igv.data.InputNode; import com.sun.hotspot.igv.data.Pair; import com.sun.hotspot.igv.data.Properties; -import com.sun.hotspot.igv.data.Property; import com.sun.hotspot.igv.data.services.GroupCallback; import com.sun.hotspot.igv.data.serialization.XMLParser.ElementHandler; import com.sun.hotspot.igv.data.serialization.XMLParser.HandoverElementHandler; @@ -92,7 +91,7 @@ public static final String SUCCESSOR_ELEMENT = "successor"; public static final String ASSEMBLY_ELEMENT = "assembly"; public static final String DIFFERENCE_PROPERTY = "difference"; - private TopElementHandler xmlDocument = new TopElementHandler(); + private TopElementHandler<GraphDocument> xmlDocument = new TopElementHandler<GraphDocument>(); private boolean difference; private GroupCallback groupCallback; private HashMap<String, Integer> idCache = new HashMap<String, Integer>();
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java Wed Jun 15 14:30:40 2011 +0200 @@ -23,7 +23,6 @@ */ package com.sun.hotspot.igv.data.serialization; -import com.sun.hotspot.igv.data.Property; import com.sun.hotspot.igv.data.Properties; import java.util.HashMap; import java.util.Stack; @@ -209,9 +208,10 @@ public void endPrefixMapping(String prefix) throws SAXException { } + @SuppressWarnings("unchecked") public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException { + assert !stack.isEmpty(); - assert !stack.isEmpty(); ElementHandler parent = stack.peek(); if (parent != null) { ElementHandler child = parent.getChild(qName);
--- a/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Data/test/unit/src/com/sun/hotspot/igv/data/ChangedEventTest.java Wed Jun 15 14:30:40 2011 +0200 @@ -62,7 +62,7 @@ @Test public void testBase() { - ChangedEvent<Integer> e = new ChangedEvent(5); + ChangedEvent<Integer> e = new ChangedEvent<Integer>(5); final int[] fireCount = new int[1]; e.addListener(new ChangedListener<Integer>() {
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java Wed Jun 15 14:30:40 2011 +0200 @@ -38,6 +38,7 @@ import org.openide.filesystems.Repository; import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; import org.openide.util.Exceptions; import org.openide.util.Lookup; @@ -126,8 +127,7 @@ InputStream is = null; StringBuilder sb = new StringBuilder("importPackage(Packages.com.sun.hotspot.igv.filter);importPackage(Packages.com.sun.hotspot.igv.graph);importPackage(Packages.com.sun.hotspot.igv.data);importPackage(Packages.com.sun.hotspot.igv.util);importPackage(java.awt);"); try { - FileSystem fs = Repository.getDefault().getDefaultFileSystem(); - FileObject fo = fs.getRoot().getFileObject(JAVASCRIPT_HELPER_ID); + FileObject fo = FileUtil.getConfigRoot().getFileObject(JAVASCRIPT_HELPER_ID); is = fo.getInputStream(); BufferedReader r = new BufferedReader(new InputStreamReader(is)); String s;
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java Wed Jun 15 14:30:40 2011 +0200 @@ -82,6 +82,7 @@ import org.openide.filesystems.Repository; import org.openide.filesystems.FileSystem; import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; /** * @@ -267,20 +268,18 @@ } } - private class FilterChildren extends Children.Keys implements ChangedListener<CheckNode> { + private class FilterChildren extends Children.Keys<Filter> implements ChangedListener<CheckNode> { - private HashMap<Object, Node> nodeHash = new HashMap<Object, Node>(); + private HashMap<Filter, Node> nodeHash = new HashMap<Filter, Node>(); - protected Node[] createNodes(Object object) { - if (nodeHash.containsKey(object)) { - return new Node[]{nodeHash.get(object)}; + protected Node[] createNodes(Filter filter) { + if (nodeHash.containsKey(filter)) { + return new Node[]{nodeHash.get(filter)}; } - assert object instanceof Filter; - Filter filter = (Filter) object; FilterNode node = new FilterNode(filter); node.getSelectionChangedEvent().addListener(this); - nodeHash.put(object, node); + nodeHash.put(filter, node); return new Node[]{node}; } @@ -295,6 +294,7 @@ setBefore(false); } + @Override protected void addNotify() { setKeys(sequence.getFilters()); updateSelection(); @@ -420,9 +420,7 @@ } public void initFilters() { - - FileSystem fs = Repository.getDefault().getDefaultFileSystem(); - FileObject folder = fs.getRoot().getFileObject(FOLDER_ID); + FileObject folder = FileUtil.getConfigRoot().getFileObject(FOLDER_ID); FileObject[] children = folder.getChildren(); List<CustomFilter> customFilters = new ArrayList<CustomFilter>(); @@ -585,10 +583,10 @@ } private FileObject getFileObject(CustomFilter cf) { - FileObject fo = Repository.getDefault().getDefaultFileSystem().getRoot().getFileObject(FOLDER_ID + "/" + cf.getName()); + FileObject fo = FileUtil.getConfigRoot().getFileObject(FOLDER_ID + "/" + cf.getName()); if (fo == null) { try { - fo = org.openide.filesystems.Repository.getDefault().getDefaultFileSystem().getRoot().getFileObject(FOLDER_ID).createData(cf.getName()); + fo = FileUtil.getConfigRoot().getFileObject(FOLDER_ID).createData(cf.getName()); } catch (IOException ex) { Exceptions.printStackTrace(ex); }
--- a/src/share/tools/IdealGraphVisualizer/GraphTextEditor/src/com/sun/hotspot/igv/graphtexteditor/TextTopComponent.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/GraphTextEditor/src/com/sun/hotspot/igv/graphtexteditor/TextTopComponent.java Wed Jun 15 14:30:40 2011 +0200 @@ -260,7 +260,7 @@ DiagramProvider p = LookupHistory.getLast(DiagramProvider.class); updateDiagramProvider(p); - Lookup.Template tpl = new Lookup.Template(DiagramProvider.class); + Lookup.Template<DiagramProvider> tpl = new Lookup.Template<DiagramProvider>(DiagramProvider.class); result = Utilities.actionsGlobalContext().lookup(tpl); result.addLookupListener(this); }
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java Wed Jun 15 14:30:40 2011 +0200 @@ -565,12 +565,16 @@ n.x = space[n.layer].get(n.pos); } } - - protected void run() { - + + @SuppressWarnings("unchecked") + private void createArrays() { space = new ArrayList[layers.length]; downProcessingOrder = new ArrayList[layers.length]; upProcessingOrder = new ArrayList[layers.length]; + } + + protected void run() { + createArrays(); for (int i = 0; i < layers.length; i++) { space[i] = new ArrayList<Integer>(); @@ -1106,14 +1110,18 @@ assert n.layer < layerCount; } } - - protected void run() { - + + @SuppressWarnings("unchecked") + private void createLayers() { layers = new List[layerCount]; for (int i = 0; i < layerCount; i++) { layers[i] = new ArrayList<LayoutNode>(); } + } + + protected void run() { + createLayers(); // Generate initial ordering HashSet<LayoutNode> visited = new HashSet<LayoutNode>();
--- a/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/OldHierarchicalLayoutManager.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/OldHierarchicalLayoutManager.java Wed Jun 15 14:30:40 2011 +0200 @@ -499,7 +499,8 @@ //} - ArrayList<Node<NodeData, EdgeData>> layers[] = new ArrayList[maxLayer + 1]; + @SuppressWarnings("unchecked") + ArrayList<Node<NodeData, EdgeData>> layers[] = (ArrayList<Node<NodeData, EdgeData>>[]) new ArrayList[maxLayer + 1]; int layerSizes[] = new int[maxLayer + 1]; for (int i = 0; i < maxLayer + 1; i++) { layers[i] = new ArrayList<Node<NodeData, EdgeData>>(); @@ -1113,7 +1114,7 @@ int removedCount = 0; int reversedCount = 0; - Graph.DFSTraversalVisitor visitor = graph.new DFSTraversalVisitor() { + Graph<NodeData, EdgeData>.DFSTraversalVisitor visitor = graph.new DFSTraversalVisitor() { @Override public boolean visitEdge(Edge<NodeData, EdgeData> e, boolean backEdge) { @@ -1159,7 +1160,7 @@ n.getData().setLayer(-1); } - Graph.BFSTraversalVisitor traverser = graph.new BFSTraversalVisitor() { + Graph<NodeData, EdgeData>.BFSTraversalVisitor traverser = graph.new BFSTraversalVisitor() { @Override public void visitNode(Node<NodeData, EdgeData> n, int depth) {
--- a/src/share/tools/IdealGraphVisualizer/Java6ScriptingProxy/src/com/sun/hotspot/igv/java6scriptingproxy/JavaSE6ScriptEngine.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Java6ScriptingProxy/src/com/sun/hotspot/igv/java6scriptingproxy/JavaSE6ScriptEngine.java Wed Jun 15 14:30:40 2011 +0200 @@ -43,13 +43,12 @@ public boolean initialize(String jsHelperText) { try { - ClassLoader cl = JavaSE6ScriptEngine.class.getClassLoader(); - Class managerClass = cl.loadClass("javax.script.ScriptEngineManager"); - Class engineClass = cl.loadClass("javax.script.ScriptEngine"); - Class bindingsClass = cl.loadClass("javax.script.Bindings"); - Class contextClass = cl.loadClass("javax.script.ScriptContext"); - + Class<?> managerClass = cl.loadClass("javax.script.ScriptEngineManager"); + Class<?> engineClass = cl.loadClass("javax.script.ScriptEngine"); + Class<?> bindingsClass = cl.loadClass("javax.script.Bindings"); + Class<?> contextClass = cl.loadClass("javax.script.ScriptContext"); + Object manager = managerClass.newInstance(); Method getEngineByName = managerClass.getMethod("getEngineByName", String.class); engine = getEngineByName.invoke(manager, "ECMAScript"); @@ -63,7 +62,7 @@ bindings = getBindings.invoke(context, f.getInt(null)); Bindings_put = bindingsClass.getMethod("put", String.class, Object.class); Bindings_put.invoke(bindings, "IO", System.out); - + /* * Non-reflective code: ScriptEngineManager sem = new ScriptEngineManager();
--- a/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/RhinoScriptEngine.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/RhinoScriptEngine.java Wed Jun 15 14:30:40 2011 +0200 @@ -27,7 +27,6 @@ import com.sun.hotspot.igv.filter.ScriptEngineAbstraction; import com.sun.hotspot.igv.graph.Diagram; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; /** @@ -45,11 +44,11 @@ public boolean initialize(String s) { this.jsHelperText = s; - Class importerTopLevel = null; + Class<?> importerTopLevel = null; try { ClassLoader cl = RhinoScriptEngine.class.getClassLoader(); - Class context = cl.loadClass("org.mozilla.javascript.Context"); - Class scriptable = cl.loadClass("org.mozilla.javascript.Scriptable"); + Class<?> context = cl.loadClass("org.mozilla.javascript.Context"); + Class<?> scriptable = cl.loadClass("org.mozilla.javascript.Scriptable"); importerTopLevel = cl.loadClass("org.mozilla.javascript.ImporterTopLevel"); importer = importerTopLevel.getDeclaredConstructor(context); scope_put = importerTopLevel.getMethod("put", String.class, scriptable, Object.class);
--- a/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerGraphToTextConverter.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerGraphToTextConverter.java Wed Jun 15 14:30:40 2011 +0200 @@ -149,7 +149,7 @@ private static final PropertyMatcher MATCHER = new Properties.RegexpPropertyMatcher("name", "Root"); public boolean canConvert(InputGraph graph) { - return new PropertySelector(graph.getNodes()).selectSingle(MATCHER) != null; + return new PropertySelector<InputNode>(graph.getNodes()).selectSingle(MATCHER) != null; } private Color calcColor(InputNode node) {
--- a/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java Wed Jun 15 14:30:40 2011 +0200 @@ -27,8 +27,8 @@ import javax.swing.ImageIcon; import org.netbeans.spi.options.OptionsCategory; import org.netbeans.spi.options.OptionsPanelController; +import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; -import org.openide.util.Utilities; /** * @@ -38,7 +38,7 @@ @Override public Icon getIcon() { - return new ImageIcon(Utilities.loadImage("com/sun/hotspot/igv/settings/settings.gif")); + return new ImageIcon(ImageUtilities.loadImage("com/sun/hotspot/igv/settings/settings.gif")); } public String getCategoryName() {
--- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/LookupHistory.java Wed Jun 15 14:30:40 2011 +0200 @@ -21,10 +21,9 @@ * questions. * */ - package com.sun.hotspot.igv.util; -import java.util.Hashtable; +import java.util.HashMap; import java.util.Map; import org.openide.util.Lookup.Result; import org.openide.util.LookupEvent; @@ -37,13 +36,12 @@ */ public class LookupHistory { - private static Map<Class, LookupHistoryImpl> cache = new Hashtable<Class, LookupHistoryImpl>(); + private static Map<Class, LookupHistoryImpl> cache = new HashMap<Class, LookupHistoryImpl>(); private static class LookupHistoryImpl<T> implements LookupListener { private Class<T> klass; private Result<T> result; - private T last; public LookupHistoryImpl(Class<T> klass) { @@ -65,20 +63,16 @@ } } - - public static void init(Class klass) { - + public static <T> void init(Class<T> klass) { if (!cache.containsKey(klass)) { - cache.put(klass, new LookupHistoryImpl(klass)); + cache.put(klass, new LookupHistoryImpl<T>(klass)); } } + @SuppressWarnings("unchecked") public static <T> T getLast(Class<T> klass) { - init(klass); - assert cache.containsKey(klass); - return (T) cache.get(klass).getLast(); } }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java Wed Jun 15 14:30:40 2011 +0200 @@ -106,7 +106,6 @@ tmpSet.add(n); comp.setSelectedNodes(tmpSet); comp.requestActive(); - comp.requestFocus(); } } }, n.getProperties().get(name) + " (" + n.getId() + " " + n.getProperties().get("name") + ")");
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java Wed Jun 15 14:30:40 2011 +0200 @@ -27,6 +27,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; +import org.openide.util.ImageUtilities; /** * @@ -39,7 +40,7 @@ public EnableBlockLayoutAction() { state = true; - putValue(AbstractAction.SMALL_ICON, new ImageIcon(org.openide.util.Utilities.loadImage(iconResource()))); + putValue(AbstractAction.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage(iconResource()))); putValue(STATE, true); putValue(Action.SHORT_DESCRIPTION, "Cluster nodes into blocks"); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java Wed Jun 15 14:30:40 2011 +0200 @@ -29,6 +29,7 @@ import javax.swing.Action; import javax.swing.ImageIcon; import org.openide.util.HelpCtx; +import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.Utilities; @@ -47,7 +48,7 @@ public NextDiagramAction(Lookup lookup) { putValue(Action.SHORT_DESCRIPTION, "Show next graph of current group"); - putValue(Action.SMALL_ICON, new ImageIcon(Utilities.loadImage("com/sun/hotspot/igv/view/images/next_diagram.png"))); + putValue(Action.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage("com/sun/hotspot/igv/view/images/next_diagram.png"))); } public String getName() {
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java Wed Jun 15 14:30:40 2011 +0200 @@ -27,6 +27,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; +import org.openide.util.ImageUtilities; /** * @@ -38,7 +39,7 @@ public static final String STATE = "state"; public OverviewAction() { - putValue(AbstractAction.SMALL_ICON, new ImageIcon(org.openide.util.Utilities.loadImage(iconResource()))); + putValue(AbstractAction.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage(iconResource()))); putValue(Action.SHORT_DESCRIPTION, "Show satellite view of whole graph"); setState(false); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java Wed Jun 15 14:30:40 2011 +0200 @@ -27,6 +27,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; +import org.openide.util.ImageUtilities; /** * @@ -39,7 +40,7 @@ public PredSuccAction() { state = true; - putValue(AbstractAction.SMALL_ICON, new ImageIcon(org.openide.util.Utilities.loadImage(iconResource()))); + putValue(AbstractAction.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage(iconResource()))); putValue(STATE, true); putValue(Action.SHORT_DESCRIPTION, "Show neighboring nodes of fully visible nodes semi-transparent"); }
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java Wed Jun 15 14:30:40 2011 +0200 @@ -29,6 +29,7 @@ import javax.swing.Action; import javax.swing.ImageIcon; import org.openide.util.HelpCtx; +import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.Utilities; @@ -47,7 +48,7 @@ public PrevDiagramAction(Lookup lookup) { putValue(Action.SHORT_DESCRIPTION, "Show previous graph of current group"); - putValue(Action.SMALL_ICON, new ImageIcon(Utilities.loadImage("com/sun/hotspot/igv/view/images/prev_diagram.png"))); + putValue(Action.SMALL_ICON, new ImageIcon(ImageUtilities.loadImage("com/sun/hotspot/igv/view/images/prev_diagram.png"))); } public String getName() {
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java Wed Jun 15 13:20:09 2011 +0200 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java Wed Jun 15 14:30:40 2011 +0200 @@ -152,9 +152,9 @@ protected abstract int calculateSlotWidth(); protected int calculateWidth(int count) { - return (int)getFigureWidget().getFigure().getWidth() / count; + return getFigureWidget().getFigure().getWidth() / count; } - + public void handleDoubleClick(Widget w, WidgetAction.WidgetMouseEvent e) { Set<Integer> hiddenNodes = new HashSet<Integer>(diagramScene.getModel().getHiddenNodes()); if (diagramScene.isAllVisible()) {