Mercurial > hg > release > heapstats-2.1
changeset 205:7db9ee3ae347
Bug 3256: Some controls are overlapped when window is resized
Reviewed-by: ykubota
https://github.com/HeapStats/heapstats/pull/69
line wrap: on
line diff
--- a/ChangeLog Thu Jan 05 22:15:12 2017 +0900 +++ b/ChangeLog Thu Jan 05 22:21:23 2017 +0900 @@ -2,6 +2,7 @@ * Bug 3265: Many WARN and CRIT messages are shown when DumpRequest is sent * Bug 3269: Could not attach HeapStats Agent to JDK 6 + * Bug 3256: Some controls are overlapped when window is resized 2016-12-16 Yasumasa Suenaga <yasuenag@gmail.com>
--- a/analyzer/fx/src/main/java/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/RefTreeController.java Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/java/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/RefTreeController.java Thu Jan 05 22:21:23 2017 +0900 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014-2016 Yasumasa Suenaga + * Copyright (C) 2014-2017 Yasumasa Suenaga * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,6 +17,7 @@ */ package jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs; +import javafx.scene.layout.VBox; import jp.co.ntt.oss.heapstats.snapshot.ReferenceTracker; import com.mxgraph.layout.hierarchical.mxHierarchicalLayout; import com.mxgraph.model.mxCell; @@ -76,7 +77,7 @@ private mxGraphComponent graphComponent; @FXML - private AnchorPane topAnchorPane; + private VBox topVBox; @FXML private Label snapshotLabel; @@ -150,7 +151,7 @@ * So I call repaint() method at last and request layout() call. */ graphComponent.repaint(); - Platform.runLater(() -> topAnchorPane.layout()); + Platform.runLater(() -> topVBox.layout()); } /** @@ -267,7 +268,7 @@ } graphComponent.repaint(); - Platform.runLater(() -> topAnchorPane.layout()); + Platform.runLater(() -> topVBox.layout()); } @Override
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/jvmlive/jvmlive.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/jvmlive/jvmlive.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2014-2015 Yasumasa Suenaga + Copyright (C) 2014-2017 Yasumasa Suenaga This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,33 +18,55 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.ContextMenu?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.ListView?> +<?import javafx.scene.control.MenuItem?> +<?import javafx.scene.control.SplitPane?> +<?import javafx.scene.control.TableColumn?> +<?import javafx.scene.control.TableView?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.VBox?> -<AnchorPane id="AnchorPane" prefHeight="600.0" prefWidth="800.0" stylesheets="@/jp/co/ntt/oss/heapstats/plugin/builtin/jvmlive/jvmlive.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.jvmlive.JVMLiveController"> - <children> - <Label layoutX="14.0" layoutY="10.0" text="%main.label.jvmlist" /> - <ListView fx:id="jvmList" layoutX="14.0" layoutY="35.0" prefHeight="552.0" prefWidth="335.0" AnchorPane.bottomAnchor="13.0" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="35.0" /> - <TableView fx:id="detailTable" layoutX="360.0" layoutY="35.0" prefHeight="323.0" prefWidth="427.0" AnchorPane.leftAnchor="360.0" AnchorPane.rightAnchor="13.0" AnchorPane.topAnchor="35.0"> - <columns> - <TableColumn fx:id="jdpKey" prefWidth="212.0" /> - <TableColumn fx:id="jdpValue" prefWidth="182.0" /> - </columns> - <columnResizePolicy> - <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> - </columnResizePolicy> - </TableView> - <Label layoutX="361.0" layoutY="368.0" text="%main.label.crashhistory" /> - <ListView id="crashlist" fx:id="crashList" layoutX="360.0" layoutY="392.0" onMouseClicked="#onCrashHistoryClicked" prefHeight="195.0" prefWidth="427.0" AnchorPane.bottomAnchor="13.0" AnchorPane.leftAnchor="360.0" AnchorPane.rightAnchor="13.0" AnchorPane.topAnchor="392.0"> - <contextMenu> - <ContextMenu> - <items> - <MenuItem fx:id="detailsMenu" mnemonicParsing="false" onAction="#onDetailsMenuClicked" text="Details" /> - <MenuItem fx:id="saveMenu" mnemonicParsing="false" onAction="#onSaveMenuClicked" text="Save to File" /> - </items> - </ContextMenu> - </contextMenu> - </ListView> - </children> -</AnchorPane> +<SplitPane dividerPositions="0.29797979797979796" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="600.0" prefWidth="800.0" stylesheets="@/jp/co/ntt/oss/heapstats/plugin/builtin/jvmlive/jvmlive.css" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.jvmlive.JVMLiveController"> + <items> + <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" spacing="5.0"> + <children> + <Label text="%main.label.jvmlist" /> + <ListView fx:id="jvmList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" VBox.vgrow="ALWAYS" /> + </children> + </VBox> + <SplitPane dividerPositions="0.5" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" orientation="VERTICAL"> + <items> + <TableView fx:id="detailTable" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="323.0" prefWidth="427.0"> + <columns> + <TableColumn fx:id="jdpKey" prefWidth="212.0" /> + <TableColumn fx:id="jdpValue" prefWidth="182.0" /> + </columns> + <columnResizePolicy> + <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> + </columnResizePolicy> + </TableView> + <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" spacing="5.0"> + <children> + <Label layoutX="361.0" layoutY="368.0" text="%main.label.crashhistory" /> + <ListView id="crashlist" fx:id="crashList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" onMouseClicked="#onCrashHistoryClicked" prefHeight="195.0" prefWidth="427.0" VBox.vgrow="ALWAYS"> + <contextMenu> + <ContextMenu> + <items> + <MenuItem fx:id="detailsMenu" mnemonicParsing="false" onAction="#onDetailsMenuClicked" text="Details" /> + <MenuItem fx:id="saveMenu" mnemonicParsing="false" onAction="#onSaveMenuClicked" text="Save to File" /> + </items> + </ContextMenu> + </contextMenu> + </ListView> + </children> + </VBox> + </items> + </SplitPane> + </items> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> +</SplitPane>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/jvmlive/mbean/heapstatsMBean.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/jvmlive/mbean/heapstatsMBean.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2015 Yasumasa Suenaga + Copyright (C) 2015-2017 Yasumasa Suenaga This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,15 +18,37 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.ButtonBar?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.TableColumn?> +<?import javafx.scene.control.TableView?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.VBox?> -<AnchorPane id="AnchorPane" prefHeight="423.0" prefWidth="473.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.jvmlive.mbean.HeapStatsMBeanController"> +<VBox prefHeight="423.0" prefWidth="500.0" spacing="5.0" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.jvmlive.mbean.HeapStatsMBeanController"> <children> - <Label fx:id="headerLabel" layoutX="14.25" layoutY="14.0" text="Label" /> - <Label layoutX="14.0" layoutY="134.0" text="%dialog.config.current" /> - <TableView fx:id="configTable" layoutY="64.0" prefHeight="259.0" prefWidth="473.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="164.0"> + <Label fx:id="headerLabel" text="Label" /> + <ButtonBar> + <buttons> + <Button mnemonicParsing="false" onAction="#onInvokeResourceBtnClick" text="%dialog.config.invokeResource" /> + <Button mnemonicParsing="false" onAction="#onInvokeAllBtnClick" text="%dialog.config.invokeArciveLog" /> + <Button mnemonicParsing="false" onAction="#onInvokeSnapShotBtnClick" text="%dialog.config.invokeSnapshot" /> + </buttons> + </ButtonBar> + <ButtonBar> + <buttons> + <Button mnemonicParsing="false" onAction="#onGetResourceBtnClick" text="%dialog.config.getResourceLog" /> + <Button mnemonicParsing="false" onAction="#onGetSnapShotBtnClick" text="%dialog.config.getSnapShot" /> + </buttons> + </ButtonBar> + <HBox spacing="5.0"> + <children> + <Label text="%dialog.config.current" /> + <Button mnemonicParsing="false" onAction="#onCommitBtnClick" text="%dialog.config.commit" /> + </children> + </HBox> + <TableView fx:id="configTable" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="259.0" prefWidth="473.0" VBox.vgrow="ALWAYS"> <columns> <TableColumn fx:id="keyColumn" editable="false" prefWidth="147.0" text="config" /> <TableColumn fx:id="valueColumn" editable="true" prefWidth="290.0" text="value" /> @@ -35,11 +57,5 @@ <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> </columnResizePolicy> </TableView> - <Button layoutX="165.0" layoutY="129.0" mnemonicParsing="false" onAction="#onCommitBtnClick" text="%dialog.config.commit" /> - <Button layoutX="14.0" layoutY="40.0" maxWidth="142.0" minWidth="142.0" mnemonicParsing="false" onAction="#onInvokeResourceBtnClick" prefWidth="142.0" text="%dialog.config.invokeResource" /> - <Button layoutX="164.5" layoutY="40.0" maxWidth="142.0" minWidth="142.0" mnemonicParsing="false" onAction="#onInvokeAllBtnClick" prefWidth="142.0" text="%dialog.config.invokeArciveLog" /> - <Button layoutX="314.0" layoutY="40.0" maxWidth="142.0" minWidth="142.0" mnemonicParsing="false" onAction="#onInvokeSnapShotBtnClick" prefWidth="142.0" text="%dialog.config.invokeSnapshot" /> - <Button layoutX="14.0" layoutY="78.0" maxWidth="142.0" minWidth="142.0" mnemonicParsing="false" onAction="#onGetResourceBtnClick" prefWidth="142.0" text="%dialog.config.getResourceLog" /> - <Button layoutX="165.0" layoutY="78.0" mnemonicParsing="false" onAction="#onGetSnapShotBtnClick" prefHeight="28.0" prefWidth="142.0" text="%dialog.config.getSnapShot" /> </children> -</AnchorPane> +</VBox>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/log/log.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/log/log.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2014-2015 Yasumasa Suenaga + Copyright (C) 2014-2017 Yasumasa Suenaga This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,20 +18,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.ComboBox?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.Tab?> +<?import javafx.scene.control.TabPane?> +<?import javafx.scene.control.TextField?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.VBox?> -<AnchorPane id="Log" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.log.LogController"> +<VBox prefHeight="600.0" prefWidth="800.0" spacing="5.0" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.log.LogController"> <children> - <Button layoutX="14.5" layoutY="14.0" mnemonicParsing="false" onAction="#onLogFileClick" text="%button.log" AnchorPane.leftAnchor="14.5" AnchorPane.topAnchor="14.0" /> - <TextField fx:id="logFileList" editable="false" layoutX="114.0" layoutY="14.0" prefHeight="23.0" prefWidth="674.0" AnchorPane.leftAnchor="114.0" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="14.0" /> - <Label layoutX="26.0" layoutY="49.0" text="%label.range" AnchorPane.leftAnchor="26.0" AnchorPane.topAnchor="49.0" /> - <ComboBox fx:id="startCombo" layoutX="83.0" layoutY="45.0" prefHeight="23.0" prefWidth="176.0" AnchorPane.leftAnchor="83.0" AnchorPane.topAnchor="45.0" /> - <Label layoutX="270.0" layoutY="49.0" text="-" AnchorPane.leftAnchor="270.0" AnchorPane.topAnchor="49.0" /> - <ComboBox fx:id="endCombo" layoutX="292.0" layoutY="45.0" prefHeight="23.0" prefWidth="176.0" AnchorPane.leftAnchor="292.0" AnchorPane.topAnchor="45.0" /> - <Button fx:id="okBtn" layoutX="752.0" layoutY="45.0" mnemonicParsing="false" onAction="#onOkClick" text="OK" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="45.0" /> - <TabPane layoutX="14.0" layoutY="80.0" prefHeight="508.0" prefWidth="773.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="80.0"> + <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="5.0"> + <children> + <Button mnemonicParsing="false" onAction="#onLogFileClick" text="%button.log" /> + <TextField fx:id="logFileList" editable="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="23.0" prefWidth="600.0" HBox.hgrow="ALWAYS" /> + <Button fx:id="okBtn" mnemonicParsing="false" onAction="#onOkClick" text="OK" /> + </children> + </HBox> + <HBox spacing="5.0"> + <children> + <Label text="%label.range" /> + <ComboBox fx:id="startCombo" prefHeight="23.0" prefWidth="176.0" /> + <Label text="-" /> + <ComboBox fx:id="endCombo" prefHeight="23.0" prefWidth="176.0" /> + </children> + </HBox> + <TabPane layoutX="14.0" layoutY="80.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="508.0" prefWidth="773.0" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS"> <tabs> <Tab text="%tab.resource"> <content> @@ -46,4 +60,7 @@ </tabs> </TabPane> </children> -</AnchorPane> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> +</VBox>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/log/tabs/details.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/log/tabs/details.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2015 Nippon Telegraph and Telephone Corporation + Copyright (C) 2015-2017 Nippon Telegraph and Telephone Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,13 +18,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.ComboBox?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.TableColumn?> +<?import javafx.scene.control.TableView?> +<?import javafx.scene.control.TextArea?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.VBox?> -<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" stylesheets="@/jp/co/ntt/oss/heapstats/plugin/builtin/log/log.css" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.log.tabs.LogDetailsController"> +<VBox minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" spacing="5.0" stylesheets="@/jp/co/ntt/oss/heapstats/plugin/builtin/log/log.css" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.log.tabs.LogDetailsController"> <children> - <Label text="%label.archive.time" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="10.0" /> - <ComboBox fx:id="archiveCombo" onAction="#onArchiveComboAction" prefWidth="176.0" AnchorPane.leftAnchor="100.0" AnchorPane.topAnchor="6.0" /> + <HBox spacing="5.0"> + <children> + <Label text="%label.archive.time" /> + <ComboBox fx:id="archiveCombo" onAction="#onArchiveComboAction" prefWidth="176.0" /> + </children> + </HBox> <TableView fx:id="archiveEnvInfoTable" prefHeight="200.0" prefWidth="200.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="40.0"> <columns> <TableColumn fx:id="archiveKeyColumn" editable="false" prefWidth="200.0" sortable="false" /> @@ -34,8 +45,15 @@ <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> </columnResizePolicy> </TableView> - <Label text="%label.archive.file" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="250.0" /> - <ComboBox fx:id="fileCombo" onAction="#onFileComboAction" prefWidth="176.0" AnchorPane.leftAnchor="100.0" AnchorPane.topAnchor="247.0" /> - <TextArea id="logArea" fx:id="logArea" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="280.0" /> + <HBox spacing="5.0"> + <children> + <Label text="%label.archive.file" /> + <ComboBox fx:id="fileCombo" onAction="#onFileComboAction" prefWidth="176.0" /> + </children> + </HBox> + <TextArea id="logArea" fx:id="logArea" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="280.0" VBox.vgrow="ALWAYS" /> </children> -</AnchorPane> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> +</VBox>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/log/tabs/resources.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/log/tabs/resources.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2015-2016 Nippon Telegraph and Telephone Corporation + Copyright (C) 2015-2017 Nippon Telegraph and Telephone Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,126 +18,132 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.chart.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.chart.LineChart?> +<?import javafx.scene.chart.NumberAxis?> +<?import javafx.scene.chart.StackedAreaChart?> +<?import javafx.scene.control.TableColumn?> +<?import javafx.scene.control.TableView?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.ColumnConstraints?> +<?import javafx.scene.layout.GridPane?> +<?import javafx.scene.layout.RowConstraints?> +<?import javafx.scene.layout.StackPane?> -<AnchorPane layoutX="17.0" layoutY="20.0" minHeight="0.0" minWidth="0.0" prefHeight="479.0" prefWidth="772.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.log.tabs.LogResourcesController"> +<GridPane fx:id="chartGrid" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="479.0" prefWidth="772.0" stylesheets="@/jp/co/ntt/oss/heapstats/plugin/builtin/log/log.css" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.log.tabs.LogResourcesController"> + <columnConstraints> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + </columnConstraints> + <rowConstraints> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> + </rowConstraints> <children> - <GridPane fx:id="chartGrid" layoutY="26.0" minHeight="0.0" minWidth="0.0" stylesheets="@/jp/co/ntt/oss/heapstats/plugin/builtin/log/log.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="26.0"> - <columnConstraints> - <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> - <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> - </columnConstraints> - <rowConstraints> - <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> - <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> - <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> - <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> - </rowConstraints> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" GridPane.columnIndex="1" GridPane.rowIndex="1"> + <children> + <LineChart id="threadChart" fx:id="threadChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.thread"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis minorTickVisible="false" side="LEFT" /> + </yAxis> + </LineChart> + <AnchorPane fx:id="threadsAnchor" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <TableView fx:id="procSummary" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" GridPane.columnIndex="1" GridPane.rowIndex="3"> + <columns> + <TableColumn id="category" fx:id="categoryColumn" editable="false" prefWidth="200.0" sortable="false" /> + <TableColumn id="value" fx:id="valueColumn" editable="false" prefWidth="200.0" sortable="false" /> + </columns> + <columnResizePolicy> + <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> + </columnResizePolicy> + </TableView> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <children> + <StackedAreaChart id="javaCPUChart" fx:id="javaCPUChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.javacpu"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis autoRanging="false" label="\%" lowerBound="0.0" minorTickVisible="false" side="LEFT" tickUnit="10.0" upperBound="100.0d" /> + </yAxis> + </StackedAreaChart> + <AnchorPane fx:id="javaCPUAnchor" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" GridPane.columnIndex="1"> <children> - <StackPane GridPane.columnIndex="1" GridPane.rowIndex="1"> - <children> - <LineChart id="threadChart" fx:id="threadChart" animated="false" legendVisible="false" minHeight="0.0" minWidth="0.0" title="%chart.thread"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis side="LEFT" minorTickVisible="false" /> - </yAxis> - </LineChart> - <AnchorPane fx:id="threadsAnchor" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> - </children> - </StackPane> - <TableView fx:id="procSummary" layoutX="-6.0" layoutY="23.0" minHeight="0.0" minWidth="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="23.0" GridPane.columnIndex="1" GridPane.rowIndex="3"> - <columns> - <TableColumn id="category" fx:id="categoryColumn" editable="false" prefWidth="200.0" sortable="false" /> - <TableColumn id="value" fx:id="valueColumn" editable="false" prefWidth="200.0" sortable="false" /> - </columns> - <columnResizePolicy> - <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> - </columnResizePolicy> - </TableView> - <StackPane minHeight="0.0" minWidth="0.0"> - <children> - <StackedAreaChart id="javaCPUChart" fx:id="javaCPUChart" animated="false" legendVisible="false" minHeight="0.0" minWidth="0.0" title="%chart.javacpu"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis autoRanging="false" label="\%" lowerBound="0.0" side="LEFT" upperBound="100.0d" tickUnit="10.0" minorTickVisible="false" /> - </yAxis> - </StackedAreaChart> - <AnchorPane fx:id="javaCPUAnchor" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> - </children> - </StackPane> - <StackPane minHeight="0.0" minWidth="0.0" GridPane.columnIndex="1"> - <children> - <StackedAreaChart id="systemCPUChart" fx:id="systemCPUChart" animated="false" legendVisible="false" minHeight="0.0" minWidth="0.0" title="%chart.systemcpu"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis autoRanging="false" label="\%" lowerBound="0.0" side="LEFT" upperBound="100.0d" tickUnit="10.0" minorTickVisible="false" /> - </yAxis> - </StackedAreaChart> - <AnchorPane fx:id="systemCPUAnchor" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> - </children> - </StackPane> - <StackPane minHeight="0.0" minWidth="0.0" GridPane.rowIndex="1"> - <children> - <LineChart id="javaMemoryChart" fx:id="javaMemoryChart" animated="false" legendVisible="false" minHeight="0.0" minWidth="0.0" title="%chart.nativememory"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis label="MB" side="LEFT" minorTickVisible="false" /> - </yAxis> - </LineChart> - <AnchorPane fx:id="javaMemoryAnchor" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> - </children> - </StackPane> - <StackPane minHeight="0.0" minWidth="0.0" GridPane.rowIndex="2"> - <children> - <LineChart id="safepointChart" fx:id="safepointChart" animated="false" legendVisible="false" minHeight="0.0" minWidth="0.0" title="%chart.safepoint.count"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" visible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis side="LEFT" minorTickVisible="false" /> - </yAxis> - </LineChart> - <AnchorPane fx:id="safepointAnchor" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> - </children> - </StackPane> - <StackPane minHeight="0.0" minWidth="0.0" GridPane.columnIndex="1" GridPane.rowIndex="2"> - <children> - <LineChart id="safepointTimeChart" fx:id="safepointTimeChart" animated="false" legendVisible="false" minHeight="0.0" minWidth="0.0" title="%chart.safepoint.time"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" visible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis label="ms" side="LEFT" minorTickVisible="false" /> - </yAxis> - </LineChart> - <AnchorPane fx:id="safepointTimeAnchor" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> - </children> - </StackPane> - <StackPane minHeight="0.0" minWidth="0.0" GridPane.rowIndex="3"> - <children> - <LineChart id="monitorChart" fx:id="monitorChart" animated="false" legendVisible="false" minHeight="0.0" minWidth="0.0" title="%chart.monitorcontention"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis side="LEFT" minorTickVisible="false" /> - </yAxis> - </LineChart> - <AnchorPane fx:id="monitorAnchor" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> - </children> - </StackPane> + <StackedAreaChart id="systemCPUChart" fx:id="systemCPUChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.systemcpu"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis autoRanging="false" label="\%" lowerBound="0.0" minorTickVisible="false" side="LEFT" tickUnit="10.0" upperBound="100.0d" /> + </yAxis> + </StackedAreaChart> + <AnchorPane fx:id="systemCPUAnchor" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" GridPane.rowIndex="1"> + <children> + <LineChart id="javaMemoryChart" fx:id="javaMemoryChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.nativememory"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis label="MB" minorTickVisible="false" side="LEFT" /> + </yAxis> + </LineChart> + <AnchorPane fx:id="javaMemoryAnchor" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> </children> - </GridPane> + </StackPane> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" GridPane.rowIndex="2"> + <children> + <LineChart id="safepointChart" fx:id="safepointChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.safepoint.count"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" visible="false" /> + </xAxis> + <yAxis> + <NumberAxis minorTickVisible="false" side="LEFT" /> + </yAxis> + </LineChart> + <AnchorPane fx:id="safepointAnchor" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" GridPane.columnIndex="1" GridPane.rowIndex="2"> + <children> + <LineChart id="safepointTimeChart" fx:id="safepointTimeChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.safepoint.time"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" visible="false" /> + </xAxis> + <yAxis> + <NumberAxis label="ms" minorTickVisible="false" side="LEFT" /> + </yAxis> + </LineChart> + <AnchorPane fx:id="safepointTimeAnchor" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" GridPane.rowIndex="3"> + <children> + <LineChart id="monitorChart" fx:id="monitorChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.monitorcontention"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis minorTickVisible="false" side="LEFT" /> + </yAxis> + </LineChart> + <AnchorPane fx:id="monitorAnchor" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> </children> -</AnchorPane> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> +</GridPane>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/snapshot.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/snapshot.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2014-2015 Yasumasa Suenaga + Copyright (C) 2014-2017 Yasumasa Suenaga This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,27 +18,43 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.ComboBox?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.RadioButton?> +<?import javafx.scene.control.Tab?> +<?import javafx.scene.control.TabPane?> +<?import javafx.scene.control.TextField?> +<?import javafx.scene.control.ToggleGroup?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.VBox?> -<AnchorPane id="SnapShot" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.SnapShotController"> +<VBox prefHeight="600.0" prefWidth="800.0" spacing="5.0" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.SnapShotController"> <children> - <Button layoutX="14.5" layoutY="14.0" mnemonicParsing="false" onAction="#onSnapshotFileClick" text="%button.snapshot" AnchorPane.leftAnchor="14.5" AnchorPane.topAnchor="14.0" /> - <TextField fx:id="snapshotList" editable="false" layoutX="131.0" layoutY="14.0" prefHeight="23.0" prefWidth="697.0" AnchorPane.leftAnchor="131.0" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="14.0" /> - <Label layoutX="26.0" layoutY="49.0" text="%label.range" AnchorPane.leftAnchor="26.0" AnchorPane.topAnchor="49.0" /> - <ComboBox fx:id="startCombo" layoutX="83.0" layoutY="45.0" prefHeight="23.0" prefWidth="176.0" AnchorPane.leftAnchor="83.0" AnchorPane.topAnchor="45.0" /> - <Label layoutX="270.0" layoutY="49.0" text="-" AnchorPane.leftAnchor="270.0" AnchorPane.topAnchor="49.0" /> - <ComboBox fx:id="endCombo" layoutX="292.0" layoutY="45.0" prefHeight="23.0" prefWidth="176.0" AnchorPane.leftAnchor="292.0" AnchorPane.topAnchor="45.0" /> - <Label layoutX="485.0" layoutY="49.0" text="%fxml.baseline" AnchorPane.leftAnchor="485.0" AnchorPane.topAnchor="49.0" /> - <RadioButton layoutX="560.0" layoutY="49.0" mnemonicParsing="false" selected="true" text="%fxml.heapsize"> - <toggleGroup> - <ToggleGroup fx:id="baseline" /> - </toggleGroup> - </RadioButton> - <RadioButton fx:id="radioInstance" layoutX="645.0" layoutY="49.0" mnemonicParsing="false" text="%fxml.instance" toggleGroup="$baseline" /> - <Button fx:id="okBtn" layoutX="752.0" layoutY="45.0" mnemonicParsing="false" onAction="#onOkClick" text="OK" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="45.0" /> - <TabPane fx:id="snapshotMain" layoutX="14.0" layoutY="80.0" prefHeight="508.0" prefWidth="773.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="12.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="80.0"> + <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="5.0"> + <children> + <Button mnemonicParsing="false" onAction="#onSnapshotFileClick" text="%button.snapshot" /> + <TextField fx:id="snapshotList" editable="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="23.0" prefWidth="600.0" HBox.hgrow="ALWAYS" /> + <Button fx:id="okBtn" mnemonicParsing="false" onAction="#onOkClick" text="OK" /> + </children> + </HBox> + <HBox spacing="5.0"> + <children> + <Label text="%label.range" /> + <ComboBox fx:id="startCombo" prefHeight="23.0" prefWidth="176.0" /> + <Label text="-" /> + <ComboBox fx:id="endCombo" prefHeight="23.0" prefWidth="176.0" /> + <Label text="%fxml.baseline" /> + <RadioButton mnemonicParsing="false" selected="true" text="%fxml.heapsize"> + <toggleGroup> + <ToggleGroup fx:id="baseline" /> + </toggleGroup> + </RadioButton> + <RadioButton fx:id="radioInstance" mnemonicParsing="false" text="%fxml.instance" toggleGroup="$baseline" /> + </children> + </HBox> + <TabPane fx:id="snapshotMain" prefHeight="508.0" prefWidth="773.0" tabClosingPolicy="UNAVAILABLE"> <tabs> <Tab text="%tab.summary"> <content> @@ -63,4 +79,7 @@ </tabs> </TabPane> </children> -</AnchorPane> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> +</VBox>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/histogram.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/histogram.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2015-2016 Nippon Telegraph and Telephone Corporation + Copyright (C) 2015-2017 Nippon Telegraph and Telephone Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,82 +18,106 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.chart.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.chart.NumberAxis?> +<?import javafx.scene.chart.StackedAreaChart?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.ButtonBar?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.ListView?> +<?import javafx.scene.control.SplitPane?> +<?import javafx.scene.control.TableColumn?> +<?import javafx.scene.control.TableView?> +<?import javafx.scene.control.TextField?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.StackPane?> +<?import javafx.scene.layout.VBox?> -<SplitPane dividerPositions="0.3" focusTraversable="true" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs.HistogramController"> +<SplitPane dividerPositions="0.4" focusTraversable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs.HistogramController"> <items> - <AnchorPane> - <children> - <SplitPane dividerPositions="0.5" focusTraversable="true" orientation="VERTICAL" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <items> - <AnchorPane> + <SplitPane dividerPositions="0.5" focusTraversable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" orientation="VERTICAL"> + <items> + <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" spacing="5.0"> + <children> + <HBox spacing="5.0"> <children> - <Label text="%label.exclude" AnchorPane.leftAnchor="7.0" AnchorPane.topAnchor="7.0" /> - <Button mnemonicParsing="false" onAction="#onAddClick" prefWidth="60.0" text="%button.add" AnchorPane.leftAnchor="100.0" AnchorPane.topAnchor="3.0" /> - <Button mnemonicParsing="false" onAction="#onHiddenFilterApply" prefWidth="60.0" text="%button.apply" AnchorPane.leftAnchor="163.0" AnchorPane.topAnchor="3.0" /> - <TableView fx:id="excludeTable" editable="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="33.0"> - <columns> - <TableColumn fx:id="hideColumn" prefWidth="45.0" sortable="false" text="%table.column.hide" /> - <TableColumn fx:id="excludeNameColumn" editable="false" prefWidth="150.0" text="%table.column.filtername" /> - </columns> - <columnResizePolicy> - <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> - </columnResizePolicy> - </TableView> - </children> - </AnchorPane> - <AnchorPane> - <children> - <Label text="%label.classsearch" AnchorPane.leftAnchor="3.0" AnchorPane.topAnchor="3.0" /> - <TextField fx:id="searchText" onKeyReleased="#onSearchTextChanged" AnchorPane.leftAnchor="3.0" AnchorPane.rightAnchor="3.0" AnchorPane.topAnchor="20.0" /> - <ListView fx:id="searchList" AnchorPane.bottomAnchor="32.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="48.0" /> - <Button fx:id="selectFilterApplyBtn" mnemonicParsing="false" onAction="#onSelectFilterApply" text="%button.apply" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="55.0" /> - <Button mnemonicParsing="false" onAction="#onSelectFilterClear" text="%button.clear" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" /> + <Label text="%label.exclude" /> + <ButtonBar> + <buttons> + <Button mnemonicParsing="false" onAction="#onAddClick" text="%button.add" /> + <Button mnemonicParsing="false" onAction="#onHiddenFilterApply" text="%button.apply" /> + </buttons> + </ButtonBar> </children> - </AnchorPane> - </items> - </SplitPane> - </children> - </AnchorPane> - <AnchorPane> - <children> - <SplitPane dividerPositions="0.5" focusTraversable="true" orientation="VERTICAL" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <items> - <StackPane prefHeight="150.0" prefWidth="200.0"> + </HBox> + <TableView fx:id="excludeTable" editable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" VBox.vgrow="ALWAYS"> + <columns> + <TableColumn fx:id="hideColumn" prefWidth="45.0" sortable="false" text="%table.column.hide" /> + <TableColumn fx:id="excludeNameColumn" editable="false" prefWidth="150.0" text="%table.column.filtername" /> + </columns> + <columnResizePolicy> + <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> + </columnResizePolicy> + </TableView> + </children> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> + </VBox> + <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" spacing="5.0"> + <children> + <HBox spacing="5.0"> <children> - <StackedAreaChart fx:id="topNChart" animated="false" legendVisible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis fx:id="topNYAxis" autoRanging="false" label="MB" side="LEFT" minorTickVisible="false" /> - </yAxis> - </StackedAreaChart> - <AnchorPane fx:id="topNChartAnchor" mouseTransparent="true" /> + <Label text="%label.classsearch" /> + <TextField fx:id="searchText" onKeyReleased="#onSearchTextChanged" /> </children> - </StackPane> - <AnchorPane> - <children> - <TableView fx:id="lastDiffTable" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <columns> - <TableColumn fx:id="colorColumn" editable="false" prefWidth="75.0" sortable="false" /> - <TableColumn fx:id="classNameColumn" editable="false" prefWidth="75.0" text="%table.column.classname" /> - <TableColumn fx:id="classLoaderColumn" editable="false" prefWidth="75.0" text="%table.column.classloader" /> - <TableColumn fx:id="instanceColumn" editable="false" prefWidth="75.0" text="%table.column.instances" /> - <TableColumn fx:id="totalSizeColumn" editable="false" prefWidth="75.0" text="%table.column.totalsize" /> - </columns> - <columnResizePolicy> - <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> - </columnResizePolicy> - </TableView> - </children> - </AnchorPane> - </items> - </SplitPane> - </children> - </AnchorPane> + </HBox> + <ListView fx:id="searchList" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" VBox.vgrow="ALWAYS" /> + <ButtonBar> + <buttons> + <Button fx:id="selectFilterApplyBtn" mnemonicParsing="false" onAction="#onSelectFilterApply" text="%button.apply" /> + <Button mnemonicParsing="false" onAction="#onSelectFilterClear" text="%button.clear" /> + </buttons> + </ButtonBar> + </children> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> + </VBox> + </items> + </SplitPane> + <SplitPane dividerPositions="0.5" focusTraversable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" orientation="VERTICAL"> + <items> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <children> + <StackedAreaChart fx:id="topNChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis fx:id="topNYAxis" autoRanging="false" label="MB" minorTickVisible="false" side="LEFT" /> + </yAxis> + </StackedAreaChart> + <AnchorPane fx:id="topNChartAnchor" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <TableView fx:id="lastDiffTable" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <columns> + <TableColumn fx:id="colorColumn" editable="false" prefWidth="75.0" sortable="false" /> + <TableColumn fx:id="classNameColumn" editable="false" prefWidth="75.0" text="%table.column.classname" /> + <TableColumn fx:id="classLoaderColumn" editable="false" prefWidth="75.0" text="%table.column.classloader" /> + <TableColumn fx:id="instanceColumn" editable="false" prefWidth="75.0" text="%table.column.instances" /> + <TableColumn fx:id="totalSizeColumn" editable="false" prefWidth="75.0" text="%table.column.totalsize" /> + </columns> + <columnResizePolicy> + <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> + </columnResizePolicy> + </TableView> + </items> + </SplitPane> </items> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> </SplitPane>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/reftree.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/reftree.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2014-2015 Yasumasa Suenaga + Copyright (C) 2014-2017 Yasumasa Suenaga This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,13 +18,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import javafx.embed.swing.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.embed.swing.SwingNode?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.CheckBox?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.RadioButton?> +<?import javafx.scene.control.ToggleGroup?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.Region?> +<?import javafx.scene.layout.VBox?> -<AnchorPane fx:id="topAnchorPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs.RefTreeController"> +<VBox fx:id="topVBox" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs.RefTreeController"> <children> - <HBox prefHeight="34.0" prefWidth="238.0" spacing="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="10.0"> + <HBox spacing="10.0"> <children> <Label text="%reftree.snapshot" /> <Label fx:id="snapshotLabel" prefHeight="15.0" prefWidth="149.0" /> @@ -43,12 +49,12 @@ </toggleGroup> </RadioButton> <RadioButton fx:id="radioSize" mnemonicParsing="false" selected="true" text="%reftree.size" toggleGroup="$sort" /> - <Region layoutX="756.0" layoutY="10.0" maxHeight="15.0" maxWidth="15.0" minHeight="15.0" minWidth="15.0" prefHeight="15.0" prefWidth="15.0" /> + <Region maxHeight="15.0" maxWidth="15.0" minHeight="15.0" minWidth="15.0" prefHeight="15.0" prefWidth="15.0" /> <CheckBox fx:id="rankCheckBox" mnemonicParsing="false" selected="true" text="%reftree.ranking" /> - <Region layoutX="453.0" layoutY="10.0" maxHeight="15.0" maxWidth="15.0" minHeight="15.0" minWidth="15.0" prefHeight="15.0" prefWidth="15.0" /> + <Region maxHeight="15.0" maxWidth="15.0" minHeight="15.0" minWidth="15.0" prefHeight="15.0" prefWidth="15.0" /> <Button mnemonicParsing="false" onAction="#onOkClick" text="OK" /> </children> </HBox> - <SwingNode fx:id="graphNode" layoutY="34.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0" /> + <SwingNode fx:id="graphNode" VBox.vgrow="ALWAYS" /> </children> -</AnchorPane> +</VBox>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/snapshot.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/snapshot.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2015 Nippon Telegraph and Telephone Corporation + Copyright (C) 2015-2017 Nippon Telegraph and Telephone Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,61 +18,57 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.chart.*?> -<?import javafx.scene.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.chart.PieChart?> +<?import javafx.scene.control.ComboBox?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.SplitPane?> +<?import javafx.scene.control.TableColumn?> +<?import javafx.scene.control.TableView?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.VBox?> -<AnchorPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs.SnapshotController"> +<VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="5.0" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs.SnapshotController"> <children> - <Label text="%label.snapshot" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="10.0" /> - <ComboBox fx:id="snapShotTimeCombo" layoutX="91.0" layoutY="45.0" onAction="#onSnapShotTimeSelected" prefHeight="23.0" prefWidth="176.0" AnchorPane.leftAnchor="91.0" AnchorPane.topAnchor="7.0" /> - <SplitPane dividerPositions="0.6" orientation="VERTICAL" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0"> + <HBox spacing="10.0"> + <children> + <Label text="%label.snapshot" /> + <ComboBox fx:id="snapShotTimeCombo" onAction="#onSnapShotTimeSelected" prefHeight="23.0" prefWidth="176.0" /> + </children> + </HBox> + <SplitPane dividerPositions="0.6" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" orientation="VERTICAL" VBox.vgrow="ALWAYS"> <items> - <AnchorPane prefHeight="200.0" prefWidth="200.0"> - <children> - <SplitPane dividerPositions="0.5" prefHeight="160.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <items> - <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0"> - <children> - <PieChart fx:id="usagePieChart" legendVisible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" /> - </children> - </AnchorPane> - <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0"> - <children> - <TableView fx:id="snapShotSummaryTable" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <columns> - <TableColumn fx:id="snapShotSummaryKey" editable="false" minWidth="95.0" prefWidth="170.0" sortable="false" /> - <TableColumn fx:id="snapShotSummaryValue" editable="false" minWidth="190.0" prefWidth="190.0" sortable="false" /> - </columns> - <columnResizePolicy> - <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> - </columnResizePolicy> - </TableView> - </children> - </AnchorPane> - </items> - </SplitPane> - </children> - </AnchorPane> - <AnchorPane prefHeight="186.0" prefWidth="772.0"> - <children> - <TableView fx:id="objDataTable" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> + <SplitPane dividerPositions="0.5" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="160.0" prefWidth="200.0"> + <items> + <PieChart fx:id="usagePieChart" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" /> + <TableView fx:id="snapShotSummaryTable" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0"> <columns> - <TableColumn fx:id="objColorColumn" editable="false" prefWidth="40.0" sortable="false" /> - <TableColumn fx:id="objClassNameColumn" editable="false" prefWidth="200.0" text="%table.column.classname" /> - <TableColumn fx:id="objClassLoaderColumn" editable="false" prefWidth="200.0" text="%table.column.classloader" /> - <TableColumn fx:id="objInstancesColumn" editable="false" prefWidth="75.0" text="%snapshot.instances" /> - <TableColumn fx:id="objSizeColumn" editable="false" prefWidth="75.0" text="%snapshot.totalsize" /> + <TableColumn fx:id="snapShotSummaryKey" editable="false" minWidth="95.0" prefWidth="170.0" sortable="false" /> + <TableColumn fx:id="snapShotSummaryValue" editable="false" minWidth="190.0" prefWidth="190.0" sortable="false" /> </columns> <columnResizePolicy> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> </columnResizePolicy> </TableView> - </children> - </AnchorPane> + </items> + </SplitPane> + <TableView fx:id="objDataTable" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0"> + <columns> + <TableColumn fx:id="objColorColumn" editable="false" prefWidth="40.0" sortable="false" /> + <TableColumn fx:id="objClassNameColumn" editable="false" prefWidth="200.0" text="%table.column.classname" /> + <TableColumn fx:id="objClassLoaderColumn" editable="false" prefWidth="200.0" text="%table.column.classloader" /> + <TableColumn fx:id="objInstancesColumn" editable="false" prefWidth="75.0" text="%snapshot.instances" /> + <TableColumn fx:id="objSizeColumn" editable="false" prefWidth="75.0" text="%snapshot.totalsize" /> + </columns> + <columnResizePolicy> + <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> + </columnResizePolicy> + </TableView> </items> </SplitPane> </children> -</AnchorPane> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> +</VBox>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/summary.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/summary.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2015-2016 Nippon Telegraph and Telephone Corporation + Copyright (C) 2015-2017 Nippon Telegraph and Telephone Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,85 +18,86 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.chart.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.chart.AreaChart?> +<?import javafx.scene.chart.LineChart?> +<?import javafx.scene.chart.NumberAxis?> +<?import javafx.scene.chart.StackedAreaChart?> +<?import javafx.scene.control.SplitPane?> +<?import javafx.scene.control.TableColumn?> +<?import javafx.scene.control.TableView?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.StackPane?> -<SplitPane dividerPositions="0.2551813471502591" focusTraversable="true" prefHeight="160.0" prefWidth="200.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs.SummaryController"> +<SplitPane dividerPositions="0.2551813471502591" focusTraversable="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="160.0" prefWidth="200.0" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.snapshot.tabs.SummaryController"> <items> - <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0"> - <children> - <TableView fx:id="summaryTable" layoutX="-27.0" layoutY="39.5" minHeight="0.0" minWidth="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <columns> - <TableColumn fx:id="keyColumn" editable="false" prefWidth="94.0" sortable="false" /> - <TableColumn fx:id="valueColumn" editable="false" prefWidth="99.0" sortable="false" /> - </columns> - <columnResizePolicy> - <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> - </columnResizePolicy> - </TableView> - </children> - </AnchorPane> - <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0"> - <children> - <SplitPane dividerPositions="0.25, 0.5, 0.75" layoutX="66.0" layoutY="58.0" orientation="VERTICAL" prefHeight="200.0" prefWidth="200.0" stylesheets="@/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/snapshot.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <items> - <StackPane prefHeight="150.0" prefWidth="200.0"> - <children> - <StackedAreaChart id="heapChart" fx:id="heapChart" animated="false" layoutX="-129.0" layoutY="-91.0" minHeight="0.0" title="%chart.javaheap" legendVisible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis label="MB" side="LEFT" minorTickVisible="false" /> - </yAxis> - </StackedAreaChart> - <AnchorPane mouseTransparent="true" prefHeight="200.0" prefWidth="200.0" /> - </children> - </StackPane> - <StackPane prefHeight="150.0" prefWidth="200.0"> - <children> - <LineChart id="instanceChart" fx:id="instanceChart" animated="false" layoutX="-149.0" layoutY="-120.0" legendVisible="false" minHeight="0.0" title="%chart.instances" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" visible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis label="instances" side="LEFT" minorTickVisible="false" /> - </yAxis> - </LineChart> - <AnchorPane mouseTransparent="true" prefHeight="200.0" prefWidth="200.0" /> - </children> - </StackPane> - <StackPane prefHeight="150.0" prefWidth="200.0"> - <children> - <LineChart id="gcTimeChart" fx:id="gcTimeChart" animated="false" layoutX="-169.0" layoutY="-120.0" legendVisible="false" minHeight="0.0" title="%chart.gctime" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis label="ms" side="LEFT" minorTickVisible="false" /> - </yAxis> - </LineChart> - <AnchorPane mouseTransparent="true" prefHeight="200.0" prefWidth="200.0" /> - </children> - </StackPane> - <StackPane prefHeight="150.0" prefWidth="200.0"> - <children> - <AreaChart id="metaspaceChart" fx:id="metaspaceChart" animated="false" layoutX="-174.0" layoutY="-166.0" minHeight="0.0" title="%chart.metaspace" legendVisible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <xAxis> - <NumberAxis side="BOTTOM" tickLabelsVisible="false" minorTickVisible="false" autoRanging="false" /> - </xAxis> - <yAxis> - <NumberAxis label="MB" side="LEFT" minorTickVisible="false" /> - </yAxis> - </AreaChart> - <AnchorPane mouseTransparent="true" prefHeight="200.0" prefWidth="200.0" /> - </children> - </StackPane> - </items> - </SplitPane> - </children> - </AnchorPane> + <TableView fx:id="summaryTable" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <columns> + <TableColumn fx:id="keyColumn" editable="false" prefWidth="94.0" sortable="false" /> + <TableColumn fx:id="valueColumn" editable="false" prefWidth="99.0" sortable="false" /> + </columns> + <columnResizePolicy> + <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> + </columnResizePolicy> + </TableView> + <SplitPane dividerPositions="0.25, 0.5, 0.75" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" orientation="VERTICAL" stylesheets="@/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/snapshot.css"> + <items> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <children> + <StackedAreaChart id="heapChart" fx:id="heapChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.javaheap"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis label="MB" minorTickVisible="false" side="LEFT" /> + </yAxis> + </StackedAreaChart> + <AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <children> + <LineChart id="instanceChart" fx:id="instanceChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.instances"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" visible="false" /> + </xAxis> + <yAxis> + <NumberAxis label="instances" minorTickVisible="false" side="LEFT" /> + </yAxis> + </LineChart> + <AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <children> + <LineChart id="gcTimeChart" fx:id="gcTimeChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.gctime"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis label="ms" minorTickVisible="false" side="LEFT" /> + </yAxis> + </LineChart> + <AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0"> + <children> + <AreaChart id="metaspaceChart" fx:id="metaspaceChart" animated="false" legendVisible="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" title="%chart.metaspace"> + <xAxis> + <NumberAxis autoRanging="false" minorTickVisible="false" side="BOTTOM" tickLabelsVisible="false" /> + </xAxis> + <yAxis> + <NumberAxis label="MB" minorTickVisible="false" side="LEFT" /> + </yAxis> + </AreaChart> + <AnchorPane minHeight="0.0" minWidth="0.0" mouseTransparent="true" /> + </children> + </StackPane> + </items> + </SplitPane> </items> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> </SplitPane>
--- a/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/threadrecorder/threadrecorder.fxml Thu Jan 05 22:15:12 2017 +0900 +++ b/analyzer/fx/src/main/resources/jp/co/ntt/oss/heapstats/plugin/builtin/threadrecorder/threadrecorder.fxml Thu Jan 05 22:21:23 2017 +0900 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2015 Yasumasa Suenaga + Copyright (C) 2015-2017 Yasumasa Suenaga This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -18,42 +18,82 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> -<?import java.lang.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.SplitPane?> +<?import javafx.scene.control.TableColumn?> +<?import javafx.scene.control.TableView?> +<?import javafx.scene.control.TextField?> +<?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.ColumnConstraints?> +<?import javafx.scene.layout.GridPane?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.RowConstraints?> +<?import javafx.scene.layout.VBox?> -<AnchorPane id="AnchorPane" prefHeight="600.0" prefWidth="800.0" stylesheets="@threadrecorder.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.threadrecorder.ThreadRecorderController"> +<VBox prefHeight="600.0" prefWidth="800.0" spacing="10.0" stylesheets="@threadrecorder.css" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jp.co.ntt.oss.heapstats.plugin.builtin.threadrecorder.ThreadRecorderController"> <children> - <Button layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#onOpenBtnClick" text="%button.file" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="14.0" /> - <TextField fx:id="fileNameBox" editable="false" layoutX="118.0" layoutY="14.0" prefHeight="25.0" prefWidth="666.0" AnchorPane.leftAnchor="120.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0" /> - <Label layoutX="14.0" layoutY="58.0" text="%label.timerange" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="58.0" /> - <Button fx:id="okBtn" disable="true" layoutX="752.0" layoutY="54.0" mnemonicParsing="false" onAction="#onOkBtnClick" text="OK" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="54.0" /> - <TableView fx:id="timelineView" editable="true" layoutX="261.0" layoutY="91.0" prefWidth="120.0" AnchorPane.bottomAnchor="53.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="91.0"> + <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="10.0"> + <children> + <Button mnemonicParsing="false" onAction="#onOpenBtnClick" text="%button.file" /> + <TextField fx:id="fileNameBox" editable="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="0.0" prefWidth="200.0" HBox.hgrow="ALWAYS" /> + <Button fx:id="okBtn" disable="true" mnemonicParsing="false" onAction="#onOkBtnClick" text="OK" /> + </children> + </HBox> + <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="10.0"> + <children> + <Label text="%label.timerange" /> + <SplitPane fx:id="rangePane" disable="true" dividerPositions="0.0, 1.0" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="25.0" HBox.hgrow="ALWAYS"> + <items> + <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" styleClass="rect-range-unselected" /> + <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="15.0" prefWidth="637.0" styleClass="rect-range-selected" /> + <AnchorPane prefHeight="158.0" prefWidth="65.0" styleClass="rect-range-unselected" /> + </items> + </SplitPane> + </children> + </HBox> + <HBox alignment="CENTER" spacing="5.0"> + <children> + <Label fx:id="startTimeLabel" /> + <Label text="-" /> + <Label fx:id="endTimeLabel" /> + </children> + </HBox> + <TableView fx:id="timelineView" editable="true" VBox.vgrow="ALWAYS"> <columns> <TableColumn fx:id="showColumn" prefWidth="37.0" /> <TableColumn fx:id="threadNameColumn" editable="false" prefWidth="166.0" text="%table.column.thread" /> <TableColumn fx:id="timelineColumn" editable="false" maxWidth="1.7976931348623157E308" minWidth="200.0" prefWidth="525.0" sortable="false" /> </columns> </TableView> - <SplitPane fx:id="rangePane" disable="true" dividerPositions="0.0, 1.0" layoutX="61.0" layoutY="51.0" prefHeight="17.0" prefWidth="679.0" AnchorPane.leftAnchor="61.0" AnchorPane.rightAnchor="60.0" AnchorPane.topAnchor="51.0"> - <items> - <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" styleClass="rect-range-unselected" /> - <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="15.0" prefWidth="637.0" styleClass="rect-range-selected" /> - <AnchorPane prefHeight="158.0" prefWidth="65.0" styleClass="rect-range-unselected" /> - </items> - </SplitPane> - <Label fx:id="startTimeLabel" layoutX="219.0" layoutY="71.0" /> - <Label layoutX="360.0" layoutY="71.0" text="-" /> - <Label fx:id="endTimeLabel" layoutX="381.0" layoutY="71.0" /> - <Label alignment="CENTER" layoutX="14.0" layoutY="555.0" prefWidth="120.0" styleClass="rect-run" text="Run" AnchorPane.bottomAnchor="28.0" AnchorPane.leftAnchor="14.0" /> - <Label alignment="CENTER" layoutX="140.0" layoutY="555.0" prefWidth="120.0" styleClass="rect-monitorwait" text="Monitor Wait" AnchorPane.bottomAnchor="28.0" AnchorPane.leftAnchor="139.0" /> - <Label alignment="CENTER" layoutX="268.0" layoutY="555.0" prefWidth="120.0" styleClass="rect-monitorcontended" text="Monitor Contended" AnchorPane.bottomAnchor="28.0" AnchorPane.leftAnchor="264.0" /> - <Label alignment="CENTER" layoutX="401.0" layoutY="555.0" prefWidth="120.0" styleClass="rect-threadsleep" text="Sleep" AnchorPane.bottomAnchor="28.0" AnchorPane.leftAnchor="389.0" /> - <Label alignment="CENTER" layoutX="520.0" layoutY="555.0" prefWidth="120.0" styleClass="rect-park" text="Park" AnchorPane.bottomAnchor="28.0" AnchorPane.leftAnchor="514.0" /> - <Label alignment="CENTER" layoutX="140.0" layoutY="578.0" prefWidth="120.0" styleClass="rect-filewrite" text="File Write" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="139.0" /> - <Label alignment="CENTER" layoutX="14.0" layoutY="578.0" prefWidth="120.0" styleClass="rect-fileread" text="File Read" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="14.0" /> - <Label alignment="CENTER" layoutX="341.0" layoutY="578.0" prefWidth="120.0" styleClass="rect-socketwrite" text="Socket Write" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="264.0" /> - <Label alignment="CENTER" layoutX="444.0" layoutY="578.0" prefWidth="120.0" styleClass="rect-socketread" text="Socket Read" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="389.0" /> - <Label alignment="CENTER" layoutX="497.0" layoutY="578.0" prefWidth="120.0" styleClass="rect-fusion" text="Fusion" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="514.0" /> + <GridPane vgap="5.0"> + <columnConstraints> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + </columnConstraints> + <rowConstraints> + <RowConstraints /> + <RowConstraints /> + </rowConstraints> + <children> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-run" text="Run" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-monitorwait" text="Monitor Wait" GridPane.columnIndex="1" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-monitorcontended" text="Monitor Contended" GridPane.columnIndex="2" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-threadsleep" text="Sleep" GridPane.columnIndex="3" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-park" text="Park" GridPane.columnIndex="4" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-filewrite" text="File Write" GridPane.rowIndex="1" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-fileread" text="File Read" GridPane.columnIndex="1" GridPane.rowIndex="1" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-socketwrite" text="Socket Write" GridPane.columnIndex="2" GridPane.rowIndex="1" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-socketread" text="Socket Read" GridPane.columnIndex="3" GridPane.rowIndex="1" /> + <Label alignment="CENTER" prefWidth="120.0" styleClass="rect-fusion" text="Fusion" GridPane.columnIndex="4" GridPane.rowIndex="1" /> + </children> + </GridPane> </children> -</AnchorPane> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </padding> +</VBox>