Skip to content
Snippets Groups Projects
Commit ea8816e6 authored by Tomas Beranek's avatar Tomas Beranek
Browse files

refactor: package names changed to right format

parent 37dcd283
No related branches found
No related tags found
2 merge requests!5Merging simulation branch with main branch,!4Merging Main branch with Simulation branch
Showing
with 3 additions and 6 deletions
...@@ -11,17 +11,14 @@ import edu.ntnu.idatt2001.Wargames.battlesimulation.specificunits.Unit; ...@@ -11,17 +11,14 @@ import edu.ntnu.idatt2001.Wargames.battlesimulation.specificunits.Unit;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import java.io.IOException; import java.io.IOException;
import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.ResourceBundle;
/** /**
* class used for battle simulations between to armies * class used for battle simulations between to armies
...@@ -347,7 +344,7 @@ public class SimulationViewController { ...@@ -347,7 +344,7 @@ public class SimulationViewController {
* @return The image if found * @return The image if found
*/ */
private Image getImageByName(String imageName) { private Image getImageByName(String imageName) {
return new Image("/TerrainPictures/" + imageName + ".jpg"); return new Image("/terrainpictures/" + imageName + ".jpg");
} }
/** /**
......
...@@ -21,7 +21,7 @@ public class SwitchScene { ...@@ -21,7 +21,7 @@ public class SwitchScene {
* @throws IOException when path not found * @throws IOException when path not found
*/ */
public static void switchScene(String location, Event event) throws IOException { public static void switchScene(String location, Event event) throws IOException {
Parent viewPage = FXMLLoader.load(Objects.requireNonNull(SwitchScene.class.getResource("/ViewClasses/" Parent viewPage = FXMLLoader.load(Objects.requireNonNull(SwitchScene.class.getResource("/viewclasses/"
+ location + ".fxml"))); + location + ".fxml")));
Stage stage = (Stage) ((Node)event.getSource()).getScene().getWindow(); Stage stage = (Stage) ((Node)event.getSource()).getScene().getWindow();
......
...@@ -25,7 +25,7 @@ public class WarGamesGUI extends Application { ...@@ -25,7 +25,7 @@ public class WarGamesGUI extends Application {
*/ */
@Override @Override
public void start(Stage stage) throws Exception { public void start(Stage stage) throws Exception {
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/ViewClasses/MainPageView.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/viewclasses/MainPageView.fxml"));
Scene scene = new Scene(fxmlLoader.load()); Scene scene = new Scene(fxmlLoader.load());
stage.setMinWidth(820); stage.setMinWidth(820);
stage.setMinHeight(640); stage.setMinHeight(640);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment