Skip to content

support multiple java resources #37

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support multiple java resources #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 23 additions & 6 deletions launcher/jnlp/jnlp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"net/url"

launcher_utils "github.com/rocketsoftware/open-web-launch/launcher/utils"
"github.com/rocketsoftware/open-web-launch/settings"
"github.com/rocketsoftware/open-web-launch/utils/log"
)

Expand All @@ -30,8 +31,8 @@ type Resources struct {
JARs []*JAR `xml:"jar,omitempty"`
Properties []Property `xml:"property,omitempty"`
Extensions []*Extension `xml:"extension,omitempty"`
J2SE *J2SE `xml:"j2se,omitempty"`
Java *J2SE `xml:"java,omitempty"` // synonym for j2se
J2SE []J2SE `xml:"j2se,omitempty"`
Java []J2SE `xml:"java,omitempty"` // synonym for j2se
NativeLibs []*NativeLib `xml:"nativelib,omitempty"`
}

Expand Down Expand Up @@ -236,11 +237,27 @@ func (jnlp *JNLP) Title() string {
}

func (resources *Resources) getJ2SE() *J2SE {
if resources.J2SE != nil {
return resources.J2SE
for _, j2seIter := range resources.J2SE {
j2se := &j2seIter
if j2se.versionMatches() {
return j2se
}
}
if resources.Java != nil {
return resources.Java
for _, j2seIter := range resources.Java {
j2se := &j2seIter
if j2se.versionMatches() {
return j2se
}
}

return nil
}

func (j2se *J2SE) versionMatches() bool {
requiredVersion, err := settings.ParseJavaVersion(j2se.Version)
if err != nil {
return false
}

return settings.CurrentJavaVersionMatches(requiredVersion)
}