Skip to content

Commit

Permalink
minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dhuson committed Mar 10, 2024
1 parent 3e66196 commit ee7bb12
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/main/java/splitstree6/window/MainWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public MainWindow() {
.and(Bindings.createBooleanBinding(() -> getTabByClass(InputEditorTab.class) == null, controller.getMainTabPane().getTabs())));

final MemoryUsage memoryUsage = MemoryUsage.getInstance();
controller.getMemoryLabel().textProperty().bind(memoryUsage.memoryUsageStringProperty());
controller.getMemoryUsageLabel().textProperty().bind(memoryUsage.memoryUsageStringProperty());

methodsTab = new DisplayTextTab(this, "How to Cite", false);
methodsTab.setGraphic(MaterialIcons.graphic("notes"));
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/splitstree6/window/MainWindowController.java
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ public class MainWindowController {
private FlowPane bottomFlowPane;

@FXML
private Label memoryLabel;
private Label memoryUsageLabel;

@FXML
private MenuButton fileMenuButton;
Expand Down Expand Up @@ -499,7 +499,7 @@ void initialize() {
menuBar.setVisible(false);
topVBox.setPadding(new Insets(30, 0, 0, 0));
((Pane) fileMenuButton.getParent()).getChildren().remove(fileMenuButton);
((Pane) memoryLabel.getParent()).getChildren().remove(memoryLabel);
((Pane) memoryUsageLabel.getParent()).getChildren().remove(memoryUsageLabel);
}
analyzeGenomesMenuItem.getParentMenu().getItems().remove(analyzeGenomesMenuItem); // todo: will make this a standalone program

Expand Down Expand Up @@ -1116,8 +1116,8 @@ public FlowPane getBottomFlowPane() {
return bottomFlowPane;
}

public Label getMemoryLabel() {
return memoryLabel;
public Label getMemoryUsageLabel() {
return memoryUsageLabel;
}

public SplittableTabPane getAlgorithmTabPane() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/splitstree6/window/MainWindow.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@
<HBox.margin>
<Insets/>
</HBox.margin>
<Label fx:id="memoryLabel" alignment="CENTER_RIGHT" text="Memory" textFill="DARKGRAY">
<Label fx:id="memoryUsageLabel" alignment="CENTER_RIGHT" text="Memory" textFill="DARKGRAY">
<font>
<Font size="12.0"/>
</font>
Expand Down

0 comments on commit ee7bb12

Please sign in to comment.