show project/unmanaged folder section on demand (#517)

* show project/unmanaged folder section on demand

* address comments

Author: Eskibear

src/java-runtime/assets/jdk.configure.project.tsx

@@ -20,10 +20,8 @@ export const ProjectRuntimePanel = (props: {
   const unmanagedProject = projectRuntimes.find(p => p.projectType === ProjectType.UnmanagedFolder);
   const defaultJDK = unmanagedProject ? unmanagedProject.runtimePath : undefined;
 
-  const sourceLevelRuntimePanels = _.isEmpty(sourceLevelEntries) ? (<p className="text-warning">No Maven/Gradle project recognized.</p>)
-    : sourceLevelEntries.map(entry => (<ManagedProjectRuntimePanel entry={entry} jdks={jdkEntries} key={entry.sourceLevel} />));
-  const invisibleProjectsRuntimePanel = unmanagedProject ? (defaultJDK && <InvisibleProjectsRuntimePanel jdks={jdkEntries} defaultJDK={unmanagedProject.runtimePath} />)
-    : (<p className="text-warning">No folder recognized.</p>);
+  const sourceLevelRuntimePanels = !_.isEmpty(sourceLevelEntries) && <ManagedProjectRuntimePanel entries={sourceLevelEntries} jdks={jdkEntries} />;
+  const invisibleProjectsRuntimePanel = unmanagedProject && defaultJDK && <InvisibleProjectsRuntimePanel jdks={jdkEntries} defaultJDK={unmanagedProject.runtimePath} />;
 
   const projectEntries = projectRuntimes
     .filter(p => p.projectType !== ProjectType.Default)
@@ -83,15 +81,9 @@ export const ProjectRuntimePanel = (props: {
 
         <div className="col-6">
           {/* Managed Projects */}
-          <h3 className="font-weight-light">Maven/Gradle Projects</h3>
-          <p>For projects managed by build tools, Java version is specified in build scripts. Here you can change the mapping between Java version and JDK used.</p>
           {sourceLevelRuntimePanels}
 
           {/* invisible projects */}
-          <h3 className="font-weight-light">Unmanaged Folders</h3>
-          <p>
-            For folders containing .java files, but not managed by build tools like Maven/Gradle, a default JDK is used.
-          </p>
           {invisibleProjectsRuntimePanel}
         </div>
       </div>

src/java-runtime/assets/project.invisible.tsx

@@ -14,20 +14,24 @@ export class InvisibleProjectsRuntimePanel extends React.Component<InvisibleProj
   render = () => {
     const { jdks, defaultJDK } = this.props;
     return (
-      <div className="row">
-        <div className="col">
-          <div className="row sourcelevel">
-            <div className="col">
-              <div className="input-group mb-3">
-                <div className="input-group-prepend">
-                  <label className="input-group-text" htmlFor="invisible">Default JDK:</label>
+      <div>
+        <h3 className="font-weight-light">Unmanaged Folders</h3>
+        <p>For folders containing .java files, but <strong>NOT</strong> managed by build tools like Maven/Gradle, a default JDK is used.</p>
+        <div className="row">
+          <div className="col">
+            <div className="row sourcelevel">
+              <div className="col">
+                <div className="input-group mb-3">
+                  <div className="input-group-prepend">
+                    <label className="input-group-text" htmlFor="invisible">Default JDK:</label>
+                  </div>
+                  <select className="form-control" id="invisible" defaultValue={defaultJDK} onChange={this.onSelectionChange}>
+                    {defaultJDK === undefined && <option key="placeholder" hidden disabled selected>-- Select --</option>}
+                    {jdks.map(jdk => (
+                      <option key={jdk.name} value={jdk.fspath} >{jdk.name}</option>
+                    ))}
+                  </select>
                 </div>
-                <select className="form-control" id="invisible" defaultValue={defaultJDK} onChange={this.onSelectionChange}>
-                  { defaultJDK === undefined && <option key="placeholder" hidden disabled selected>-- Select --</option> }
-                  {jdks.map(jdk => (
-                    <option key={jdk.name} value={jdk.fspath} >{jdk.name}</option>
-                  ))}
-                </select>
               </div>
             </div>
           </div>

src/java-runtime/assets/project.managed.tsx

@@ -7,20 +7,33 @@ import { sourceLevelDisplayName, sourceLevelMajorVersion } from "../utils/misc";
 import { updateRuntimePath } from "./vscode.api";
 
 interface ManagedProjectRuntimePanelProps {
-  entry: {
+  entries: {
     sourceLevel: string;
     runtimePath: string;
-  };
+  }[];
   jdks: JavaRuntimeEntry[];
 }
 
 export class ManagedProjectRuntimePanel extends React.Component<ManagedProjectRuntimePanelProps, {}> {
 
   render = () => {
-    const { sourceLevel, runtimePath } = this.props.entry;
+    return (
+      <div>
+        <h3 className="font-weight-light">Maven/Gradle Projects</h3>
+        <p>For projects managed by build tools, Java version is specified in build scripts. Here you can change the mapping between Java version and JDK used.</p>
+        {this.props.entries.map(this.getRuntimeSelectorComponent)}
+      </div>
+    );
+  }
+
+  getRuntimeSelectorComponent = (entry:  {
+    sourceLevel: string;
+    runtimePath: string;
+  }) => {
+    const { sourceLevel, runtimePath } = entry;
 
     return (
-      <div className="row">
+      <div className="row" key={sourceLevel}>
         <div className="col">
           <div className="row sourcelevel">
             <div className="col">