Mercurial > hg > graal-jvmci-8
changeset 3614:d7db2a3a9b9c
IdealGraphVisualizer: cosmetic changes (menus, actions, tooltip texts, etc.)
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java Wed Nov 02 18:45:14 2011 +0100 @@ -111,12 +111,13 @@ this.add(toolbar, BorderLayout.NORTH); toolbar.add(ImportAction.get(ImportAction.class)); - toolbar.add(((NodeAction) RemoveAction.get(RemoveAction.class)).createContextAwareInstance(this.getLookup())); - toolbar.add(RemoveAllAction.get(RemoveAllAction.class)); toolbar.add(((NodeAction) SaveAsAction.get(SaveAsAction.class)).createContextAwareInstance(this.getLookup())); toolbar.add(SaveAllAction.get(SaveAllAction.class)); + toolbar.add(((NodeAction) RemoveAction.get(RemoveAction.class)).createContextAwareInstance(this.getLookup())); + toolbar.add(RemoveAllAction.get(RemoveAllAction.class)); + toolbar.add(StructuredViewAction.get(StructuredViewAction.class).getToolbarPresenter()); for (Toolbar tb : ToolbarPool.getDefault().getToolbars()) {
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties Wed Nov 02 18:45:14 2011 +0100 @@ -1,9 +1,10 @@ CTL_ImportAction=Open... CTL_OpenGraphAction=View graph CTL_DiffGraphAction=Difference to current graph -CTL_RemoveAction=Remove selected graph or group +CTL_RemoveAction=Remove selected graphs and groups +CTL_RemoveAllAction=Remove all graphs and groups CTL_OutlineAction=Outline -CTL_SaveAsAction=Save selected graph or group... -CTL_SaveAllAction=Save all... +CTL_SaveAsAction=Save selected groups... +CTL_SaveAllAction=Save all groups... CTL_PropertiesAction=Open Properties Window CTL_NewFilterAction=New filter...
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -150,7 +150,7 @@ } public ImportAction() { - putValue(Action.SHORT_DESCRIPTION, "Open an XML graph document"); + putValue(Action.SHORT_DESCRIPTION, "Open XML graph document..."); putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_MASK)); }
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -46,7 +46,7 @@ } public RemoveAction() { - putValue(Action.SHORT_DESCRIPTION, "Remove"); + putValue(Action.SHORT_DESCRIPTION, "Remove selected graphs and groups"); } public String getName() {
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -41,11 +41,11 @@ public String getName() { - return NbBundle.getMessage(RemoveAllAction.class, "CTL_ImportAction"); + return NbBundle.getMessage(RemoveAllAction.class, "CTL_RemoveAllAction"); } public RemoveAllAction() { - putValue(Action.SHORT_DESCRIPTION, "Remove all methods"); + putValue(Action.SHORT_DESCRIPTION, "Remove all graphs and groups"); putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, InputEvent.CTRL_MASK)); }
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -49,7 +49,7 @@ } public SaveAllAction() { - putValue(Action.SHORT_DESCRIPTION, "Save all methods to XML file"); + putValue(Action.SHORT_DESCRIPTION, "Save all groups to XML file..."); putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK)); }
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -34,6 +34,7 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; +import javax.swing.Action; import javax.swing.JFileChooser; import org.openide.nodes.Node; import org.openide.util.HelpCtx; @@ -47,6 +48,10 @@ */ public final class SaveAsAction extends NodeAction { + public SaveAsAction() { + putValue(Action.SHORT_DESCRIPTION, "Save selected groups to XML file..."); + } + protected void performAction(Node[] activatedNodes) { GraphDocument doc = new GraphDocument();
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/StructuredViewAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/StructuredViewAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -111,7 +111,7 @@ dropDownButton.setIcon(icon); - dropDownButton.setToolTipText("Insert Layer Registration"); + dropDownButton.setToolTipText("Choose group organization"); dropDownButton.addItemListener(new ItemListener() {
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml Wed Nov 02 18:45:14 2011 +0100 @@ -9,6 +9,7 @@ </folder> <folder name="Edit"> <file name="com-sun-hotspot-igv-coordinator-actions-RemoveAction.instance"/> + <file name="com-sun-hotspot-igv-coordinator-actions-RemoveAllAction.instance"/> </folder> <folder name="Window"> <file name="com-sun-hotspot-igv-coordinator-actions-OutlineAction.instance"/> @@ -24,7 +25,7 @@ <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-ImportAction.instance"/> <attr name="position" intvalue="100"/> </file> - <file name="MySeparator2.instance"> + <file name="SeparatorSave.instance"> <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/> <attr name="position" intvalue="150"/> </file> @@ -32,13 +33,21 @@ <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-SaveAsAction.instance"/> <attr name="position" intvalue="200"/> </file> + <file name="com-sun-hotspot-igv-coordinator-actions-SaveAllAction.shadow"> + <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-SaveAllAction.instance"/> + <attr name="position" intvalue="300"/> + </file> + <file name="SeparatorRemove.instance"> + <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/> + <attr name="position" intvalue="350"/> + </file> <file name="com-sun-hotspot-igv-coordinator-actions-RemoveAction.shadow"> <attr name="originalFile" stringvalue="Actions/Edit/com-sun-hotspot-igv-coordinator-actions-RemoveAction.instance"/> - <attr name="position" intvalue="300" /> + <attr name="position" intvalue="400" /> </file> - <file name="com-sun-hotspot-igv-coordinator-actions-SaveAllAction.shadow"> - <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-coordinator-actions-SaveAllAction.instance"/> - <attr name="position" intvalue="400"/> + <file name="com-sun-hotspot-igv-coordinator-actions-RemoveAllAction.shadow"> + <attr name="originalFile" stringvalue="Actions/Edit/com-sun-hotspot-igv-coordinator-actions-RemoveAllAction.instance"/> + <attr name="position" intvalue="500" /> </file> <!-- Hidden menu entries from other modules -->
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -50,7 +50,7 @@ public MoveFilterDownAction() { - putValue(Action.SHORT_DESCRIPTION, "Move filter downwards"); + putValue(Action.SHORT_DESCRIPTION, "Move selected filter downwards"); } public String getName() {
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -49,7 +49,7 @@ } public MoveFilterUpAction() { - putValue(Action.SHORT_DESCRIPTION, "Move filter upwards"); + putValue(Action.SHORT_DESCRIPTION, "Move selected filter upwards"); } public String getName() {
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -68,7 +68,7 @@ } public RemoveFilterAction() { - putValue(Action.SHORT_DESCRIPTION, "Remove filter"); + putValue(Action.SHORT_DESCRIPTION, "Remove selected filter"); } protected Class[] cookieClasses() {
--- a/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -44,7 +44,7 @@ } public RemoveFilterSettingsAction() { - putValue(Action.SHORT_DESCRIPTION, "Remove filter profile"); + putValue(Action.SHORT_DESCRIPTION, "Delete current filter profile"); } @Override
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java Wed Nov 02 18:45:14 2011 +0100 @@ -50,7 +50,7 @@ private final Lookup.Result<ExportCookie> result; public ExportAction() { - putValue(Action.SHORT_DESCRIPTION, "Export current graph as an SVG file"); + putValue(Action.SHORT_DESCRIPTION, "Export current graph as SVG file"); putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK)); lookup = Utilities.actionsGlobalContext(); result = lookup.lookup(new Lookup.Template<ExportCookie>(ExportCookie.class));
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml Wed Nov 02 18:41:30 2011 +0100 +++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml Wed Nov 02 18:45:14 2011 +0100 @@ -52,9 +52,13 @@ </file> </folder> <folder name="File"> + <file name="ExportActionSeparator.instance"> + <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/> + <attr name="position" intvalue="700"/> + </file> <file name="com-sun-hotspot-igv-view-actions-ExportAction.shadow"> <attr name="originalFile" stringvalue="Actions/File/com-sun-hotspot-igv-view-actions-ExportAction.instance"/> - <attr name="position" intvalue="600"/> + <attr name="position" intvalue="710"/> </file> </folder> </folder>