-
Notifications
You must be signed in to change notification settings - Fork 221
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3d04752
commit 3b2e343
Showing
10 changed files
with
378 additions
and
17 deletions.
There are no files selected for viewing
61 changes: 61 additions & 0 deletions
61
kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXMLPropertiesDisabler.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,61 @@ | ||
| /* | ||
| * Copyright (c) 2021, Gluon and/or its affiliates. | ||
| * All rights reserved. Use is subject to license terms. | ||
| * | ||
| * This file is available and licensed under the following license: | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * | ||
| * - Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * - 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. | ||
| * - Neither the name of Oracle Corporation 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 | ||
| * OWNER 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.oracle.javafx.scenebuilder.kit.fxom; | ||
|
|
||
| class FXMLPropertiesDisabler { | ||
|
|
||
| /** | ||
| * | ||
| * On MacOS, when loading a FXML with a menu bar where useSystemMenuBarProperty() | ||
| * is enabled, the menu in the FXML will hide the menu of SceneBuilder. | ||
| * In this case, SceneBuilder becomes unusable. | ||
| * | ||
| * Setting the property here to false has the advantage, that the FXML to be saved | ||
| * will still contain the defined property BUT the SceneBuilder menu bar will remain | ||
| * visible. | ||
| * | ||
| * The modification of properties which are not desired to be active while | ||
| * editing must happen before loading the FXML using the FXMLLoader. | ||
| * | ||
| * Here a disconnect between the FXOM and FXML is created as the state of the | ||
| * useSystemMenuBarProperty is now different in both models. | ||
| * | ||
| * @param fxmlText FXML source to be modified | ||
| * @return FXML source with all properties disabled (=false) where WYSIWYG editing is not suitable. | ||
| * | ||
| */ | ||
| public String disableUseSystemMenuBarProperty(String fxmlText) { | ||
| return fxmlText.replace("useSystemMenuBar=\"true\"", | ||
| "useSystemMenuBar=\"false\""); | ||
| } | ||
|
|
||
| } |
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
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
59 changes: 59 additions & 0 deletions
59
kit/src/test/java/com/oracle/javafx/scenebuilder/kit/fxom/FXMLPropertiesDisablerTest.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,59 @@ | ||
| /* | ||
| * Copyright (c) 2021, Gluon and/or its affiliates. | ||
| * All rights reserved. Use is subject to license terms. | ||
| * | ||
| * This file is available and licensed under the following license: | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * | ||
| * - Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * - 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. | ||
| * - Neither the name of Oracle Corporation 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 | ||
| * OWNER 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.oracle.javafx.scenebuilder.kit.fxom; | ||
|
|
||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import java.io.File; | ||
| import java.nio.file.Files; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| public class FXMLPropertiesDisablerTest { | ||
|
|
||
| private FXMLPropertiesDisabler classUnderTest = new FXMLPropertiesDisabler(); | ||
|
|
||
| @Test | ||
| public void that_property_value_is_set_to_false() throws Exception { | ||
| String fxmlText = readResourceText("ContainerWithMenu_SystemMenuBarEnabled.fxml"); | ||
| assertTrue("ensures that test resource is correct", | ||
| fxmlText.contains("<MenuBar useSystemMenuBar=\"true\" VBox.vgrow=\"NEVER\" fx:id=\"theMenuBar\">")); | ||
| String modfiedFxmlText = classUnderTest.disableUseSystemMenuBarProperty(fxmlText); | ||
| assertTrue(modfiedFxmlText.contains("<MenuBar useSystemMenuBar=\"false\" VBox.vgrow=\"NEVER\" fx:id=\"theMenuBar\">")); | ||
| } | ||
|
|
||
| private String readResourceText(String resourceName) throws Exception { | ||
| File fxmlFileName = new File(getClass().getResource(resourceName).toURI()); | ||
| return Files.readString(fxmlFileName.toPath()); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.