branch master-2.x updated (f715774 -> 9e7f68a)
This is an automated email from the git hooks/post-receive script. New change to branch master-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git from f715774 Merge branch 'release/2.23.1' adds c7c20f1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d8eeef2 Merge branch 'master' into develop adds 7316b23 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 0b0b6c5 Version 3.0 here we come\! adds 704b88f refs #2645 upgrade jdk level in project adds ba6ea6f fixes #2645: Update jdk level to 1.7 Merge branch 'feature/2645' into develop adds a3fba0e refs #3667 can now skip method body parse adds 55fe629 fixes #3667: Parser only that is necessary in java files Merge branch 'feature/3667' into develop adds 67396a6 refs #3668 can now use diamond syntax in field declarations adds 738b17c fixes #3668: Allow to use Diamond in java files Merge branch 'feature/3668' into develop adds da06f94 on jaxx 2.x, jdk still stay in level 6 + reset 2.x version adds 1691d5e Add the property in the converter to display zero when null values (refs #3677) adds 7ae9ea0 Add displayZeroWhenNull property in absolute API (refs #3677) adds 6f9b277 Add displayZeroWhenNull property in signed API (refs #3677) adds 133f5e4 make the changes of property displayZeroWhenNull javabean (refs #3677) adds 6566c85 add to demo (refs #3677) adds a06ad34 Be able to display zero in coordinate componant editors for null values (fixes #3677) Merge branch 'feature/3677' into support/2.x adds 333683b jaxx-compiler tests are using jdk7 api adds c5516e1 Can now specify components to accept by their type (refs #3678) adds c22f719 use pom 1.8.3 and configure this branch as support for jaxx 2.x adds e501cf7 add license headers adds 8523410 [jgitflow-maven-plugin]updating poms for branch'release/2.24' with non-snapshot versions adds 9e7f68a Merge branch 'release/2.24' into master-2.x No new revisions were added by this update. Summary of changes: jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 13 +- .../java/jaxx/compiler/java/parser/JavaParser.java | 114 +++++++++++++++- .../ClassDescriptorResolverFromJavaFile.java | 14 +- .../jaxx/compiler/java/parser/JavaParserTest.java | 128 ++++++++++++++++++ jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- .../jaxx/widgets/gis/CoordinatesEditorDemo.css | 6 + .../jaxx/widgets/gis/CoordinatesEditorDemo.jaxx | 1 + .../main/resources/i18n/jaxx-demo_en_GB.properties | 1 + .../main/resources/i18n/jaxx-demo_es_ES.properties | 1 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 1 + jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- .../java/jaxx/runtime/swing/BlockingLayerUI.java | 143 +++++++++++---------- jaxx-validator/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- .../jaxx/widgets/gis/DdCoordinateConverter.java | 15 ++- .../jaxx/widgets/gis/DmdCoordinateConverter.java | 18 ++- .../jaxx/widgets/gis/DmsCoordinateConverter.java | 18 ++- .../gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 1 + .../AbsoluteDdCoordinateEditorHandler.java | 27 ++++ .../gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 1 + .../AbsoluteDmdCoordinateEditorHandler.java | 27 ++++ .../gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 1 + .../AbsoluteDmsCoordinateEditorHandler.java | 29 ++++- .../widgets/gis/absolute/CoordinatesEditor.css | 6 + .../widgets/gis/absolute/CoordinatesEditor.jaxx | 2 + .../gis/absolute/CoordinatesEditorModel.java | 48 +++++++ .../gis/signed/SignedDdCoordinateEditor.jaxx | 1 + .../signed/SignedDdCoordinateEditorHandler.java | 28 ++++ .../gis/signed/SignedDmdCoordinateEditor.jaxx | 1 + .../signed/SignedDmdCoordinateEditorHandler.java | 28 ++++ .../gis/signed/SignedDmsCoordinateEditor.jaxx | 1 + .../signed/SignedDmsCoordinateEditorHandler.java | 28 ++++ jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- pom.xml | 8 +- 43 files changed, 623 insertions(+), 115 deletions(-) create mode 100644 jaxx-compiler/src/test/java/jaxx/compiler/java/parser/JavaParserTest.java -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm