Merge pull request #9213 from mbien/use-runtime-version

Use Runtime.version() where applicable and remove unreachable code

Author: mbien

extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java

@@ -118,12 +118,7 @@ private int getJavaVersion() {
         }
 
         if (javaHome == null) {
-            String javaVersion = System.getProperty("java.specification.version");
-            int dot = javaVersion.indexOf('.');
-            if (dot > 0) {
-                javaVersion = javaVersion.substring(0, dot);
-            }
-            return Integer.parseInt(javaVersion);
+            return Runtime.version().feature();
         } else {
             return getJavaMajorVersion(javaHome);
         }
@@ -144,15 +139,10 @@ private static int getJavaMajorVersion(File javaHome) {
             }
             String javaVersion = releasePros.getProperty("JAVA_VERSION"); //NOI18N
             // This should look like "17" or "17.0.9"
-            //TODO: Use Runtime.Version (when we move to Java 11)
             if ((javaVersion != null) && javaVersion.startsWith("\"") && javaVersion.endsWith("\"")) {
-                int dot = javaVersion.indexOf('.');
-                javaVersion = dot > 0
-                        ? javaVersion.substring(1, javaVersion.indexOf('.'))
-                        : javaVersion.substring(1, javaVersion.length() - 1);
                 try {
-                    ret = Integer.parseInt(javaVersion);
-                } catch (NumberFormatException ex) {
+                    ret = Runtime.Version.parse(javaVersion.substring(1, javaVersion.length() - 1)).feature();
+                } catch (IllegalArgumentException ex) {
                     // Do nothing return empty
                 }
             }

extide/gradle/src/org/netbeans/modules/gradle/execute/DefaultJavaRuntimeManager.java

@@ -40,7 +40,7 @@ public class DefaultJavaRuntimeManager implements JavaRuntimeManager {
     })
     public DefaultJavaRuntimeManager() {
         File javaHome = new File(System.getProperty("java.home")); //NOI18N
-        String javaVersion = System.getProperty("java.specification.version"); //NOI18N
+        int javaVersion = Runtime.version().feature();
         JavaRuntime defaultRuntime = JavaRuntimeManager.createJavaRuntime(DEFAULT_RUNTIME_ID, Bundle.DEFAULT_JAVA_RUNTIME_NAME(javaVersion), javaHome);
 
         defaultRuntimes = Collections.singletonMap(DEFAULT_RUNTIME_ID, defaultRuntime);

ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/DebugTreeView.java

@@ -113,13 +113,8 @@ public class DebugTreeView extends BeanTreeView {
         tree.setCellRenderer(rend);
 
         setBackground(tree.getBackground());
-        if (System.getProperty("java.version").startsWith("1.6") &&
-            "GTK".equals(UIManager.getLookAndFeel().getID())) {
-            // leave the tree as opaque to paint the whole area
-        } else {
-            tree.setOpaque(false);
-            ((JComponent)tree.getParent()).setOpaque(false);
-        }
+        tree.setOpaque(false);
+        ((JComponent)tree.getParent()).setOpaque(false);
         ((JComponent)tree.getParent()).setBackground(tree.getBackground());
         setWheelScrollingEnabled(false);
     }

java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/BigStringCustomEditor.java

@@ -39,7 +39,6 @@
 import org.netbeans.modules.debugger.jpda.models.ShortenedStrings.StringInfo;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
-import org.openide.awt.Actions;
 import org.openide.awt.Mnemonics;
 import org.openide.filesystems.FileChooserBuilder;
 import org.openide.util.NbBundle;
@@ -51,37 +50,10 @@
  */
 class BigStringCustomEditor extends JPanel implements ActionListener {
 
-    static final int MAX_STRING_LENGTH;
+    static final int MAX_STRING_LENGTH = AbstractObjectVariable.MAX_STRING_LENGTH;
 
     private final StringInfo shortenedInfo;
     private final String fullString;
-
-    static {
-        int maxStringLength = AbstractObjectVariable.MAX_STRING_LENGTH;
-        String javaV = System.getProperty("java.version");
-        if (javaV.startsWith("1.8.0")) {
-            String update = "";
-            for (int i = "1.8.0_".length(); i < javaV.length(); i++) {
-                char c = javaV.charAt(i);
-                if (Character.isDigit(c)) {
-                    update += c;
-                } else {
-                    break;
-                }
-            }
-            int updateNo = 0;
-            if (!update.isEmpty()) {
-                try {
-                    updateNo = Integer.parseInt(update);
-                } catch (NumberFormatException nfex) {}
-            }
-            if (updateNo < 60) {
-                // Memory problem on JDK 8, fixed in update 60 (https://bugs.openjdk.java.net/browse/JDK-8072775):
-                maxStringLength = 1000;
-            }
-        }
-        MAX_STRING_LENGTH = maxStringLength;
-    }
 
     private BigStringCustomEditor(Component delegateCustomEditor, StringInfo shortenedInfo, int preferredShortLength) {
         this.shortenedInfo = shortenedInfo;

java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java

@@ -445,7 +445,7 @@ public Mirror visitMethodInvocation(MethodInvocationTree arg0, EvaluationContext
         } else if (type instanceof ClassType) {
             cType = (ClassType) type;
         } else {
-            if (JPDAUtils.IS_JDK_180_40 && (type instanceof InterfaceType) && isStatic) {
+            if ((type instanceof InterfaceType) && isStatic) {
                 cType = null;
                 iType = (InterfaceType) type;
             } else {

java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/util/JPDAUtils.java

@@ -43,25 +43,12 @@
 * @author Jan Jancura
 */
 public class JPDAUtils {
-    private static final String JAVA_VERSION = System.getProperty("java.version");
     /**
      * <code>true</code> when the current JDK version is 1.8.0 update 40, or newer.
+     * @deprecated Returns true.
      */
-    public static final boolean IS_JDK_180_40 = !JAVA_VERSION.startsWith("1.8.0") || // we know that it's 1.8.0 at least
-                                                getVersionUpdate(JAVA_VERSION) >= 40;
-
-
-    private static int getVersionUpdate(String javaVersion) {
-        if (javaVersion.length() < 7) {
-            return 0;
-        }
-        String update = javaVersion.substring(6);
-        try {
-            return Integer.parseInt(update);
-        } catch (NumberFormatException nfex) {
-            return 0;
-        }
-    }
+    @Deprecated(forRemoval = true)
+    public static final boolean IS_JDK_180_40 = true;
 
     public static final ReferenceType getPreferredReferenceType(List<ReferenceType> referenceTypes, Logger logger) throws VMDisconnectedExceptionWrapper {
         ReferenceType preferredType; // The preferred reference type from the list

java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/SingleSourceFileUtil.java

@@ -54,12 +54,7 @@ public final class SingleSourceFileUtil {
     // TODO this checks the runtime JDK of NB!
     public static int findJavaVersion() throws NumberFormatException {
         // JEP-330 is supported only on JDK-11 and above.
-        String javaVersion = System.getProperty("java.specification.version"); //NOI18N
-        if (javaVersion.startsWith("1.")) { //NOI18N
-            javaVersion = javaVersion.substring(2);
-        }
-        int version = Integer.parseInt(javaVersion);
-        return version;
+        return Runtime.version().feature();
     }
 
     public static final String GLOBAL_VM_OPTIONS = "java_file_launcher_global_vm_options"; //NOI18N

java/java.hints/src/org/netbeans/modules/java/hints/errors/EnablePreviewSingleSourceFile.java

@@ -49,7 +49,7 @@ public class EnablePreviewSingleSourceFile implements PreviewEnabler {
 
     private static final String FILE_VM_OPTIONS = "single_file_vm_options"; //NOI18N
 
-    private FileObject file;
+    private final FileObject file;
 
     private EnablePreviewSingleSourceFile(@NonNull FileObject file) {
         Parameters.notNull("file", file); //NOI18N
@@ -68,7 +68,7 @@ public void enablePreview(String newSourceLevel) throws Exception {
         Matcher m = SOURCE_FLAG_PATTERN.matcher(compilerArgs);
 
         if (newSourceLevel == null) {
-            newSourceLevel = getJdkRunVersion();
+            newSourceLevel = Integer.toString(Runtime.version().feature());
         }
 
         if (compilerArgs.contains(SOURCE_FLAG)) {
@@ -138,15 +138,6 @@ public Void run() throws IOException {
         }
     }
 
-    private static String getJdkRunVersion() {
-        String javaVersion = System.getProperty("java.specification.version"); //NOI18N 
-        if (javaVersion.startsWith("1.")) { //NOI18N
-            javaVersion = javaVersion.substring(2);
-        }
-
-        return javaVersion;
-    }
-
     @ServiceProvider(service=Factory.class)
     public static final class FactoryImpl implements Factory {
 

java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/singlesourcefile/EnablePreviewSingleSourceFile.java

@@ -19,8 +19,6 @@
 package org.netbeans.modules.java.lsp.server.singlesourcefile;
 
 import com.google.gson.JsonPrimitive;
-import java.util.Collections;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.netbeans.api.annotations.common.NonNull;
@@ -85,12 +83,7 @@ public void enablePreview(String newSourceLevel) throws Exception {
     }
 
     private static String getJdkRunVersion() {
-        String javaVersion = System.getProperty("java.specification.version"); //NOI18N 
-        if (javaVersion.startsWith("1.")) { //NOI18N
-            javaVersion = javaVersion.substring(2);
-        }
-
-        return javaVersion;
+        return Integer.toString(Runtime.version().feature());
     }
 
     @ServiceProvider(service=Factory.class, position=10_000_000)

java/java.source.base/nbproject/project.xml

@@ -77,14 +77,6 @@
                         <implementation-version/>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.libs.asm</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>5.4</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.libs.javacapi</code-name-base>
                     <build-prerequisite/>