Skip to content

Commit

Permalink
Merge pull request #71 from IDATT2003-Gruppe-53/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
arelod authored May 27, 2026
2 parents af87542 + 0d6db74 commit 21d0600
Show file tree
Hide file tree
Showing 88 changed files with 7,973 additions and 1,786 deletions.
3 changes: 0 additions & 3 deletions millions/millions.iml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
</component>
<component name="CheckStyle-IDEA-Module" serialisationVersion="2">
<option name="activeLocationsIds" />
</component>
</module>
5 changes: 4 additions & 1 deletion millions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>25.0.2</version>
<version>25.0.1</version>
</dependency>
</dependencies>

Expand All @@ -46,6 +46,9 @@
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>no.ntnu.gruppe53.App</mainClass>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
41 changes: 36 additions & 5 deletions millions/src/main/java/no/ntnu/gruppe53/App.java
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();
}
}
190 changes: 0 additions & 190 deletions millions/src/main/java/no/ntnu/gruppe53/Exchange.java

This file was deleted.

128 changes: 0 additions & 128 deletions millions/src/main/java/no/ntnu/gruppe53/FileHandler.java

This file was deleted.

Loading

0 comments on commit 21d0600

Please sign in to comment.