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

fix: enable Scene Builder to load FXML with unresolved imports (#120, #281, #733) #576

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
85723a2
fix: Allows Scene Builder conditionally to load FXML files with
Oliver-Loeffler Oct 2, 2022
6d11253
Renamed the preference 'keep unresolved imports' into 'allow loading …
Oliver-Loeffler Oct 3, 2022
c5880b4
Merged with Scene Builder baseline.
Oliver-Loeffler Oct 3, 2022
acf8460
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Nov 1, 2022
ca92d54
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Apr 6, 2023
1d60439
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Mar 18, 2024
d3f473f
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Mar 27, 2024
d04fef7
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Apr 2, 2024
cbdfd05
Added test to proof that FXOMDocument can load files despite having u…
Oliver-Loeffler Apr 3, 2024
0e05916
Added failing test for FXOMSaver.
Oliver-Loeffler Apr 3, 2024
09ed1d0
Opening, Saving and Save as are working. Also basic editing such as d…
Oliver-Loeffler Apr 4, 2024
fe33457
Editing incl. component browsing works as intended.
Oliver-Loeffler Apr 4, 2024
efe34c4
Added content to the FXOMSaverTest.
Oliver-Loeffler Apr 4, 2024
c05ceb6
Updated license header.
Oliver-Loeffler Apr 4, 2024
1a56caa
Increased log level from FINE to INFO so that file open actions can b…
Oliver-Loeffler Apr 4, 2024
076ea9d
Reworked FXOMRefresher to avoid the detection of unknown imports via …
Oliver-Loeffler Apr 4, 2024
515a84e
Added failing test.
Oliver-Loeffler Apr 4, 2024
908b838
Removed log statements.
Oliver-Loeffler Apr 9, 2024
c74849f
Added missing break statement in switch expression. Formatting.
Oliver-Loeffler Apr 9, 2024
1de1e31
Updated year in header
Oliver-Loeffler Apr 9, 2024
a814fc9
Formatting and license header.
Oliver-Loeffler Apr 9, 2024
2f52ccb
Updated license header.
Oliver-Loeffler Apr 9, 2024
edd76d9
Updated license header.
Oliver-Loeffler Apr 9, 2024
095dc11
Added test for FXOMImportsRemover and replacement/removal mechanism.
Oliver-Loeffler Apr 10, 2024
346a493
Formatting.
Oliver-Loeffler Apr 10, 2024
528b765
Simplified FXOMSaver handling of unresolvable imports.
Oliver-Loeffler Apr 10, 2024
953de94
Removed modification of GlueInstruction (toString()).
Oliver-Loeffler Apr 10, 2024
e599bb4
Updated expectations/asserts of wildcard import test for FXOMSaver.
Oliver-Loeffler Apr 10, 2024
93089b9
Formatting.
Oliver-Loeffler Apr 10, 2024
5847ac1
Organized imports.
Oliver-Loeffler Apr 10, 2024
19028d6
Complex condition moved into separate method.
Oliver-Loeffler Apr 10, 2024
7621fb6
Extracted error handling logic into separate methods.
Oliver-Loeffler Apr 10, 2024
d9dd99a
Added user notifiction in app to indicate missing types / unresolvabl…
Oliver-Loeffler Apr 11, 2024
4a7f937
Reworked dialog title to show file name.
Oliver-Loeffler Apr 11, 2024
0c5b3ef
Formatting
Oliver-Loeffler Apr 11, 2024
ac79601
Corrected typo.
Oliver-Loeffler Apr 11, 2024
8e18795
The missing types notification is now shown per editor window, not as…
Oliver-Loeffler Apr 11, 2024
690765d
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Aug 26, 2024
55f95ab
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Sep 29, 2024
cb6e16e
Updated Surefire version to eliminate JPMS related errors during test.
Oliver-Loeffler Sep 29, 2024
eed9eb8
Merge branch 'master' into issue-120
Oliver-Loeffler Oct 1, 2024
73dddef
Removed duplicate logger instance.
Oliver-Loeffler Oct 1, 2024
a4723e9
Added missing dialog title.
Oliver-Loeffler Oct 1, 2024
2cdcd66
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Oct 2, 2024
00566d5
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Oct 2, 2024
ae88732
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Oct 3, 2024
8094085
Merge branch 'master' into issue-120
jperedadnr Oct 30, 2024
2cbaffc
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Nov 10, 2024
d2114ce
Merge branch 'gluonhq:master' into issue-120
Oliver-Loeffler Dec 22, 2024
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
Prev Previous commit
Next Next commit
Removed modification of GlueInstruction (toString()).
  • Loading branch information
Oliver-Loeffler committed Apr 10, 2024
commit 953de9438695a5334a8f9ba31b4ff1c2826b4682
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*
* Copyright (c) 2017, 2024, Gluon and/or its affiliates.
* Copyright (c) 2012, 2014, Oracle and/or its affiliates.
* All rights reserved. Use is subject to license terms.
*
Expand Down Expand Up @@ -55,9 +54,5 @@ public String getData() {
return data;
}

@Override
public String toString() {
return "GlueInstruction: %s : %s".formatted(String.valueOf(target), String.valueOf(data));
}

}
Loading