Skip to content

Commit 4da1043

Browse files
akaromlakaroml
authored
Separate configure and install (#176)
Signed-off-by: Rome Li <[email protected]>
1 parent 5b955f6 commit 4da1043

File tree

2 files changed

+130
-115
lines changed

2 files changed

+130
-115
lines changed

‎src/java-runtime/assets/index.html‎

Lines changed: 111 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -8,117 +8,130 @@
88
</head>
99

1010
<body>
11-
<div class="container mt-5 mb-5">
12-
<div class="row mb-3 d-none">
13-
<div class="col">
14-
<h1>Configure Java Runtime</h1>
15-
</div>
11+
<div class="container mt-5 mb-5">
12+
<div class="row mb-3">
13+
<div class="col">
14+
<h1>Java Development Kit</h1>
1615
</div>
17-
<div class="row mb-3" id="javaRuntimePanel">
18-
<div class="col">
19-
<div class="card">
20-
<div class="card-body">
21-
<h4 class="alert-heading">Java Development Kit Required</h4>
22-
<p>
23-
Java Development Kit (JDK) 8 or later is required for developing Java applications. The path to the JDK is searched in the following order:
24-
</p>
25-
<div id="javaRuntimeEntryPanel"></div>
26-
<p class="d-none">
27-
⚠️ No JDK installation was detected. Please follow the links below to download and install JDK:
28-
</p>
29-
<p class="d-none">
30-
<a href="#">Install extra JDKs</a>
31-
</p>
32-
<ul class="nav nav-tabs mb-3" id="jdkSourceTab" role="tablist">
33-
<li class="nav-item">
34-
<a class="nav-link active" id="adoptOpenJdkTab" data-toggle="tab" href="#adoptOpenJdkPanel" role="tab" aria-controls="adoptOpenJdkPanel" aria-selected="true" title="Reliable source of OpenJDK binaries for all platforms">AdoptOpenJDK</a>
35-
</li>
36-
<li class="nav-item">
37-
<a class="nav-link" id="otherJdkTab" data-toggle="tab" href="#otherJdkPanel" role="tab" aria-controls="otherJdkPanel" aria-selected="false" title="Other choices">Others</a>
38-
</li>
39-
</ul>
40-
<div class="tab-content" id="myTabContent">
41-
<div class="tab-pane fade show active" id="adoptOpenJdkPanel" role="tabpanel" aria-labelledby="adoptOpenJdkTab">
42-
<form>
43-
<div class="form-row align-items-center">
44-
<div class="form-group col mb-1">
45-
<h6 class="text-capitalize mb-2">
46-
Download for
47-
<span id="jdkOs">windows</span>
48-
<span id="jdkArch">x64</span>
49-
</h6>
50-
</div>
51-
</div>
52-
<div class="form-row">
53-
<div class="form-group col-sm-6">
54-
<label>JDK Version:</label>
55-
<div class="form-check">
56-
<input class="form-check-input" type="radio" name="jdkVersion" id="openjdk8Radio" value="openjdk8">
57-
<label class="form-check-label" for="openjdk8Radio">
58-
OpenJDK 8
59-
</label>
60-
</div>
61-
<div class="form-check">
62-
<input class="form-check-input" type="radio" name="jdkVersion" id="openjdk11Radio" value="openjdk11" checked>
63-
<label class="form-check-label" for="openjdk11Radio">
64-
OpenJDK 11
65-
</label>
66-
</div>
67-
<div class="form-check">
68-
<input class="form-check-input" type="radio" name="jdkVersion" id="openjdk12Radio" value="openjdk12">
69-
<label class="form-check-label" for="openjdk12Radio">
70-
OpenJDK 12 (Technical Preview)
71-
</label>
16+
</div>
17+
<div class="row">
18+
<div class="col">
19+
<div class="row mb-3">
20+
<div class="col">
21+
<h3 class="font-weight-light">Configure</h3>
22+
<p>
23+
Java Development Kit (JDK) 8 or later is required for developing Java applications. The path to the JDK is searched in the following order:
24+
</p>
25+
<div class="card">
26+
<div class="card-body">
27+
<div id="javaRuntimeEntryPanel"></div>
28+
</div>
29+
</div>
30+
</div>
31+
</div>
32+
<div class="row mb-3">
33+
<div class="col">
34+
<h3 class="font-weight-light">Install</h3>
35+
<p>
36+
⚠️ No JDK installation was detected. Please follow the links below to download and install JDK:
37+
</p>
38+
<p class="d-none">
39+
<a href="#">Install extra JDKs</a>
40+
</p>
41+
<div class="card">
42+
<div class="card-body">
43+
<ul class="nav nav-tabs mb-3" id="jdkSourceTab" role="tablist">
44+
<li class="nav-item">
45+
<a class="nav-link active" id="adoptOpenJdkTab" data-toggle="tab" href="#adoptOpenJdkPanel" role="tab" aria-controls="adoptOpenJdkPanel" aria-selected="true" title="Reliable source of OpenJDK binaries for all platforms">AdoptOpenJDK</a>
46+
</li>
47+
<li class="nav-item">
48+
<a class="nav-link" id="otherJdkTab" data-toggle="tab" href="#otherJdkPanel" role="tab" aria-controls="otherJdkPanel" aria-selected="false" title="Other choices">Others</a>
49+
</li>
50+
</ul>
51+
<div class="tab-content" id="jdkTabContent">
52+
<div class="tab-pane fade show active" id="adoptOpenJdkPanel" role="tabpanel" aria-labelledby="adoptOpenJdkTab">
53+
<form>
54+
<div class="form-row align-items-center">
55+
<div class="form-group col mb-1">
56+
<h6 class="text-capitalize mb-2">
57+
Download for
58+
<span id="jdkOs">windows</span>
59+
<span id="jdkArch">x64</span>
60+
</h6>
7261
</div>
7362
</div>
74-
<div class="form-group col-sm-6">
75-
<label>JVM:</label>
76-
<div class="form-check">
77-
<input class="form-check-input" type="radio" name="jvmImpl" id="hotspotRadio" value="hotspot" checked>
78-
<label class="form-check-label" for="hotspotRadio">
79-
Hotspot (Recommended)
80-
</label>
63+
<div class="form-row">
64+
<div class="form-group col-sm-6">
65+
<label>JDK Version:</label>
66+
<div class="form-check">
67+
<input class="form-check-input" type="radio" name="jdkVersion" id="openjdk8Radio" value="openjdk8">
68+
<label class="form-check-label" for="openjdk8Radio">
69+
OpenJDK 8
70+
</label>
71+
</div>
72+
<div class="form-check">
73+
<input class="form-check-input" type="radio" name="jdkVersion" id="openjdk11Radio" value="openjdk11" checked>
74+
<label class="form-check-label" for="openjdk11Radio">
75+
OpenJDK 11
76+
</label>
77+
</div>
78+
<div class="form-check">
79+
<input class="form-check-input" type="radio" name="jdkVersion" id="openjdk12Radio" value="openjdk12">
80+
<label class="form-check-label" for="openjdk12Radio">
81+
OpenJDK 12 (Technical Preview)
82+
</label>
83+
</div>
8184
</div>
82-
<div class="form-check">
83-
<input class="form-check-input" type="radio" name="jvmImpl" id="openj9Radio" value="openj9">
84-
<label class="form-check-label" for="openj9Radio">
85-
OpenJ9
86-
</label>
85+
<div class="form-group col-sm-6">
86+
<label>JVM:</label>
87+
<div class="form-check">
88+
<input class="form-check-input" type="radio" name="jvmImpl" id="hotspotRadio" value="hotspot" checked>
89+
<label class="form-check-label" for="hotspotRadio">
90+
Hotspot (Recommended)
91+
</label>
92+
</div>
93+
<div class="form-check">
94+
<input class="form-check-input" type="radio" name="jvmImpl" id="openj9Radio" value="openj9">
95+
<label class="form-check-label" for="openj9Radio">
96+
OpenJ9
97+
</label>
98+
</div>
8799
</div>
88100
</div>
89-
</div>
90-
<div class="form-row">
91-
<div class="form-group col-sm-12">
92-
<div class="spinner-border spinner-border-sm" role="status" id="jdkSpinner">
93-
<span class="sr-only">Loading...</span>
101+
<div class="form-row">
102+
<div class="form-group col-sm-12">
103+
<div class="spinner-border spinner-border-sm" role="status" id="jdkSpinner">
104+
<span class="sr-only">Loading...</span>
105+
</div>
106+
<a class="btn btn-primary btn-lg d-none" id="jdkDownloadLink" href="command:java.helper.openUrl" role="button" title="Download JDK">
107+
Download
108+
<br>
109+
<sub id="jdkReleaseName">release</sub><sub> | </sub><sub id="jdkDownloadSize">size</sub>
110+
</a>
94111
</div>
95-
<a class="btn btn-primary btn-lg d-none" id="jdkDownloadLink" href="command:java.helper.openUrl" role="button" title="Download JDK">
96-
Download
97-
<br>
98-
<sub id="jdkReleaseName">release</sub><sub> | </sub><sub id="jdkDownloadSize">size</sub>
99-
</a>
100112
</div>
101-
</div>
102-
</form>
103-
</div>
104-
<div class="tab-pane fade" id="otherJdkPanel" role="tabpanel" aria-labelledby="otherJdkTab">
105-
<ul id="jdkProviderList" class="list-unstyled">
106-
<li><a href="command:java.helper.openUrl?%22https%3A%2F%2Fwww.azul.com%2Fdownloads%2Fazure-only%2Fzulu%2F%22" title="Recommended for Microsoft Azure Cloud and Azure Stack applications">Azul Zulu Enterprise build of OpenJDK for Azure</a></li>
107-
<li><a href="command:java.helper.openUrl?%22https%3A%2F%2Fdevelopers.redhat.com%2Fproducts%2Fopenjdk%2Fdownload%22" title="Red Hat build of OpenJDK">Red Hat build of OpenJDK</a></li>
108-
<li><a href="command:java.helper.openUrl?%22https%3A%2F%2Fjdk.java.net%2F%22" title="OpenJDK by Oracle">Oracle OpenJDK</a></li>
109-
</ul>
113+
</form>
114+
</div>
115+
<div class="tab-pane fade" id="otherJdkPanel" role="tabpanel" aria-labelledby="otherJdkTab">
116+
<ul id="jdkProviderList" class="list-unstyled">
117+
<li><a href="command:java.helper.openUrl?%22https%3A%2F%2Fwww.azul.com%2Fdownloads%2Fazure-only%2Fzulu%2F%22" title="Recommended for Microsoft Azure Cloud and Azure Stack applications">Azul Zulu Enterprise build of OpenJDK for Azure</a></li>
118+
<li><a href="command:java.helper.openUrl?%22https%3A%2F%2Fdevelopers.redhat.com%2Fproducts%2Fopenjdk%2Fdownload%22" title="Red Hat build of OpenJDK">Red Hat build of OpenJDK</a></li>
119+
<li><a href="command:java.helper.openUrl?%22https%3A%2F%2Fjdk.java.net%2F%22" title="OpenJDK by Oracle">Oracle OpenJDK</a></li>
120+
</ul>
121+
</div>
110122
</div>
123+
<p>When you are finished, please reload Visual Studio Code to activate Java language server.</p>
124+
<p class="mb-0">
125+
<a class="btn btn-primary" href="command:workbench.action.reloadWindow" role="button" title="Reload Visual Studio Code">Reload Window</a>
126+
<a class="btn btn-secondary" href="command:java.helper.openUrl?%22https%3A%2F%2Fgithub.com%2Fredhat-developer%2Fvscode-java%23setting-the-jdk%22" role="button" title="More info on how JDK is resolved">Having Trouble?</a>
127+
</p>
111128
</div>
112-
<p>When you are finished, please reload Visual Studio Code to activate Java language server.</p>
113-
<p class="mb-0">
114-
<a class="btn btn-primary" href="command:workbench.action.reloadWindow" role="button" title="Reload Visual Studio Code">Reload Window</a>
115-
<a class="btn btn-secondary" href="command:java.helper.openUrl?%22https%3A%2F%2Fgithub.com%2Fredhat-developer%2Fvscode-java%23setting-the-jdk%22" role="button" title="More info on how JDK is resolved">Having Trouble?</a>
116-
</p>
117129
</div>
118130
</div>
119131
</div>
120132
</div>
121133
</div>
122-
</body>
134+
</div>
135+
</body>
123136

124-
</html>
137+
</html>

‎src/java-runtime/assets/java.runtime.entries.tsx‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ export const JavaRuntimeEntryPanel = (props: JavaRuntimeEntry[]) => {
1818
{!entry.path && <em>{"<Empty>"}</em>}
1919
{entry.path}
2020
&nbsp;
21-
{index === currentIndex && errorIndex === -1 && <span className="badge badge-pill badge-primary">Current</span>}
22-
{entry.path && !entry.isValid && errorIndex === -1 && <span className="badge badge-pill badge-secondary" title={entry.hint}>Invalid</span>}
23-
{entry.path && errorIndex === index && <span className="badge badge-pill badge-danger" title={entry.hint}>Error</span>}
24-
{!!entry.path && !!entry.hint && <div><em className={errorIndex === index ? "text-danger" : "text-warning"}>{entry.hint}</em></div>}
21+
{index === currentIndex && <span className="badge badge-pill badge-primary">Current</span>}
22+
{entry.path && !entry.isValid && <span className="badge badge-pill badge-secondary" title={entry.hint}>Invalid</span>}
23+
{entry.path && entry.hint && <div><em className={errorIndex === index ? "text-danger" : "text-warning"}>{entry.hint}</em></div>}
2524
</td>
2625
<td>
2726
{entry.name}
@@ -34,18 +33,21 @@ export const JavaRuntimeEntryPanel = (props: JavaRuntimeEntry[]) => {
3433
);
3534

3635
return (
37-
<table className="table table-borderless table-hover table-sm">
38-
<thead>
39-
<tr>
40-
<th scope="col">Order</th>
41-
<th scope="col">Path</th>
42-
<th scope="col">Source</th>
43-
<th scope="col">Type</th>
44-
</tr>
45-
</thead>
46-
<tbody>
47-
{entries}
48-
</tbody>
49-
</table>
36+
<div className="table-responsive">
37+
<table className="table table-borderless table-hover table-sm mb-0">
38+
<caption className="pb-0">If you change any of the entries above, you need to <a href="command:workbench.action.reloadWindow">reload</a> VS Code to make them effective.</caption>
39+
<thead>
40+
<tr>
41+
<th scope="col">#</th>
42+
<th scope="col">Path</th>
43+
<th scope="col">Source</th>
44+
<th scope="col">Type</th>
45+
</tr>
46+
</thead>
47+
<tbody>
48+
{entries}
49+
</tbody>
50+
</table>
51+
</div>
5052
);
5153
};

0 commit comments

Comments
 (0)