-
Notifications
You must be signed in to change notification settings - Fork 221
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
Binding expression edition support (no resolution / string only) #279
Open
treilhes
wants to merge
2
commits into
gluonhq:master
Choose a base branch
from
treilhes:feature/BindingExpressionSupport
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
86 changes: 86 additions & 0 deletions
86
kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/BindingExpressionDisabler.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,86 @@ | ||
| /* | ||
| * Copyright (c) 2020, 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 java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import com.oracle.javafx.scenebuilder.kit.metadata.util.PropertyName; | ||
|
|
||
| import javafx.fxml.FXMLLoader; | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| public class BindingExpressionDisabler { | ||
|
|
||
| public static void disable(FXOMDocument fxomDocument) { | ||
| assert fxomDocument != null; | ||
|
|
||
| final List<FXOMObject> candidates = new ArrayList<>(); | ||
| if (fxomDocument.getFxomRoot() != null) { | ||
| candidates.add(fxomDocument.getFxomRoot()); | ||
| } | ||
|
|
||
| while (candidates.isEmpty() == false) { | ||
| final FXOMObject candidate = candidates.get(0); | ||
| candidates.remove(0); | ||
|
|
||
| if (candidate instanceof FXOMInstance) { | ||
| final FXOMInstance inst = (FXOMInstance)candidate; | ||
| final Object sceneGraphObject = inst.getSceneGraphObject(); | ||
|
|
||
| for (Map.Entry<PropertyName, FXOMProperty> e:inst.getProperties().entrySet()) { | ||
| FXOMProperty property = e.getValue(); | ||
| PropertyName propertyName = e.getKey(); | ||
|
|
||
| if (property instanceof FXOMPropertyT) { | ||
| FXOMPropertyT propertyT = (FXOMPropertyT)property; | ||
| if (propertyT.getValue().startsWith(FXMLLoader.BINDING_EXPRESSION_PREFIX)) { | ||
| try { | ||
| propertyName.setValue(sceneGraphObject, propertyT.getValue()); | ||
| } catch (Exception ex) { | ||
| // Let the exception be, the binding expression can't be escaped | ||
| // due to the property type not accepting string value | ||
| // catching the exception allow the process to go on | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| candidates.addAll(candidate.getChildObjects()); | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sure to use 'spaces' instead of 'tabs'. There are multiple other places where tabs have been introduced.