UI tweaks for Aqua LaF

jisedlac · jisedlac · commit 80be5041bdfa · 2017-12-11T13:51:38.000+01:00
diff --git a/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaObjectsView.java b/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaObjectsView.java
@@ -270,16 +270,30 @@ protected void fireItemStateChanged(ItemEvent e) {
             }
         }
         
-        tbType = new AggregationButton(Aggregation.TYPES);
+        tbType = new AggregationButton(Aggregation.TYPES) {
+            public void setVisible(boolean b) {
+                super.setVisible(b);
+                if (tbPackages != null) tbPackages.putClientProperty("JButton.segmentPosition", // NOI18N
+                                        b ? "middle" : "first"); // NOI18N
+            }
+        };
+        tbType.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+        tbType.putClientProperty("JButton.segmentPosition", "first"); // NOI18N
         toolbar.add(tbType);
         
         tbPackages = new AggregationButton(Aggregation.PACKAGES);
+        tbPackages.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+        tbPackages.putClientProperty("JButton.segmentPosition", "first"); // NOI18N
         toolbar.add(tbPackages);
         
         tbClasses = new AggregationButton(Aggregation.CLASSES);
+        tbClasses.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+        tbClasses.putClientProperty("JButton.segmentPosition", "middle"); // NOI18N
         toolbar.add(tbClasses);
         
         tbInstances = new AggregationButton(Aggregation.INSTANCES);
+        tbInstances.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+        tbInstances.putClientProperty("JButton.segmentPosition", "last"); // NOI18N
         toolbar.add(tbInstances);
         
         tbClasses.setSelected(true);
diff --git a/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaThreadsView.java b/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaThreadsView.java
@@ -154,9 +154,12 @@ protected void fireItemStateChanged(ItemEvent e) {
                 }
             }
         };
+        rObjects.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+        rObjects.putClientProperty("JButton.segmentPosition", "first"); // NOI18N
         rObjects.setToolTipText("Objects");
         resultsBG.add(rObjects);
         toolbar.add(rObjects);
+        
         rHTML = new JToggleButton(Icons.getIcon(HeapWalkerIcons.PROPERTIES)) {
             protected void fireItemStateChanged(ItemEvent e) {
                 if (e.getStateChange() == ItemEvent.SELECTED) {
@@ -165,6 +168,8 @@ protected void fireItemStateChanged(ItemEvent e) {
                 }
             }
         };
+        rHTML.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+        rHTML.putClientProperty("JButton.segmentPosition", "last"); // NOI18N
         rHTML.setToolTipText("HTML");
         resultsBG.add(rHTML);
         toolbar.add(rHTML);
diff --git a/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaWindowsView.java b/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/java/impl/JavaWindowsView.java
@@ -150,6 +150,8 @@ private void init() {
         toolbar.add(new JToggleButton("150px") {
             {
                 sizes.add(this);
+                putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+                putClientProperty("JButton.segmentPosition", "first"); // NOI18N
                 setToolTipText("Window preview height: 150px");
             }
             protected void fireItemStateChanged(ItemEvent event) {
@@ -163,6 +165,8 @@ protected void fireItemStateChanged(ItemEvent event) {
         toolbar.add(new JToggleButton("300px") {
             {
                 sizes.add(this);
+                putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+                putClientProperty("JButton.segmentPosition", "middle"); // NOI18N
                 setToolTipText("Window preview height: 300px");
             }
             protected void fireItemStateChanged(ItemEvent event) {
@@ -176,6 +180,8 @@ protected void fireItemStateChanged(ItemEvent event) {
         toolbar.add(new JToggleButton("600px") {
             {
                 sizes.add(this);
+                putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+                putClientProperty("JButton.segmentPosition", "middle"); // NOI18N
                 setToolTipText("Window preview height: 600px");
             }
             protected void fireItemStateChanged(ItemEvent event) {
@@ -189,6 +195,8 @@ protected void fireItemStateChanged(ItemEvent event) {
         toolbar.add(new JToggleButton("50%") {
             {
                 sizes.add(this);
+                putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+                putClientProperty("JButton.segmentPosition", "middle"); // NOI18N
                 setToolTipText("Window preview size: 50%");
             }
             protected void fireItemStateChanged(ItemEvent event) {
@@ -202,6 +210,8 @@ protected void fireItemStateChanged(ItemEvent event) {
         toolbar.add(new JToggleButton("100%") {
             {
                 sizes.add(this);
+                putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+                putClientProperty("JButton.segmentPosition", "last"); // NOI18N
                 setToolTipText("Window preview size: 100%");
             }
             protected void fireItemStateChanged(ItemEvent event) {
diff --git a/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/oql/OQLConsoleView.java b/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/oql/OQLConsoleView.java
@@ -367,9 +367,12 @@ protected void fireItemStateChanged(ItemEvent e) {
                     }
                 }
             };
+            rObjects.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+            rObjects.putClientProperty("JButton.segmentPosition", "first"); // NOI18N
             rObjects.setToolTipText("Objects");
             resultsBG.add(rObjects);
             resultsToolbar.add(rObjects);
+            
             rHTML = new JToggleButton(Icons.getIcon(HeapWalkerIcons.PROPERTIES)) {
                 protected void fireItemStateChanged(ItemEvent e) {
                     if (e.getStateChange() == ItemEvent.SELECTED) {
@@ -378,6 +381,8 @@ protected void fireItemStateChanged(ItemEvent e) {
                     }
                 }
             };
+            rHTML.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+            rHTML.putClientProperty("JButton.segmentPosition", "last"); // NOI18N
             rHTML.setToolTipText("HTML");
             resultsBG.add(rHTML);
             resultsToolbar.add(rHTML);
diff --git a/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/ui/PluggableTreeTableView.java b/visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/ui/PluggableTreeTableView.java
@@ -124,8 +124,14 @@ private void init() {
         pluginsComponent = new MultiSplitContainer();
         pluginsComponent.setPreferredSize(new Dimension(300, 300));
         
-        for (HeapViewPlugin plugin : plugins) {
+        int pcount = plugins.size();
+        for (int i = 0; i < pcount; i++) {
+            HeapViewPlugin plugin = plugins.get(i);
             PluginPresenter presenter = new PluginPresenter(plugin);
+            presenter.putClientProperty("JButton.buttonType", "segmented"); // NOI18N
+            if (i == 0) presenter.putClientProperty("JButton.segmentPosition", "first"); // NOI18N
+            else if (i == pcount - 1) presenter.putClientProperty("JButton.segmentPosition", "last"); // NOI18N
+            else presenter.putClientProperty("JButton.segmentPosition", "middle"); // NOI18N
             PluginContainer container = new PluginContainer(plugin, presenter);
             toolbar.add(presenter);
             pluginsComponent.add(container);

Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,12 @@ protected void fireItemStateChanged(ItemEvent e) {`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`	`};`
	`157`	`+ rObjects.putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`158`	`+ rObjects.putClientProperty("JButton.segmentPosition", "first"); // NOI18N`
`157`	`159`	`rObjects.setToolTipText("Objects");`
`158`	`160`	`resultsBG.add(rObjects);`
`159`	`161`	`toolbar.add(rObjects);`
	`162`	`+`
`160`	`163`	`rHTML = new JToggleButton(Icons.getIcon(HeapWalkerIcons.PROPERTIES)) {`
`161`	`164`	`protected void fireItemStateChanged(ItemEvent e) {`
`162`	`165`	`if (e.getStateChange() == ItemEvent.SELECTED) {`
`@@ -165,6 +168,8 @@ protected void fireItemStateChanged(ItemEvent e) {`
`165`	`168`	`}`
`166`	`169`	`}`
`167`	`170`	`};`
	`171`	`+ rHTML.putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`172`	`+ rHTML.putClientProperty("JButton.segmentPosition", "last"); // NOI18N`
`168`	`173`	`rHTML.setToolTipText("HTML");`
`169`	`174`	`resultsBG.add(rHTML);`
`170`	`175`	`toolbar.add(rHTML);`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,8 @@ private void init() {`
`150`	`150`	`toolbar.add(new JToggleButton("150px") {`
`151`	`151`	`{`
`152`	`152`	`sizes.add(this);`
	`153`	`+ putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`154`	`+ putClientProperty("JButton.segmentPosition", "first"); // NOI18N`
`153`	`155`	`setToolTipText("Window preview height: 150px");`
`154`	`156`	`}`
`155`	`157`	`protected void fireItemStateChanged(ItemEvent event) {`
`@@ -163,6 +165,8 @@ protected void fireItemStateChanged(ItemEvent event) {`
`163`	`165`	`toolbar.add(new JToggleButton("300px") {`
`164`	`166`	`{`
`165`	`167`	`sizes.add(this);`
	`168`	`+ putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`169`	`+ putClientProperty("JButton.segmentPosition", "middle"); // NOI18N`
`166`	`170`	`setToolTipText("Window preview height: 300px");`
`167`	`171`	`}`
`168`	`172`	`protected void fireItemStateChanged(ItemEvent event) {`
`@@ -176,6 +180,8 @@ protected void fireItemStateChanged(ItemEvent event) {`
`176`	`180`	`toolbar.add(new JToggleButton("600px") {`
`177`	`181`	`{`
`178`	`182`	`sizes.add(this);`
	`183`	`+ putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`184`	`+ putClientProperty("JButton.segmentPosition", "middle"); // NOI18N`
`179`	`185`	`setToolTipText("Window preview height: 600px");`
`180`	`186`	`}`
`181`	`187`	`protected void fireItemStateChanged(ItemEvent event) {`
`@@ -189,6 +195,8 @@ protected void fireItemStateChanged(ItemEvent event) {`
`189`	`195`	`toolbar.add(new JToggleButton("50%") {`
`190`	`196`	`{`
`191`	`197`	`sizes.add(this);`
	`198`	`+ putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`199`	`+ putClientProperty("JButton.segmentPosition", "middle"); // NOI18N`
`192`	`200`	`setToolTipText("Window preview size: 50%");`
`193`	`201`	`}`
`194`	`202`	`protected void fireItemStateChanged(ItemEvent event) {`
`@@ -202,6 +210,8 @@ protected void fireItemStateChanged(ItemEvent event) {`
`202`	`210`	`toolbar.add(new JToggleButton("100%") {`
`203`	`211`	`{`
`204`	`212`	`sizes.add(this);`
	`213`	`+ putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`214`	`+ putClientProperty("JButton.segmentPosition", "last"); // NOI18N`
`205`	`215`	`setToolTipText("Window preview size: 100%");`
`206`	`216`	`}`
`207`	`217`	`protected void fireItemStateChanged(ItemEvent event) {`
Original file line number	Diff line number	Diff line change
`@@ -367,9 +367,12 @@ protected void fireItemStateChanged(ItemEvent e) {`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`	`};`
	`370`	`+ rObjects.putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`371`	`+ rObjects.putClientProperty("JButton.segmentPosition", "first"); // NOI18N`
`370`	`372`	`rObjects.setToolTipText("Objects");`
`371`	`373`	`resultsBG.add(rObjects);`
`372`	`374`	`resultsToolbar.add(rObjects);`
	`375`	`+`
`373`	`376`	`rHTML = new JToggleButton(Icons.getIcon(HeapWalkerIcons.PROPERTIES)) {`
`374`	`377`	`protected void fireItemStateChanged(ItemEvent e) {`
`375`	`378`	`if (e.getStateChange() == ItemEvent.SELECTED) {`
`@@ -378,6 +381,8 @@ protected void fireItemStateChanged(ItemEvent e) {`
`378`	`381`	`}`
`379`	`382`	`}`
`380`	`383`	`};`
	`384`	`+ rHTML.putClientProperty("JButton.buttonType", "segmented"); // NOI18N`
	`385`	`+ rHTML.putClientProperty("JButton.segmentPosition", "last"); // NOI18N`
`381`	`386`	`rHTML.setToolTipText("HTML");`
`382`	`387`	`resultsBG.add(rHTML);`
`383`	`388`	`resultsToolbar.add(rHTML);`