From e3537a6f9c08cb119c4fb436c65a7823125809fb Mon Sep 17 00:00:00 2001 From: Brad Walker Date: Wed, 5 Aug 2026 18:07:47 -0600 Subject: [PATCH] Remove the Solaris/SPARC/SunOS support from Netbeans. It's been deprecated since JDK15. No one has stepped up to support it. There is no reason to have platform-specific support in Netbeans. Therefore, remove it. --- .../src/org/netbeans/junit/MemoryMeasurement.java | 4 +--- .../nativeexecution/TerminalLocalNativeProcess.java | 2 +- .../src/org/netbeans/swing/plaf/Startup.java | 10 +--------- .../beanstubs/org/openide/util/Utilities.java | 4 ---- .../src/org/openide/util/BaseUtilities.java | 4 ---- .../modules/quicksearch/SearchResultRender.java | 8 -------- .../src/org/netbeans/lib/profiler/global/Platform.java | 9 --------- 7 files changed, 3 insertions(+), 38 deletions(-) diff --git a/harness/nbjunit/src/org/netbeans/junit/MemoryMeasurement.java b/harness/nbjunit/src/org/netbeans/junit/MemoryMeasurement.java index d1265b076615..62fc01cf892c 100644 --- a/harness/nbjunit/src/org/netbeans/junit/MemoryMeasurement.java +++ b/harness/nbjunit/src/org/netbeans/junit/MemoryMeasurement.java @@ -83,7 +83,7 @@ public static long getIdeMemoryFootPrint() throws MemoryMeasurementFailedExcepti public static long getProcessMemoryFootPrint(long pid) throws MemoryMeasurementFailedException { String platform = getPlatform(); //System.out.println("PLATFORM = "+getPlatform()); - if (platform.equals(SOLARIS)|platform.equals(LINUX)) { + if (platform.equals(LINUX)) { // call unix method return getProcessMemoryFootPrintOnUnix(pid); } else if (platform.equals(WINDOWS)) { @@ -98,13 +98,11 @@ public static long getProcessMemoryFootPrint(long pid) throws MemoryMeasurementF /** */ private static final long UNKNOWN_VALUE = -1; - private static final String SOLARIS = "solaris"; private static final String LINUX = "linux"; private static final String WINDOWS = "win32"; private static final String UNKNOWN = "unknown"; private static final String [][] SUPPORTED_PLATFORMS = { - {"SunOS",SOLARIS}, {"Linux",LINUX}, {"Windows NT",WINDOWS}, {"Windows 2000",WINDOWS}, diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/TerminalLocalNativeProcess.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/TerminalLocalNativeProcess.java index fc47fdf71e5f..cf315844410f 100644 --- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/TerminalLocalNativeProcess.java +++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/TerminalLocalNativeProcess.java @@ -262,7 +262,7 @@ public int waitResult() throws InterruptedException { return -1; } - if (osFamily == OSFamily.LINUX || osFamily == OSFamily.SUNOS) { + if (osFamily == OSFamily.LINUX) { File f = new File("/proc/" + pid); // NOI18N while (f.exists()) { diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java index 30c2bb7f5e58..3e4c7fe28e53 100644 --- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java +++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java @@ -586,13 +586,6 @@ private static boolean isMac() { return result; } - private static boolean isSolaris10 () { - String osName = System.getProperty ("os.name"); - String osVersion = System.getProperty ("os.version"); - boolean result = osName.startsWith ("SunOS") && "5.10".equals(osVersion); - return result; - } - /** If it is solaris or linux, we can use GTK where supported by getting * the platform specific look and feel. * @@ -608,8 +601,7 @@ private static boolean shouldUseMetal() { boolean result = !"Solaris".equals (osName) && !osName.startsWith ("SunOS") && !osName.endsWith ("Linux") || - UIManager.getSystemLookAndFeelClassName().indexOf("Motif") > -1 || - isSolaris10(); + UIManager.getSystemLookAndFeelClassName().indexOf("Motif") > -1; return result; } diff --git a/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java b/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java index aef86a6984cd..03f6bc2f559c 100644 --- a/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java +++ b/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java @@ -126,8 +126,6 @@ else if (osName.startsWith("Windows ")) // NOI18N operatingSystem = OS_WIN_OTHER; else if ("Solaris".equals (osName)) // NOI18N operatingSystem = OS_SOLARIS; - else if (osName.startsWith ("SunOS")) // NOI18N - operatingSystem = OS_SOLARIS; // JDK 1.4 b2 defines os.name for me as "Redhat Linux" -jglick else if (osName.endsWith ("Linux")) // NOI18N operatingSystem = OS_LINUX; @@ -137,8 +135,6 @@ else if ("AIX".equals (osName)) // NOI18N operatingSystem = OS_AIX; else if ("Irix".equals (osName)) // NOI18N operatingSystem = OS_IRIX; - else if ("SunOS".equals (osName)) // NOI18N - operatingSystem = OS_SUNOS; else if ("Digital UNIX".equals (osName)) // NOI18N operatingSystem = OS_TRU64; else if ("OS/2".equals (osName)) // NOI18N diff --git a/platform/openide.util/src/org/openide/util/BaseUtilities.java b/platform/openide.util/src/org/openide/util/BaseUtilities.java index 810fe52b9828..0000014c085e 100644 --- a/platform/openide.util/src/org/openide/util/BaseUtilities.java +++ b/platform/openide.util/src/org/openide/util/BaseUtilities.java @@ -228,8 +228,6 @@ public static int getOperatingSystem() { operatingSystem = OS_WIN_OTHER; } else if ("Solaris".equals(osName)) { // NOI18N operatingSystem = OS_SOLARIS; - } else if (osName.startsWith("SunOS")) { // NOI18N - operatingSystem = OS_SOLARIS; } // JDK 1.4 b2 defines os.name for me as "Redhat Linux" -jglick else if (osName.endsWith("Linux")) { // NOI18N @@ -240,8 +238,6 @@ else if (osName.endsWith("Linux")) { // NOI18N operatingSystem = OS_AIX; } else if ("Irix".equals(osName)) { // NOI18N operatingSystem = OS_IRIX; - } else if ("SunOS".equals(osName)) { // NOI18N - operatingSystem = OS_SUNOS; } else if ("Digital UNIX".equals(osName)) { // NOI18N operatingSystem = OS_TRU64; } else if ("OS/2".equals(osName)) { // NOI18N diff --git a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/SearchResultRender.java b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/SearchResultRender.java index e87c2ede75b1..7e22bce12e80 100644 --- a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/SearchResultRender.java +++ b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/SearchResultRender.java @@ -186,9 +186,6 @@ static String getKeyStrokeAsText (KeyStroke keyStroke) { if (Utilities.isMac()) { // Mac cloverleaf symbol sb.append ("\u2318+"); - } else if (isSolaris()) { - // Sun meta symbol - sb.append ("\u25C6+"); } else { sb.append ("Meta+"); } @@ -203,9 +200,4 @@ static String getKeyStrokeAsText (KeyStroke keyStroke) { )); return sb.toString (); } - - private static boolean isSolaris () { - String osName = System.getProperty ("os.name"); - return osName != null && osName.startsWith ("SunOS"); - } } diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java index ae9107bcb311..0e446c8f1e5f 100644 --- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java +++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/global/Platform.java @@ -413,12 +413,6 @@ public static int getOperatingSystem(String osName) { } else if (osName.startsWith("Windows ")) { // NOI18N return OS_WIN_OTHER; - } else if ("Solaris".equals(osName)) { // NOI18N - - return OS_SOLARIS; - } else if (osName.startsWith("SunOS")) { // NOI18N - - return OS_SOLARIS; } else if (osName.endsWith("Linux")) { // NOI18N return OS_LINUX; @@ -431,9 +425,6 @@ public static int getOperatingSystem(String osName) { } else if ("Irix".equals(osName)) { // NOI18N return OS_IRIX; - } else if ("SunOS".equals(osName)) { // NOI18N - - return OS_SOLARIS; } else if ("Digital UNIX".equals(osName)) { // NOI18N return OS_TRU64;