cleanup: cleanup usage of getSecurityManager()

enterprise/performance.javaee/test/unit/src/org/netbeans/performance/j2ee/memory/MeasureBaselineMemoryFootprint.java

@@ -54,7 +54,6 @@ public class MeasureBaselineMemoryFootprint extends org.netbeans.junit.NbPerform
 
     private static final String [][] SUPPORTED_PLATFORMS = {
         {"Linux,i386",UNIX},
-        {"SunOS,sparc",UNIX},
         {"Windows_NT,x86",WINDOWS},
         {"Windows_2000,x86",WINDOWS},
         {"Windows_XP,x86",WINDOWS},

enterprise/performance.scripting/test/qa-functional/src/org/netbeans/performance/languages/actions/CountingSecurityManager.java

@@ -51,11 +51,10 @@ public static void register() {
     public static void initialize(String prefix) {
         Assert.assertNotNull(prefix);
 
-        if (! (System.getSecurityManager() instanceof CountingSecurityManager)) {
-            setAllowedReplace(true);
-            System.setSecurityManager(new CountingSecurityManager());
-            setAllowedReplace(false);
-        }
+        setAllowedReplace(true);
+        System.setSecurityManager(new CountingSecurityManager());
+        setAllowedReplace(false);
+
         if (!System.getSecurityManager().getClass().getName().equals(CountingSecurityManager.class.getName())) {
             throw new IllegalStateException("Wrong security manager: " + System.getSecurityManager());
         }

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},

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()) {

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/HostInfo.java

@@ -34,7 +34,6 @@ public static enum CpuFamily {
 
     public static enum OSFamily {
 
-        SUNOS,
         LINUX,
         WINDOWS,
         MACOSX,
@@ -45,7 +44,6 @@ public boolean isUnix() {
             switch (this) {
                 case LINUX:
                 case MACOSX:
-                case SUNOS:
                 case FREEBSD:
                     return true;
                 case WINDOWS:
@@ -58,7 +56,7 @@ public boolean isUnix() {
         }
 
         /**
-         * Returns CamelCase name of the family. Like: SunOS; Linux; Windows;
+         * Returns CamelCase name of the family. Like: Linux; Windows;
          * MacOSX.
          *
          * @return CamelCase name
@@ -69,8 +67,6 @@ public String cname() {
                     return "Linux"; // NOI18N
                 case MACOSX:
                     return "MacOSX"; // NOI18N
-                case SUNOS:
-                    return "SunOS"; // NOI18N
                 case FREEBSD:
                     return "FreeBSD"; // NOI18N
                 case WINDOWS:

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/pty/PtySupport.java

@@ -170,8 +170,6 @@ public static boolean isSupportedFor(ExecutionEnvironment executionEnvironment)
                             || hostInfo.getCpuFamily().equals(CpuFamily.SPARC)
                             || (hostInfo.getCpuFamily().equals(CpuFamily.ARM) && Boolean.getBoolean("cnd.pty.arm.support"))
                             || hostInfo.getCpuFamily().equals(CpuFamily.AARCH64);
-                case SUNOS:
-                    return true;
                 case FREEBSD:
                     return false;
                 default:

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/HelperLibraryUtility.java

@@ -113,7 +113,6 @@ public static String getLDPathEnvName(ExecutionEnvironment execEnv) {
                 case MACOSX:
                    return "DYLD_LIBRARY_PATH"; // NOI18N
                 case LINUX:
-                case SUNOS:
                 case FREEBSD:
                    return "LD_LIBRARY_PATH"; // NOI18N
                 case WINDOWS:
@@ -152,7 +151,6 @@ public static String getLDPreloadEnvName(ExecutionEnvironment execEnv) {
                 case MACOSX:
                    return "DYLD_INSERT_LIBRARIES"; // NOI18N
                 case LINUX:
-                case SUNOS:
                 case FREEBSD:
                    return "LD_PRELOAD"; // NOI18N
                 case WINDOWS:

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroExpanderFactory.java

@@ -254,10 +254,6 @@ protected final void setupPredefined(ExpanderStyle style) {
                     soext = "dylib"; // NOI18N
                     osname = "MacOSX"; // NOI18N
                     break;
-                case SUNOS:
-                    soext = "so"; // NOI18N
-                    osname = "SunOS"; // NOI18N
-                    break;
                 case LINUX:
                     soext = "so"; // NOI18N
                     osname = "Linux"; // NOI18N
@@ -285,11 +281,7 @@ protected final void setupPredefined(ExpanderStyle style) {
                     platform = "intel"; // NOI18N
                 }
 
-                if (hostInfo.getOSFamily() == HostInfo.OSFamily.SUNOS) { // NOI18N
-                    platform += "-S2"; // NOI18N
-                } else {
-                    platform += "-" + osname; // NOI18N
-                }
+                platform += "-" + osname; // NOI18N
             }
 
             predefinedMacros.put("platform", platform); // NOI18N

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/Md5checker.java

@@ -83,11 +83,6 @@ public Result check(File localFile, String remotePath)
                 args = new String[] { remotePath }; // NOI18N
                 first = false;
                 break;
-            case SUNOS:
-                cmd = "/usr/bin/digest"; // NOI18N
-                args = new String[] {"-a", "md5", remotePath }; //NOI18N
-                first = true;
-                break;
             case MACOSX:
                 cmd = "sh"; // NOI18N
                 args = new String [] {"-c", String.format("md5 %s || openssl -md5 %s", remotePath, remotePath)}; //NOI18N

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/IOConnector.java

@@ -114,32 +114,7 @@ private static class ResizeListener implements PropertyChangeListener {
         private final boolean pxlsAware;
 
         ResizeListener(final ExecutionEnvironment env, final String tty) throws IOException, CancellationException {
-            final HostInfo hinfo = HostInfoUtils.getHostInfo(env);
-
-            if (OSFamily.SUNOS.equals(hinfo.getOSFamily())) {
-                pxlsAware = true;
-
-                // See IZ 192063  - Input is duplicated in internal terminal
-                // See CR 7009510 - Changing winsize (SIGWINCH) of pts causes entered text duplication
-
-                // In case OpenSolaris/Solaris 11 will not react on window size
-                // change... This causes 'problems' with, say, vi started
-                // in the internal terminal... But 'solves' problems with input
-                // duplication, which is more important...
-
-                String version = hinfo.getOS().getVersion();
-                if (version.contains("Solaris 11.")) { // NOI18N
-                    // update for IZ 236261: in Solaris 11+ this seems to work, so
-                    // will not disable listener for it...
-
-                    // update: the same is valid for 11.2
-                    // assuming it was fixed in 11 - disabling this fix for 11.*
-                } else if (version.contains("OpenSolaris") || version.contains("Solaris 11")) { // NOI18N
-                    return;
-                }
-            } else {
-                pxlsAware = false;
-            }
+            pxlsAware = false;
 
             this.task = rp.create(new Runnable() {
 

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/NbStartUtility.java

@@ -85,7 +85,6 @@ public boolean isSupported(HostInfo hostInfo) {
         try {
             switch (hostInfo.getOS().getFamily()) {
                 case MACOSX:
-                case SUNOS:
                 case LINUX:
                     try {
                         return getLocalFile(hostInfo) != null;

ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/signals/impl/NbKillAllSignalSupport.java

@@ -57,7 +57,6 @@ public boolean isSupported(ExecutionEnvironment env, SIGNAL_SCOPE scope) {
 
             switch (hostInfo.getOSFamily()) {
                 case LINUX:
-                case SUNOS:
                     return true;
                 case FREEBSD:
                     return false;

ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/CountingSecurityManager.java

@@ -90,11 +90,7 @@ public enum Mode {
     public static void initialize(String prefix, Mode mode, Set<String> allowedFiles) {
         System.setProperty("counting.security.disabled", "true");
 
-        if (System.getSecurityManager() instanceof CountingSecurityManager) {
-            // ok
-        } else {
-            System.setSecurityManager(new CountingSecurityManager());
-        }
+        System.setSecurityManager(new CountingSecurityManager());
         setCnt(0);
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);
@@ -113,7 +109,6 @@ public static void initialize(String prefix, Mode mode, Set<String> allowedFiles
     static void assertReflection(int maxCount, String whitelist) {
         System.setProperty("counting.reflection.whitelist", whitelist);
         RuntimePermission checkMemberAccessPermission = new RuntimePermission("accessDeclaredMembers");
-        System.getSecurityManager().checkPermission(checkMemberAccessPermission);
         System.getProperties().remove("counting.reflection.whitelist");
     }
 
@@ -127,7 +122,7 @@ public Integer call() throws Exception {
     }
 
     public static boolean isEnabled() {
-        return System.getSecurityManager() instanceof Callable<?>;
+        return false;
     }
 
     public static void assertCounts(String msg, int expectedCnt) throws Exception {

ide/projectui/src/org/netbeans/modules/project/ui/groups/CheckBoxRenderrer.java

@@ -49,19 +49,11 @@ public CheckBoxRenderrer () {
 
     private Border getNoFocusBorder () {
         Border border = UIManager.getBorder("List.cellNoFocusBorder");
-        if (System.getSecurityManager () != null) {
-            if (border != null) {
-                return border;
-            }
-            return SAFE_NO_FOCUS_BORDER;
-        } else {
-            if (border != null &&
-                (noFocusBorder == null ||
-                noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
-                return border;
-            }
-            return noFocusBorder;
+        if (border != null &&
+            (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
+            return border;
         }
+        return noFocusBorder;
     }
 
     public Component getListCellRendererComponent (

ide/spellchecker/src/org/netbeans/modules/spellchecker/options/CheckBoxRenderrer.java

@@ -49,19 +49,11 @@ public CheckBoxRenderrer () {
 
     private Border getNoFocusBorder () {
         Border border = UIManager.getBorder("List.cellNoFocusBorder");
-        if (System.getSecurityManager () != null) {
-            if (border != null) {
-                return border;
-            }
-            return SAFE_NO_FOCUS_BORDER;
-        } else {
-            if (border != null &&
-                (noFocusBorder == null ||
-                noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
-                return border;
-            }
-            return noFocusBorder;
+        if (border != null &&
+            (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
+            return border;
         }
+        return noFocusBorder;
     }
 
     public Component getListCellRendererComponent (

ide/versioning/test/unit/src/org/netbeans/modules/versioning/GetOwnerTest.java

@@ -37,7 +37,6 @@ public class GetOwnerTest extends NbTestCase {
 
     protected File dataRootDir;
     private StatFiles accessMonitor;
-    private SecurityManager defaultSecurityManager;
     protected File versionedFolder;
     protected File unversionedFolder;
 
@@ -69,9 +68,6 @@ protected void setUp() throws Exception {
         userdir.mkdirs();
         System.setProperty("netbeans.user", userdir.getAbsolutePath());
         if(accessMonitor != null) {
-            if(defaultSecurityManager == null) {
-                defaultSecurityManager = System.getSecurityManager();
-            }
             System.setSecurityManager(accessMonitor);
         }
     }
@@ -80,7 +76,8 @@ protected void setUp() throws Exception {
     protected void tearDown() throws Exception {
         super.tearDown();
         if(accessMonitor != null) {
-            System.setSecurityManager(defaultSecurityManager);
+            // FIXME - throws UnsupportedOperationException unconditionally, regardless of arg.
+            System.setSecurityManager(null);
         }
     }
 

java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyserCellRenderer.java

@@ -42,17 +42,11 @@ public AnalyserCellRenderer () {
 
     private Border getNoFocusBorder() {
         Border border = UIManager.getBorder("List.cellNoFocusBorder");
-        if (System.getSecurityManager() != null) {
-            if (border != null) return border;
-            return SAFE_NO_FOCUS_BORDER;
-        } else {
-            if (border != null &&
-                    (noFocusBorder == null ||
-                    noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
-                return border;
-            }
-            return noFocusBorder;
+        if (border != null &&
+            (noFocusBorder == null || noFocusBorder == DEFAULT_NO_FOCUS_BORDER)) {
+            return border;
         }
+        return noFocusBorder;
     }
 
 

java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreePathHandleTest.java

@@ -184,13 +184,12 @@ public void run(CompilationController parameter) throws Exception {
 
                 TypeElement string = parameter.getElements().getTypeElement("test.test2");
 
-                SecurityManager old = System.getSecurityManager();
-
                 System.setSecurityManager(new SecMan());
 
                 TreePathHandle.create(string, parameter);
-
-                System.setSecurityManager(old);
+
+                // FIXME - throws UnsupportedOperationException unconditionally, regardless of arg.
+		System.setSecurityManager(null);
             }
         }, true);
     }

java/performance.java/test/qa-functional/src/org/netbeans/performance/j2se/actions/CountingSecurityManager.java

@@ -50,14 +50,10 @@ public static void register() {
     public static void initialize(String prefix) {
         Assert.assertNotNull(prefix);
 
-        if (! (System.getSecurityManager() instanceof CountingSecurityManager)) {
-            setAllowedReplace(true);
-            System.setSecurityManager(new CountingSecurityManager());
-            setAllowedReplace(false);
-        }
-        if (!System.getSecurityManager().getClass().getName().equals(CountingSecurityManager.class.getName())) {
-            throw new IllegalStateException("Wrong security manager: " + System.getSecurityManager());
-        }
+        setAllowedReplace(true);
+        System.setSecurityManager(new CountingSecurityManager());
+        setAllowedReplace(false);
+
         cnt = 0;
         msgs = new StringWriter();
         pw = new PrintWriter(msgs);

java/performance/src/org/netbeans/modules/performance/utilities/MemoryFootprintTestCase.java

@@ -64,8 +64,6 @@ public abstract class MemoryFootprintTestCase extends PerformanceTestCase {
      */
     private static final String[][] SUPPORTED_PLATFORMS = {
         {"Linux,i386", UNIX},
-        {"SunOS,sparc", UNIX},
-        {"SunOS,x86", UNIX},
         {"Windows_NT,x86", WINDOWS},
         {"Windows_2000,x86", WINDOWS},
         {"Windows_XP,x86", WINDOWS},