Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #238 - Rename App to DesktopApplication #246

Merged
merged 1 commit into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.4</version>
<configuration>
<mainClass>com.manorrock.sphynx.desktop.App</mainClass>
<mainClass>com.manorrock.sphynx.desktop.DesktopApplication</mainClass>
</configuration>
<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import java.io.IOException;

/**
* JavaFX App
* JavaFX DesktopApplication
*/
public class App extends Application {
public class DesktopApplication extends Application {

private static Scene scene;

Expand All @@ -27,7 +27,7 @@ static void setRoot(String fxml) throws IOException {
}

private static Parent loadFXML(String fxml) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(App.class.getResource(fxml + ".fxml"));
FXMLLoader fxmlLoader = new FXMLLoader(DesktopApplication.class.getResource(fxml + ".fxml"));
return fxmlLoader.load();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ public class PrimaryController {

@FXML
private void switchToSecondary() throws IOException {
App.setRoot("secondary");
DesktopApplication.setRoot("secondary");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ public class SecondaryController {

@FXML
private void switchToPrimary() throws IOException {
App.setRoot("primary");
DesktopApplication.setRoot("primary");
}
}
Loading