Skip to content

Commit

Permalink
#31, remove map info filler text
Browse files Browse the repository at this point in the history
  • Loading branch information
RVRX committed Jul 10, 2021
1 parent c5efa98 commit 800df3d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
7 changes: 0 additions & 7 deletions src/main/java/goistreamtoolredux/controller/MapPane.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane;
import javafx.scene.text.Text;
import javafx.util.Duration;

import java.io.File;
Expand Down Expand Up @@ -43,9 +42,6 @@ public class MapPane {
@FXML // fx:id="mapImage"
private ImageView mapImage; // Value injected by FXMLLoader

@FXML // fx:id="mapDetailText"
private Text mapDetailText; // Value injected by FXMLLoader

private String selectedMap;

@FXML
Expand All @@ -65,8 +61,6 @@ void selectMap(ActionEvent event) {
mapFile = new File(FileManager.inputPath + "map_images" + File.separator + selectedMap + ".png");
}
mapImage.setImage(new Image(mapFile.toURI().toString()));
//todo update text, current is concept filler
mapDetailText.setText("Map details for " + selectedMap + " coming in future release.");
}
}

Expand All @@ -79,7 +73,6 @@ void spawnStatusChanged(ActionEvent event) {
void initialize() {
assert mapComboBox != null : "fx:id=\"mapComboBox\" was not injected: check your FXML file 'MapPane.fxml'.";
assert mapImage != null : "fx:id=\"mapImage\" was not injected: check your FXML file 'MapPane.fxml'.";
assert mapDetailText != null : "fx:id=\"mapDetailText\" was not injected: check your FXML file 'MapPane.fxml'.";

try {
//init map combo box
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/goistreamtoolredux/fxml/MapPane.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<?import javafx.geometry.*?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.Text?>
<AnchorPane fx:id="anchorPane" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="goistreamtoolredux.controller.MapPane">
<children>
<HBox prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
Expand Down Expand Up @@ -43,15 +42,6 @@
<Insets left="5.0" right="5.0" top="15.0" />
</HBox.margin>
</VBox>
<VBox prefHeight="200.0" prefWidth="300.0">
<children>
<Text fx:id="mapDetailText" strokeType="OUTSIDE" strokeWidth="0.0" wrappingWidth="290.22900390625">
<VBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="15.0" />
</VBox.margin>
</Text>
</children>
</VBox>
</children>
</HBox>
</children>
Expand Down

0 comments on commit 800df3d

Please sign in to comment.