Mercurial > hg > truffle

changeset 3673:3b09031817ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
IdealGraphVisualizer: move QuickSearch combobar from the menu bar to the graph viewer's toolbar so it won't be omitted on Mac OS X
author Peter Hofer <peter.hofer@jku.at>
date Mon, 21 Nov 2011 11:01:37 +0100
parents 5e331d5f760e
children d3d3dd0a3421
files src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml
diffstat 7 files changed, 21 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml	Fri Nov 18 17:01:32 2011 +0100
+++ b/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml	Mon Nov 21 11:01:37 2011 +0100
@@ -48,14 +48,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.spi.quicksearch</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.openide.actions</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties	Fri Nov 18 17:01:32 2011 +0100
+++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties	Mon Nov 21 11:01:37 2011 +0100
@@ -1,9 +1,6 @@
-
 AdvancedOption_DisplayName_Coordinator=Settings
 AdvancedOption_Tooltip_Coordinator=Visualization Tool Settings
 CTL_OutlineTopComponent=Outline
 CTL_SomeAction=test
 HINT_OutlineTopComponent=Displays loaded groups of graphs.
-OpenIDE-Module-Name=Coordinator
-Toolbars/QuickSearch=Quick Search
-QuickSearch/Nodes/com-sun-hotspot-igv-coordinator-QuickSearch.instance=Nodes
+OpenIDE-Module-Name=Coordinator
\ No newline at end of file
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml	Fri Nov 18 17:01:32 2011 +0100
+++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml	Mon Nov 21 11:01:37 2011 +0100
@@ -155,17 +155,7 @@
             <file name="org-netbeans-modules-tasklist-ui-TaskListAction.shadow_hidden"/>
             <file name="CloneDocumentAction.shadow_hidden"/>
         </folder>
-        
-        <file name="Spacer.instance">
-            <attr name="instanceCreate" methodvalue="javax.swing.Box.createHorizontalGlue"/>
-            <attr name="position" intvalue="9980"/>
-        </file>
-        <file name="org-netbeans-modules-quicksearch-QuickSearchAction.shadow">
-            <attr name="displayName" bundlevalue="com.sun.hotspot.igv.coordinator.Bundle#Toolbars/QuickSearch"/>
-            <attr name="originalFile" stringvalue="Actions/Edit/org-netbeans-modules-quicksearch-QuickSearchAction.instance"/>
-            <attr name="position" intvalue="9990"/>
-        </file>
-        
+
         <folder name="Help">
             <!-- Hidden menu entries from other modules -->
             <file name="Separator1.instance_hidden"/>
@@ -176,7 +166,7 @@
             <file name="shortcuts.xml_hidden"/>
         </folder>
     </folder>
-        
+
     <folder name="OptionsDialog">
         <!-- Hidden option tabs from other modules -->
         <file name="Editor.instance_hidden"/>
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties	Fri Nov 18 17:01:32 2011 +0100
+++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties	Mon Nov 21 11:01:37 2011 +0100
@@ -1,4 +1,3 @@
 HINT_EditorTopComponent=Visualizes a graph.
 OpenIDE-Module-Name=View
-CTL_EditorTopComponent=Graph
-QuickSearch/Nodes/com-sun-hotspot-igv-view-NodeQuickSearch.instance=Nodes
+CTL_EditorTopComponent=Graph
\ No newline at end of file
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java	Fri Nov 18 17:01:32 2011 +0100
+++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java	Mon Nov 21 11:01:37 2011 +0100
@@ -54,6 +54,7 @@
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Graphics2D;
 import java.awt.event.HierarchyBoundsListener;
 import java.awt.event.HierarchyEvent;
@@ -74,6 +75,7 @@
 import java.util.List;
 import java.util.Set;
 import javax.swing.Action;
+import javax.swing.Box;
 import javax.swing.ButtonGroup;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -96,6 +98,8 @@
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
 import org.openide.NotifyDescriptor;
+import org.openide.util.Utilities;
+import org.openide.util.actions.Presenter;
 
 /**
  * 
@@ -235,7 +239,6 @@
         rangeSliderModel.getDiagramChangedEvent().addListener(diagramChangedListener);
         rangeSliderModel.selectGraph(diagram.getGraph());
 
-
         toolBar.add(NextDiagramAction.get(NextDiagramAction.class));
         toolBar.add(PrevDiagramAction.get(PrevDiagramAction.class));
         toolBar.addSeparator();
@@ -284,6 +287,11 @@
         interactionButtons.add(button);
         toolBar.add(button);
         selectionModeAction.addPropertyChangeListener(this);
+        
+        toolBar.add(Box.createHorizontalGlue());
+        Action action = Utilities.actionsForPath("QuickSearchShadow").get(0);
+        Component quicksearch = ((Presenter.Toolbar) action).getToolbarPresenter();
+        toolBar.add(quicksearch, BorderLayout.CENTER);
 
         centerPanel = new JPanel();
         this.add(centerPanel, BorderLayout.CENTER);
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java	Fri Nov 18 17:01:32 2011 +0100
+++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/NodeQuickSearch.java	Mon Nov 21 11:01:37 2011 +0100
@@ -23,11 +23,9 @@
  */
 package com.sun.hotspot.igv.view;
 
-import com.sun.hotspot.igv.data.InputGraph;
 import com.sun.hotspot.igv.data.InputNode;
 import com.sun.hotspot.igv.data.Properties;
 import com.sun.hotspot.igv.data.Properties.RegexpPropertyMatcher;
-import com.sun.hotspot.igv.data.Property;
 import com.sun.hotspot.igv.data.services.InputGraphProvider;
 import com.sun.hotspot.igv.util.LookupHistory;
 import java.util.HashSet;
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml	Fri Nov 18 17:01:32 2011 +0100
+++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml	Mon Nov 21 11:01:37 2011 +0100
@@ -63,14 +63,18 @@
         </folder>
     </folder>
 
-    
     <folder name="QuickSearch">
         <folder name="Nodes">
             <attr name="command" stringvalue="n"/>
             <attr name="position" intvalue="0"/>
-            <file name="com-sun-hotspot-igv-view-NodeQuickSearch.instance">
-                <attr name="SystemFileSystem.localizingBundle" stringvalue="com.sun.hotspot.igv.view.Bundle"/>
-            </file>
+            <file name="com-sun-hotspot-igv-view-NodeQuickSearch.instance" />
         </folder>
     </folder>
+    
+    <folder name="QuickSearchShadow">
+        <file name="org-netbeans-modules-quicksearch-QuickSearchAction.shadow">
+            <attr name="originalFile" stringvalue="Actions/Edit/org-netbeans-modules-quicksearch-QuickSearchAction.instance"/>
+            
+        </file>    
+    </folder>
 </filesystem>