@@ -78,7 +78,7 @@ static class ListInstalled extends CmdBase {
7878 public Integer call () {
7979 JdkManager manager = JdkManager .create ();
8080 manager .getOrInstallJdk ("11+" );
81- List <Jdk > jdks = manager .listInstalledJdks ();
81+ List <Jdk . InstalledJdk > jdks = manager .listInstalledJdks ();
8282 jdks .sort (Comparator .<Jdk >naturalOrder ().reversed ());
8383
8484 AsciiTable at = new AsciiTable ();
@@ -87,7 +87,7 @@ public Integer call() {
8787 at .addRule ();
8888 at .addRow ("V" , "Version" , "Id" , "Provider" , "Home" );
8989 at .addRule ();
90- for (Jdk jdk : jdks ) {
90+ for (Jdk . InstalledJdk jdk : jdks ) {
9191 at .addRow (
9292 jdk .majorVersion (),
9393 jdk .version (),
@@ -111,7 +111,7 @@ static class ListAvailable extends CmdBase {
111111 public Integer call () {
112112 System .err .println ("Retrieving available Java versions, this can take a moment..." );
113113 JdkManager manager = JdkManager .create ();
114- List <Jdk > jdks = manager .listAvailableJdks ();
114+ List <Jdk . AvailableJdk > jdks = manager .listAvailableJdks ();
115115 jdks .sort (Comparator .<Jdk >naturalOrder ().reversed ());
116116
117117 AsciiTable at = new AsciiTable ();
@@ -120,7 +120,7 @@ public Integer call() {
120120 at .addRule ();
121121 at .addRow ("V" , "Version" , "Id" , "Provider" );
122122 at .addRule ();
123- for (Jdk jdk : jdks ) {
123+ for (Jdk . AvailableJdk jdk : jdks ) {
124124 at .addRow (jdk .majorVersion (), jdk .version (), jdk .id (), jdk .provider ().name ());
125125 }
126126 at .addRule ();
@@ -193,7 +193,9 @@ public Integer call() {
193193 return 2 ;
194194 }
195195 }
196- jdk .install ();
196+ if (jdk .isInstalled ()) {
197+ ((Jdk .AvailableJdk ) jdk ).install ();
198+ }
197199 if (!quiet ) {
198200 System .err .println ("Successfully installed Java version " + versionOrId );
199201 }
@@ -216,7 +218,8 @@ void setJavaVersion(String versionOrId) {
216218 @ Override
217219 public Integer call () {
218220 JdkManager jdkMan = JdkManager .create ();
219- Jdk jdk = jdkMan .getInstalledJdk (versionOrId , JdkProvider .Predicates .canUpdate );
221+ Jdk .InstalledJdk jdk =
222+ jdkMan .getInstalledJdk (versionOrId , JdkProvider .Predicates .canUpdate );
220223 if (jdk == null ) {
221224 System .err .println ("Java version not installed: " + versionOrId );
222225 return 1 ;
@@ -294,7 +297,8 @@ public Integer call() throws IOException {
294297 return 0 ;
295298 }
296299 JdkManager jdkMan = JdkManager .create ();
297- Jdk jdk = jdkMan .getOrInstallJdk (javaVersionOptionMixin .getVersionOrId (quiet ));
300+ Jdk .InstalledJdk jdk =
301+ jdkMan .getOrInstallJdk (javaVersionOptionMixin .getVersionOrId (quiet ));
298302 if (Paths .get (cmd .get (0 )).getNameCount () == 1 ) {
299303 Path cmdPath = OsUtils .searchPath (cmd .get (0 ), jdk .home ().resolve ("bin" ).toString ());
300304 if (cmdPath != null ) {
0 commit comments