Skip to content

Commit 00c5283

Browse files
committed
JBDS-4490 On macOS Fuse Runtime installers let to continue w/o java detected
1 parent 44d57a1 commit 00c5283

6 files changed

Lines changed: 17 additions & 17 deletions

File tree

browser/model/installable-item.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class InstallableItem {
1717
this.productName = requirement.name;
1818
this.productVersion = requirement.version;
1919
this.productDesc = requirement.description;
20+
this.isInstallable = requirement.installable;
2021
this.targetFolderName = targetFolderName;
2122
this.installerDataSvc = installerDataSvc;
2223
this.existingInstall = false;

browser/model/jbossfuse.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,13 @@ class FusePlatformInstall extends InstallableItem {
125125
get javaPath() {
126126
return path.join(this.installerDataSvc.jdkDir(), 'bin', 'java');
127127
}
128+
129+
isConfigurationValid() {
130+
let jdk = this.installerDataSvc.getInstallable('jdk');
131+
return jdk.isConfigured()
132+
&& this.isConfigured()
133+
|| this.isSkipped();
134+
}
128135
}
129136

130137
function installGenerator(jbosseapInstallDir) {

browser/model/jbossfusekaraf.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ class FusePlatformInstallKaraf extends InstallableItem {
7070
return Promise.reject(error);
7171
});
7272
}
73+
74+
isConfigurationValid() {
75+
let jdk = this.installerDataSvc.getInstallable('jdk');
76+
return jdk.isConfigured()
77+
&& this.isConfigured()
78+
|| this.isSkipped();
79+
}
7380
}
7481

7582
function fromJson({installerDataSvc, targetFolderName, downloadUrl, fileName, sha256sum}) {

browser/model/jdk-install.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -203,22 +203,6 @@ class JdkInstall extends InstallableItem {
203203
return super.isConfigured();
204204
}
205205

206-
isDetected() {
207-
if (Platform.getOS() === 'darwin') {
208-
return true;
209-
} else {
210-
return super.isDetected();
211-
}
212-
}
213-
214-
isNotDetected() {
215-
if (Platform.getOS() === 'darwin') {
216-
return false;
217-
} else {
218-
return super.isNotDetected();
219-
}
220-
}
221-
222206
isDisabled() {
223207
return !this.hasOption('detected') && (this.references > 0)
224208
|| this.hasOption('detected') && !this.option.detected.valid

browser/pages/confirm/controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class ConfirmController {
8383
if(installer.isSelected()) {
8484
for(let dep of graph.dependenciesOf(node)) {
8585
let depInstaller = checkboxModel[dep];
86-
if(depInstaller.references === 0 && depInstaller.isNotDetected()) {
86+
if(depInstaller.isInstallable && depInstaller.references === 0 && depInstaller.isNotDetected()) {
8787
depInstaller.selectedOption = 'install';
8888
}
8989
depInstaller.references++;

requirements.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
"sha256sum": "",
132132
"version": "1.8.0",
133133
"virusTotalReport": "",
134+
"defaultOption": "detected",
134135
"messages": {
135136
"dependency": {
136137
"message": "Due to licence limitations we may not install Java for you. Please install JDK version 1.8.0 downloaded from this location and restart the Installer to continue.",

0 commit comments

Comments
 (0)