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

[NETBEANS-2751] OpenJFX Samples #1503

Merged
merged 2 commits into from Sep 15, 2019

Conversation

@geertjanw
Copy link
Member

geertjanw commented Sep 14, 2019

This does the following:

  • Integrates the OpenJFX Gluon samples correctly, using their new 0.0.3 release.
  • Restructures the Samples category in the New Project dialog in "Java with Maven" and "Java with Ant", just like the project types were organized in that way in 11.1.
  • Tries to hide the Ant-based JavaFX samples a bit, since we want to encourage the usage of Maven rather than Ant, i.e., in the same way as the project types at the top of the dialog prioritize Maven, now the samples do as well.
  • Removes the module that was added in 11.1 that did not optimally integrate the OpenJFX Gluon samples. (Only the module needed to be removed, not the references to it in cluster.properties and elsewhere, since these were not in main to begin with, only in release111 and never moved to main.)
Geertjan Wielenga
@geertjanw

This comment has been minimized.

Copy link
Member Author

geertjanw commented Sep 14, 2019

Screen Shot 2019-09-14 at 20 39 33

That's the new structure in the Samples category from this pull request.

@geertjanw geertjanw added the NB11.2 label Sep 14, 2019
@geertjanw

This comment has been minimized.

Copy link
Member Author

geertjanw commented Sep 14, 2019

This should go into 11.2, hope my adding the nb11.2 label helps to achieve that.

Copy link
Contributor

matthiasblaesing left a comment

With a minor comment (see inline) this looks good

<folder name="Standard">
<folder name="JavaFX">
<attr name="position" intvalue="110"/>
<attr name="displayName" bundlevalue="org.netbeans.modules.javafx2.samples.Bundle#Templates/Project/Samples/JavaFX"/>

This comment has been minimized.

Copy link
@matthiasblaesing

matthiasblaesing Sep 14, 2019

Contributor

This bundle value does not exist anymore. See the change in Bundle.properties, line 25:

Geertjan Wielenga
@geertjanw

This comment has been minimized.

Copy link
Member Author

geertjanw commented Sep 14, 2019

Thanks, fixed.

@geertjanw

This comment has been minimized.

Copy link
Member Author

geertjanw commented Sep 14, 2019

Also thanks for liking and approving it.

@geertjanw

This comment has been minimized.

Copy link
Member Author

geertjanw commented Sep 15, 2019

I don’t think this is a fundamental change, just a little bit of reorganization, i.e., a lot of debate and discussion is not needed for this one (correct me if I am wrong and reopen if applicable) and so I am merging this now.

@geertjanw geertjanw merged commit f5cbe38 into apache:master Sep 15, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@junichi11 junichi11 added this to the 11.2 milestone Sep 15, 2019
@JaroslavTulach

This comment has been minimized.

Copy link
Contributor

JaroslavTulach commented Sep 16, 2019

Thanks for removing the javafx/openjfx.samples module.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.