-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #71 from IDATT2003-Gruppe-53/develop
Develop
- Loading branch information
Showing
88 changed files
with
7,973 additions
and
1,786 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,41 @@ | ||
| package no.ntnu.gruppe53; | ||
|
|
||
| import javafx.application.Application; | ||
| import javafx.stage.Stage; | ||
| import no.ntnu.gruppe53.controller.StartViewController; | ||
| import no.ntnu.gruppe53.controller.ViewController; | ||
| import no.ntnu.gruppe53.view.StartView; | ||
|
|
||
| /** | ||
| * Hello world! | ||
| * Represents the main app of the application. | ||
| * | ||
| * <p>Sets up necessary components and shows the first view | ||
| * of the application: {@link StartView}.</p> | ||
| */ | ||
| public class App { | ||
| public static void main(String[] args) { | ||
| System.out.println("Hello World!"); | ||
| } | ||
| public class App extends Application { | ||
| @Override | ||
| public void start(Stage stage) { | ||
| ViewController vm = new ViewController(stage); | ||
|
|
||
| StartView startView = new StartView(vm); | ||
|
|
||
| new StartViewController(startView, vm); | ||
|
|
||
|
|
||
| vm.addView("start", startView); | ||
|
|
||
| vm.switchView("start"); | ||
|
|
||
| stage.setTitle("Millions - the Stock Game"); | ||
| stage.show(); | ||
| } | ||
|
|
||
| /** | ||
| * Launches the program. | ||
| * | ||
| * @param args arguments | ||
| */ | ||
| static void main(String[] args) { | ||
| launch(); | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
128 changes: 0 additions & 128 deletions
128
millions/src/main/java/no/ntnu/gruppe53/FileHandler.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.