diff --git a/src/main/java/Main.java b/src/main/java/Main.java index a42c84b..021e0fb 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -6,6 +6,9 @@ import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; +import model.SceneCode; + +import java.io.InputStream; /** @@ -13,14 +16,20 @@ import javafx.stage.Stage; */ public class Main extends Application { + private Stage primaryStage; + public void start(Stage stage) throws Exception { + this.primaryStage = stage; + replaceSceneContent(SceneCode.MAIN); + + //FXMLLoader loader = new FXMLLoader(getClass().getResource("scenes/main.fxml")); - FXMLLoader loader = new FXMLLoader(getClass().getResource("scenes/main.fxml")); - Parent root = loader.load(); - Scene scene = new Scene(root, 500, 400); + //Parent root = loader.load(); + //Scene scene = new Scene(root, 500, 400); stage.setTitle("UC RSS"); - stage.setScene(scene); + //stage.setScene(scene); stage.show(); + } /** @@ -31,19 +40,20 @@ public class Main extends Application { */ public Initializable replaceSceneContent(SceneCode fxml) throws Exception { FXMLLoader loader = new FXMLLoader(); - InputStream in = getClass().getClassLoader().getResourceAsStream(fxml.getFilePath()); + InputStream in = getClass().getClassLoader().getResourceAsStream(fxml.getPath()); Parent page; try { page = (Parent) loader.load(in); } finally { in.close(); } - while(mainContainer.getChildren().size() > 1) { - mainContainer.getChildren().remove(1); + Scene scene = null; + if (fxml.isLoadMenu()){ + + }else { + scene = new Scene(page, SceneCode.prefWidth, SceneCode.prefHeight); } - mainContainer.getChildren().add(page); - //change session code to fit with the serialisation - session.setSceneDisplayed(fxml); + primaryStage.setScene(scene); return (Initializable) loader.getController(); } } diff --git a/src/main/java/model/SceneCode.java b/src/main/java/model/SceneCode.java index 54f7d5e..51cd8ac 100644 --- a/src/main/java/model/SceneCode.java +++ b/src/main/java/model/SceneCode.java @@ -1,8 +1,38 @@ package model; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; + +import java.io.IOException; +import java.io.InputStream; + /** * Created by fwy13 on 4/04/17. */ public enum SceneCode { - MAIN() + MAIN("main", false); + + private String path; + private boolean loadMenu; + public static int prefWidth = 1200; + public static int prefHeight = 900; + + SceneCode(String path){ + this(path, true); + } + + SceneCode(String path, boolean loadMenu){ + this.path = path; + this.loadMenu = loadMenu; + } + + public String getPath() { + return path; + } + + public boolean isLoadMenu() { + return loadMenu; + } + } diff --git a/src/main/java/model/Session.java b/src/main/java/model/Session.java new file mode 100644 index 0000000..4c26079 --- /dev/null +++ b/src/main/java/model/Session.java @@ -0,0 +1,13 @@ +package model; + +/** + * Created by fwy13 on 4/04/17. + */ +public class Session { + + private String userCode;//this is like fwy13 + + public Session(){ + + } +} diff --git a/src/main/resources/RSS_db b/src/main/resources/RSS_db new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/Main.class b/target/classes/Main.class index b72996b..d894932 100644 Binary files a/target/classes/Main.class and b/target/classes/Main.class differ diff --git a/target/classes/RSS_db b/target/classes/RSS_db new file mode 100644 index 0000000..e69de29 diff --git a/target/classes/model/SceneCode.class b/target/classes/model/SceneCode.class new file mode 100644 index 0000000..38afcd2 Binary files /dev/null and b/target/classes/model/SceneCode.class differ diff --git a/target/classes/model/Session.class b/target/classes/model/Session.class new file mode 100644 index 0000000..8fbf724 Binary files /dev/null and b/target/classes/model/Session.class differ diff --git a/target/classes/main.fxml b/target/classes/scenes/main.fxml similarity index 100% rename from target/classes/main.fxml rename to target/classes/scenes/main.fxml