-
-
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.
Fixes #240 - Refactory PrimaryController into its own component
- Loading branch information
Showing
6 changed files
with
88 additions
and
57 deletions.
There are no files selected for viewing
55 changes: 55 additions & 0 deletions
55
desktop/src/main/java/com/manorrock/sphynx/desktop/AutomationsWindow.java
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 |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, | ||
* this list of conditions and the following disclaimer. | ||
* 2. Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in the | ||
* documentation and/or other materials provided with the distribution. | ||
* 3. Neither the name of the copyright holder nor the names of its | ||
* contributors may be used to endorse or promote products derived from | ||
* this software without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
package com.manorrock.sphynx.desktop; | ||
|
||
import java.io.IOException; | ||
import javafx.fxml.FXMLLoader; | ||
import javafx.scene.layout.BorderPane; | ||
|
||
/** | ||
* The Automations Window. | ||
* | ||
* @author Manfred Riem ([email protected]) | ||
*/ | ||
public class AutomationsWindow extends BorderPane { | ||
|
||
/** | ||
* Constructor. | ||
*/ | ||
public AutomationsWindow() { | ||
try { | ||
FXMLLoader loader = new FXMLLoader(); | ||
loader.setRoot(this); | ||
loader.setController(this); | ||
loader.load(getClass().getResourceAsStream( | ||
"/com/manorrock/sphynx/desktop/AutomationsWindow.fxml")); | ||
} catch (IOException ioe) { | ||
ioe.printStackTrace(); | ||
} | ||
} | ||
} |
46 changes: 31 additions & 15 deletions
46
desktop/src/main/java/com/manorrock/sphynx/desktop/DesktopApplication.java
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,33 +1,49 @@ | ||
/* | ||
* Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, | ||
* this list of conditions and the following disclaimer. | ||
* 2. Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in the | ||
* documentation and/or other materials provided with the distribution. | ||
* 3. Neither the name of the copyright holder nor the names of its | ||
* contributors may be used to endorse or promote products derived from | ||
* this software without specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
* POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
package com.manorrock.sphynx.desktop; | ||
|
||
import javafx.application.Application; | ||
import javafx.fxml.FXMLLoader; | ||
import javafx.scene.Parent; | ||
import javafx.scene.Scene; | ||
import javafx.stage.Stage; | ||
|
||
import java.io.IOException; | ||
|
||
/** | ||
* JavaFX DesktopApplication | ||
* The Sphynx Desktop application. | ||
* | ||
* @author Manfred Riem ([email protected]) | ||
*/ | ||
public class DesktopApplication extends Application { | ||
|
||
private static Scene scene; | ||
|
||
@Override | ||
public void start(Stage stage) throws IOException { | ||
scene = new Scene(loadFXML("primary"), 640, 480); | ||
Scene scene = new Scene(new AutomationsWindow(), 640, 480); | ||
stage.setScene(scene); | ||
stage.show(); | ||
} | ||
|
||
static void setRoot(String fxml) throws IOException { | ||
scene.setRoot(loadFXML(fxml)); | ||
} | ||
|
||
private static Parent loadFXML(String fxml) throws IOException { | ||
FXMLLoader fxmlLoader = new FXMLLoader(DesktopApplication.class.getResource(fxml + ".fxml")); | ||
return fxmlLoader.load(); | ||
} | ||
} |
12 changes: 0 additions & 12 deletions
12
desktop/src/main/java/com/manorrock/sphynx/desktop/PrimaryController.java
This file was deleted.
Oops, something went wrong.
12 changes: 0 additions & 12 deletions
12
desktop/src/main/java/com/manorrock/sphynx/desktop/SecondaryController.java
This file was deleted.
Oops, something went wrong.
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
16 changes: 0 additions & 16 deletions
16
desktop/src/main/resources/com/manorrock/sphynx/desktop/secondary.fxml
This file was deleted.
Oops, something went wrong.